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

Added option to skip certain bookmarks during scan.

This commit is contained in:
Marat Fayzullin 2024-08-06 21:45:23 -04:00
parent ecb7ab75e7
commit 8d69c17c92
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/index.html
View File

@ -386,6 +386,10 @@
<label for="name">Description:</label>
<input type="text" id="description" name="description">
</div>
<div class="form-field">
<label for="name">Scannable</label>
<input type="checkbox" id="scannable" name="scannable" checked>
</div>
<div class="buttons">
<div class="openwebrx-button" data-action="cancel">Cancel</div>
<div class="openwebrx-button" data-action="submit">Ok</div>

13
htdocs/lib/BookmarkDialog.js
View File

@ -11,8 +11,13 @@ $.fn.bookmarkDialog = function() {
},
setValues: function(bookmark) {
var $form = $el.find('form');
['name', 'frequency', 'modulation', 'description'].forEach(function(key){
$form.find('#' + key).val(bookmark[key]);
['name', 'frequency', 'modulation', 'description', 'scannable'].forEach(function(key){
var $input = $form.find('#' + key);
if ($input.is(':checkbox')) {
$input.prop('checked', bookmark[key]);
} else {
$input.val(bookmark[key]);
}
});
$el.data('id', bookmark.id || false);
return this;
@ -20,10 +25,10 @@ $.fn.bookmarkDialog = function() {
getValues: function() {
var bookmark = {};
var valid = true;
['name', 'frequency', 'modulation', 'description'].forEach(function(key){
['name', 'frequency', 'modulation', 'description', 'scannable'].forEach(function(key){
var $input = $el.find('#' + key);
valid = valid && $input[0].checkValidity();
bookmark[key] = $input.val();
bookmark[key] = $input.is(':checkbox')? $input.is(':checked') : $input.val();
});
if (!valid) {
$el.find("form :submit").click();

3
htdocs/lib/Scanner.js
View File

@ -91,10 +91,9 @@ Scanner.prototype.start = function() {
if (!this.timer) {
// Nothing found yet
this.current = -1;
// Get all scannable bookmarks from the bookmark bar
this.bookmarks = this.bbar.getAllBookmarks().filter(
(b) => !!b.frequency && !!b.modulation && this.modes.indexOf(b.modulation)>=0
(b) => !!b.scannable && !!b.frequency && !!b.modulation && this.modes.indexOf(b.modulation)>=0
);
// If there are bookmarks to scan...

5
owrx/bookmarks.py
View File

@ -15,6 +15,7 @@ class Bookmark(object):
self.frequency = j["frequency"]
self.modulation = j["modulation"]
self.description = j["description"] if "description" in j else ""
self.scannable = j["scan"] if "scannable" in j else True
self.srcFile = srcFile
def getName(self):
@ -29,6 +30,9 @@ class Bookmark(object):
def getDescription(self):
return self.description
def isScannable(self):
return self.scannable
def getSrcFile(self):
return self.srcFile
@ -38,6 +42,7 @@ class Bookmark(object):
"frequency": self.getFrequency(),
"modulation": self.getModulation(),
"description": self.getDescription(),
"scannable": self.isScannable(),
}