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

Stopping scanner when a frequency is clicked.

This commit is contained in:
Marat Fayzullin 2023-05-12 21:28:46 -04:00
parent 64f539c520
commit 8de64d16ec
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/index.html
View File

@ -224,7 +224,7 @@
</select> </select>
</div> </div>
<div class="openwebrx-panel-line"> <div class="openwebrx-panel-line">
<div title="Auto-set squelch level" class="openwebrx-squelch-auto openwebrx-button openwebrx-slider-button"> <div title="Auto-set squelch level (right-click for scanner)" class="openwebrx-squelch-auto openwebrx-button openwebrx-slider-button">
<svg viewBox="0 0 80 80"><use xlink:href="static/gfx/svg-defs.svg#squelch"></use></svg> <svg viewBox="0 0 80 80"><use xlink:href="static/gfx/svg-defs.svg#squelch"></use></svg>
</div> </div>
<input title="Squelch" class="openwebrx-squelch-slider openwebrx-panel-slider" type="range" min="-150" max="0" value="-150" step="1"> <input title="Squelch" class="openwebrx-squelch-slider openwebrx-panel-slider" type="range" min="-150" max="0" value="-150" step="1">

1
htdocs/lib/BookmarkBar.js
View File

@ -14,6 +14,7 @@ function BookmarkBar() {
me.getDemodulatorPanel().setMode(b.modulation, b.underlying); me.getDemodulatorPanel().setMode(b.modulation, b.underlying);
} }
$bookmark.addClass('selected'); $bookmark.addClass('selected');
stopScanner();
}); });
me.$container.on('click', '.action[data-action=edit]', function(e){ me.$container.on('click', '.action[data-action=edit]', function(e){

12
htdocs/openwebrx.js
View File

@ -145,9 +145,9 @@ function zoomOutTotal() {
function tuneBySteps(steps) { function tuneBySteps(steps) {
steps = Math.round(steps); steps = Math.round(steps);
if (steps != 0) { if (steps != 0) {
var f = $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator().get_offset_frequency(); var demodulator = $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator();
f += steps * tuning_step; var f = demodulator.get_offset_frequency();
$('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator().set_offset_frequency(f); demodulator.set_offset_frequency(f + steps * tuning_step);
} }
} }
@ -400,7 +400,10 @@ function scale_canvas_end_drag(x) {
var event_handled = false; var event_handled = false;
var demodulators = getDemodulators(); var demodulators = getDemodulators();
for (var i = 0; i < demodulators.length; i++) event_handled |= demodulators[i].envelope.drag_end(); for (var i = 0; i < demodulators.length; i++) event_handled |= demodulators[i].envelope.drag_end();
if (!event_handled) demodulators[0].set_offset_frequency(scale_offset_freq_from_px(x)); if (!event_handled) {
demodulators[0].set_offset_frequency(scale_offset_freq_from_px(x));
stopScanner();
}
} }
function scale_canvas_mouseup(evt) { function scale_canvas_mouseup(evt) {
@ -858,6 +861,7 @@ function canvas_mouseup(evt) {
f = f - 800; f = f - 800;
} }
demodulator.set_offset_frequency(f); demodulator.set_offset_frequency(f);
stopScanner();
} }
else { else {
canvas_end_drag(); canvas_end_drag();