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

Removing default underlying modulation from initial bookmark.

This commit is contained in:
Marat Fayzullin 2024-10-31 21:11:39 -04:00
parent 2062757ba4
commit d43c8e6ae9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/lib/BookmarkBar.js
View File

@ -108,8 +108,16 @@ BookmarkBar.prototype.showEditDialog = function(bookmark) {
if (!bookmark) { if (!bookmark) {
var mode1 = this.getDemodulator().get_secondary_demod() var mode1 = this.getDemodulator().get_secondary_demod()
var mode2 = this.getDemodulator().get_modulation(); var mode2 = this.getDemodulator().get_modulation();
// if no secondary demod, use the primary one if (!mode2) mode2 = '';
if (!mode1) { mode1 = mode2; mode2 = ''; } if (!mode1) {
// if no secondary demod, use the primary one
mode1 = mode2;
mode2 = '';
} else {
// check for default underlying demod
var m = Modes.findByModulation(mode1);
if (m && m.underlying.indexOf(mode2) == 0) mode2 = '';
}
bookmark = { bookmark = {
name: '', name: '',
frequency: center_freq + this.getDemodulator().get_offset_frequency(), frequency: center_freq + this.getDemodulator().get_offset_frequency(),
@ -118,7 +126,6 @@ BookmarkBar.prototype.showEditDialog = function(bookmark) {
description: '', description: '',
scannable : this.modesToScan.indexOf(mode1) >= 0 scannable : this.modesToScan.indexOf(mode1) >= 0
} }
this.sanitizeBookmark(bookmark);
} }
this.$dialog.bookmarkDialog().setValues(bookmark); this.$dialog.bookmarkDialog().setValues(bookmark);
this.$dialog.show(); this.$dialog.show();
@ -149,9 +156,6 @@ BookmarkBar.prototype.sanitizeBookmark = function(b) {
return "Must not have underlying modulation."; return "Must not have underlying modulation.";
else if (mode.underlying.indexOf(b.underlying) < 0) else if (mode.underlying.indexOf(b.underlying) < 0)
return "Must have valid underlying modulation."; return "Must have valid underlying modulation.";
else if (mode.underlying.indexOf(b.underlying) == 0)
// default underlying modulation
b.underlying = '';
return null; return null;
}; };