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

Now showing "None" for no underlying modulation.

This commit is contained in:
Marat Fayzullin 2024-10-27 21:08:58 -04:00
parent 002eb982ef
commit 56d7d222d6
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/lib/settings/BookmarkTable.js
View File

@ -177,8 +177,8 @@ ModulationEditor.prototype = new Editor();
ModulationEditor.prototype.getInputHtml = function() {
return '<select class="form-control form-control-sm">' +
$.map(this.modes, function(name, modulation) {
return '<option value="' + modulation + '">' + name + '</option>';
$.map(this.modes, function(mode, name) {
return '<option value="' + name + '">' + mode.name + '</option>';
}).join('') +
'</select>';
};
@ -197,9 +197,12 @@ UnderlyingEditor.prototype = new Editor();
UnderlyingEditor.prototype.getInputHtml = function() {
return '<select class="form-control form-control-sm">' +
'<option value=""></option>' +
$.map(this.modes, function(name, modulation) {
return '<option value="' + modulation + '">' + name + '</option>';
'<option value="">None</option>' +
$.map(this.modes, function(mode, name) {
if (mode.analog && !mode.underlying.length)
return '<option value="' + name + '">' + mode.name + '</option>';
else
return '';
}).join('') +
'</select>';
};

10
owrx/controllers/settings/bookmarks.py
View File

@ -2,7 +2,7 @@ from owrx.controllers.template import WebpageController
from owrx.controllers.admin import AuthorizationMixin
from owrx.controllers.settings import SettingsBreadcrumb
from owrx.bookmarks import Bookmark, Bookmarks
from owrx.modes import Modes
from owrx.modes import Modes, AnalogMode
from owrx.breadcrumb import Breadcrumb, BreadcrumbItem, BreadcrumbMixin
import json
import math
@ -44,7 +44,11 @@ class BookmarksController(AuthorizationMixin, BreadcrumbMixin, WebpageController
</table>
""".format(
bookmarks="".join(self.render_bookmark(b) for b in bookmarks) if bookmarks else emptyText,
modes=json.dumps({m.modulation: m.name for m in Modes.getAvailableModes()}),
modes=json.dumps({m.modulation: {
"name" : m.name,
"analog" : isinstance(m, AnalogMode),
"underlying" : m.underlying if hasattr(m, "underlying") else []
} for m in Modes.getAvailableModes()}),
)
def render_bookmark(self, bookmark: Bookmark):
@ -93,7 +97,7 @@ class BookmarksController(AuthorizationMixin, BreadcrumbMixin, WebpageController
modulation=name1 if mode1 is None else mode1.modulation,
underlying=name2 if mode2 is None else mode2.modulation,
modulation_name=name1 if mode1 is None else mode1.name,
underlying_name=name2 if mode2 is None else mode2.name,
underlying_name="None" if not name2 else name2 if mode2 is None else mode2.name,
description=bookmark.getDescription(),
scannable="true" if scan else "false",
scannable_check="&check;" if scan else "",