ua1zbe
/
openwebrxplus
mirror of https://github.com/luarvique/openwebrx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding Eclipse waterfall theme by Dimitar Milkov.

This commit is contained in:
Marat Fayzullin 2024-06-14 15:50:47 -04:00
parent bee475131e
commit affe08647c
5 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
**1.2.61** **1.2.61**
- Added Multimon-based EAS decoder by Matthew McDougal. - Added Multimon-based EAS decoder by Matthew McDougal.
- Added separate, selectable bandplans for ITU regions. - Added separate, selectable bandplans for ITU regions.
- Added Eclipse waterfall theme by Dimitar Milkov.
- Added HFGCS, MARS, and CAF aviation bookmarks. - Added HFGCS, MARS, and CAF aviation bookmarks.
- Sorting bands by low_band for in-order rendering. - Sorting bands by low_band for in-order rendering.

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ openwebrx (1.2.61) bullseye jammy; urgency=low
* Added Multimon-based EAS decoder by Matthew McDougal. * Added Multimon-based EAS decoder by Matthew McDougal.
* Added separate, selectable bandplans for ITU regions. * Added separate, selectable bandplans for ITU regions.
* Added Eclipse waterfall theme by Dimitar Milkov.
* Added HFGCS, MARS, and CAF aviation bookmarks. * Added HFGCS, MARS, and CAF aviation bookmarks.
* Sorting bands by low_band for in-order rendering. * Sorting bands by low_band for in-order rendering.

1
htdocs/index.html
View File

@ -309,6 +309,7 @@
<option value="ha7ilm">Legacy</option> <option value="ha7ilm">Legacy</option>
<option value="teejeez">Teejeez</option> <option value="teejeez">Teejeez</option>
<option value="zoran">Zoran</option> <option value="zoran">Zoran</option>
<option value="eclipse">Eclipse</option>
</select> </select>
</div> </div>
<div class="openwebrx-panel-line"> <div class="openwebrx-panel-line">

4
htdocs/lib/UI.js
View File

@ -323,6 +323,10 @@ UI.wfThemes = {
'teejeez' : [0x000000, 0x0000FF, 0x00FFFF, 0x00FF00, 0xFFFF00, 0xFF0000, 0xFF00FF, 0xFFFFFF], 'teejeez' : [0x000000, 0x0000FF, 0x00FFFF, 0x00FF00, 0xFFFF00, 0xFF0000, 0xFF00FF, 0xFFFFFF],
'ha7ilm' : [0x000000, 0x2E6893, 0x69A5D0, 0x214B69, 0x9DC4E0, 0xFFF775, 0xFF8A8A, 0xB20000], 'ha7ilm' : [0x000000, 0x2E6893, 0x69A5D0, 0x214B69, 0x9DC4E0, 0xFFF775, 0xFF8A8A, 0xB20000],
'zoran' : [0x000000, 0x000965, 0x00E0FF, 0x2EFF00, 0xFFEC00, 0xFF0000], 'zoran' : [0x000000, 0x000965, 0x00E0FF, 0x2EFF00, 0xFFEC00, 0xFF0000],
'eclipse' : [
0x000020, 0x000030, 0x000050, 0x000091, 0x1E90FF, 0xFFFFFF, 0xFFFF00, 0xFE6D16,
0xFF0000, 0xC60000, 0x9F0000, 0x750000, 0x4A0000
],
'turbo' : [ 'turbo' : [
0x30123B, 0x311542, 0x33184A, 0x341B51, 0x351E58, 0x36215F, 0x372466, 0x38266C, 0x30123B, 0x311542, 0x33184A, 0x341B51, 0x351E58, 0x36215F, 0x372466, 0x38266C,
0x392973, 0x3A2C79, 0x3B2F80, 0x3C3286, 0x3D358B, 0x3E3891, 0x3E3A97, 0x3F3D9C, 0x392973, 0x3A2C79, 0x3B2F80, 0x3C3286, 0x3D358B, 0x3E3891, 0x3E3A97, 0x3F3D9C,

10
owrx/waterfall.py
View File

@ -286,10 +286,17 @@ class Ha7ilmWaterfall(Waterfall):
class ZoranWaterfall(Waterfall): class ZoranWaterfall(Waterfall):
def __init__(self): def __init__(self):
# super().__init__([0x000000, 0x000965, 0x00E0FF, 0x00FFE0, 0x2EFF00, 0xECFF00, 0xFFEC00, 0xFF6500, 0xFF0000])
super().__init__([0x000000, 0x000965, 0x00E0FF, 0x2EFF00, 0xFFEC00, 0xFF0000]) super().__init__([0x000000, 0x000965, 0x00E0FF, 0x2EFF00, 0xFFEC00, 0xFF0000])
class EclipseWaterfall(Waterfall):
def __init__(self):
super().__init__([
0x000020, 0x000030, 0x000050, 0x000091, 0x1E90FF, 0xFFFFFF, 0xFFFF00, 0xFE6D16,
0xFF0000, 0xC60000, 0x9F0000, 0x750000, 0x4A0000
])
class CustomWaterfall(Waterfall): class CustomWaterfall(Waterfall):
def __init__(self): def __init__(self):
config = Config.get() config = Config.get()
@ -306,6 +313,7 @@ class WaterfallOptions(DropdownEnum):
TEEJEEZ = ("Original theme 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) HA7ILM = ("Old theme by HA7ILM", Ha7ilmWaterfall)
ZORAN = ("Theme by Zoran (9A6NDZ)", ZoranWaterfall) ZORAN = ("Theme by Zoran (9A6NDZ)", ZoranWaterfall)
ECLIPSE = ("Eclipse by LZ2DMV and LZ4ZD", EclipseWaterfall)
CUSTOM = ("Custom", CustomWaterfall) CUSTOM = ("Custom", CustomWaterfall)
def __new__(cls, *args, **kwargs): def __new__(cls, *args, **kwargs):