From 7a0e635553fa502d9707816d6b2e09e8f570bbc3 Mon Sep 17 00:00:00 2001 From: Marat Fayzullin Date: Thu, 11 Jan 2024 10:24:22 -0500 Subject: [PATCH] Added waterfall color theme by Zoran. --- CHANGELOG.md | 1 + debian/changelog | 1 + owrx/waterfall.py | 8 +++++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c0a2d62..a615dea3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ - Added admin-configurable FAX LPM parameter (default is 120). - Added reference to documentation to the console window. - Added maidenhead layer to Leaflet-based maps. +- Added waterfall color theme by Zoran (9A6NDZ). - Fixed volume resetting to zero on page reload. - Fixed step tuning when waterfall is zoomed. - Fixed browser console error on vendor-provided markers. diff --git a/debian/changelog b/debian/changelog index fcd596e2..76684f7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ openwebrx (1.2.44) bullseye jammy; urgency=low * Added admin-configurable FAX LPM parameter (default is 120). * Added reference to documentation to the console window. * Added maidenhead layer to Leaflet-based maps. + * Added waterfall color theme by Zoran (9A6NDZ). * Fixed volume resetting to zero on page reload. * Fixed step tuning when waterfall is zoomed. * Fixed browser console error on vendor-provided markers. diff --git a/owrx/waterfall.py b/owrx/waterfall.py index c88231a1..30d6e1fa 100644 --- a/owrx/waterfall.py +++ b/owrx/waterfall.py @@ -284,6 +284,11 @@ class Ha7ilmWaterfall(Waterfall): super().__init__([0x000000, 0x2E6893, 0x69A5D0, 0x214B69, 0x9DC4E0, 0xFFF775, 0xFF8A8A, 0xB20000]) +class ZoranWaterfall(Waterfall): + def __init__(self): + super().__init__([0x000000, 0x000965, 0x00E0FF, 0x2EFF00, 0xFFEC00, 0xFF0000]) + + class CustomWaterfall(Waterfall): def __init__(self): config = Config.get() @@ -297,8 +302,9 @@ class CustomWaterfall(Waterfall): class WaterfallOptions(DropdownEnum): DEFAULT = ("Google Turbo (OpenWebRX default)", GoogleTurboWaterfall) - TEEJEEZ = ("Original colorscheme by teejeez (default in OpenWebRX < 0.20)", TeejeezWaterfall) + TEEJEEZ = ("Original theme by teejeez (default in OpenWebRX < 0.20)", TeejeezWaterfall) HA7ILM = ("Old theme by HA7ILM", Ha7ilmWaterfall) + ZORAN = ("Theme by Zoran (9A6NDZ)", ZoranWaterfall) CUSTOM = ("Custom", CustomWaterfall) def __new__(cls, *args, **kwargs):