jketterl/openwebrx
1
0
Fork 0
mirror of https://github.com/jketterl/openwebrx.git synced 2025-12-06 07:12:09 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fake the tuning indicator when bandpass is not set

Browse source
This commit is contained in:
Jakob Ketterl 2024-02-12 21:31:40 +01:00
parent 0edc0b49cd
commit 06d1ce33c3
2 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
htdocs/lib/Demodulator.js
View file

@ -50,9 +50,19 @@ Envelope.prototype.draw = function(visible_range){
var env_lineplus = 1; // ||env_bounding_line_w var env_lineplus = 1; // ||env_bounding_line_w
var env_line_click_area = 6; var env_line_click_area = 6;
//range=get_visible_freq_range(); //range=get_visible_freq_range();
var from = center_freq + this.demodulator.offset_frequency + this.demodulator.low_cut;
var from = center_freq + this.demodulator.offset_frequency;
var to = center_freq + this.demodulator.offset_frequency;
var fake_indicator = !this.demodulator.low_cut || !this.demodulator.high_cut;
if (fake_indicator) {
// fake values just so that the tuning indicator shows up
from -= 100000;
to += 100000;
} else {
from += this.demodulator.low_cut;
to += this.demodulator.high_cut;
}
var from_px = scale_px_from_freq(from, range); var from_px = scale_px_from_freq(from, range);
var to = center_freq + this.demodulator.offset_frequency + this.demodulator.high_cut;
var to_px = scale_px_from_freq(to, range); var to_px = scale_px_from_freq(to, range);
if (to_px < from_px) /* swap'em */ { if (to_px < from_px) /* swap'em */ {
var temp_px = to_px; var temp_px = to_px;
@ -69,22 +79,27 @@ Envelope.prototype.draw = function(visible_range){
var drag_ranges = {envelope_on_screen: false, line_on_screen: false}; var drag_ranges = {envelope_on_screen: false, line_on_screen: false};
if (!(to_px < 0 || from_px > window.innerWidth)) // out of screen? if (!(to_px < 0 || from_px > window.innerWidth)) // out of screen?
{ {
drag_ranges.beginning = {x1: from_px, x2: from_px + env_bounding_line_w + env_att_w}; if (!fake_indicator) {
drag_ranges.ending = {x1: to_px - env_bounding_line_w - env_att_w, x2: to_px}; drag_ranges.beginning = {x1: from_px, x2: from_px + env_bounding_line_w + env_att_w};
drag_ranges.whole_envelope = {x1: from_px, x2: to_px}; drag_ranges.ending = {x1: to_px - env_bounding_line_w - env_att_w, x2: to_px};
drag_ranges.envelope_on_screen = true; drag_ranges.whole_envelope = {x1: from_px, x2: to_px};
scale_ctx.beginPath(); drag_ranges.envelope_on_screen = true;
}
if (fake_indicator) scale_ctx.setLineDash([10, 5]);
scale_ctx.lineWidth = 3;
scale_ctx.globalAlpha = 0.3;
scale_ctx.fill();
scale_ctx.globalAlpha = 1;
scale_ctx.moveTo(from_px, env_h1); scale_ctx.moveTo(from_px, env_h1);
scale_ctx.lineTo(from_px + env_bounding_line_w, env_h1); scale_ctx.lineTo(from_px + env_bounding_line_w, env_h1);
scale_ctx.lineTo(from_px + env_bounding_line_w + env_att_w, env_h2); scale_ctx.lineTo(from_px + env_bounding_line_w + env_att_w, env_h2);
scale_ctx.lineTo(to_px - env_bounding_line_w - env_att_w, env_h2); scale_ctx.lineTo(to_px - env_bounding_line_w - env_att_w, env_h2);
scale_ctx.lineTo(to_px - env_bounding_line_w, env_h1); scale_ctx.lineTo(to_px - env_bounding_line_w, env_h1);
scale_ctx.lineTo(to_px, env_h1); scale_ctx.lineTo(to_px, env_h1);
scale_ctx.lineWidth = 3;
scale_ctx.globalAlpha = 0.3;
scale_ctx.fill();
scale_ctx.globalAlpha = 1;
scale_ctx.stroke(); scale_ctx.stroke();
scale_ctx.lineWidth = 1; scale_ctx.lineWidth = 1;
scale_ctx.font = "bold 11px sans-serif"; scale_ctx.font = "bold 11px sans-serif";
scale_ctx.textBaseline = "top"; scale_ctx.textBaseline = "top";
@ -103,8 +118,10 @@ Envelope.prototype.draw = function(visible_range){
if (!(line_px < 0 || line_px > window.innerWidth)) { if (!(line_px < 0 || line_px > window.innerWidth)) {
drag_ranges.line = {x1: line_px - env_line_click_area / 2, x2: line_px + env_line_click_area / 2}; drag_ranges.line = {x1: line_px - env_line_click_area / 2, x2: line_px + env_line_click_area / 2};
drag_ranges.line_on_screen = true; drag_ranges.line_on_screen = true;
scale_ctx.beginPath();
scale_ctx.moveTo(line_px, env_h1 + env_lineplus); scale_ctx.moveTo(line_px, env_h1 + env_lineplus);
scale_ctx.lineTo(line_px, env_h2 - env_lineplus); scale_ctx.lineTo(line_px, env_h2 - env_lineplus);
scale_ctx.setLineDash([]);
scale_ctx.lineWidth = 3; scale_ctx.lineWidth = 3;
scale_ctx.stroke(); scale_ctx.stroke();
} }
@ -214,7 +231,7 @@ function Demodulator(offset_frequency, modulation) {
this.state = {}; this.state = {};
this.secondary_demod = false; this.secondary_demod = false;
var mode = Modes.findByModulation(modulation); var mode = Modes.findByModulation(modulation);
if (mode) { if (mode && mode.bandpass) {
this.low_cut = mode.bandpass.low_cut; this.low_cut = mode.bandpass.low_cut;
this.high_cut = mode.bandpass.high_cut; this.high_cut = mode.bandpass.high_cut;
} }

2
owrx/modes.py
View file

@ -132,7 +132,7 @@ class Modes(object):
"freedv", "FreeDV", bandpass=Bandpass(300, 3000), requirements=["digital_voice_freedv"], squelch=False "freedv", "FreeDV", bandpass=Bandpass(300, 3000), requirements=["digital_voice_freedv"], squelch=False
), ),
AnalogMode("drm", "DRM", bandpass=Bandpass(-5000, 5000), requirements=["drm"], squelch=False), AnalogMode("drm", "DRM", bandpass=Bandpass(-5000, 5000), requirements=["drm"], squelch=False),
AnalogMode("dab", "DAB", bandpass=Bandpass(-800000, 800000), requirements=["dab"], squelch=False), AnalogMode("dab", "DAB", bandpass=None, requirements=["dab"], squelch=False),
DigitalMode("bpsk31", "BPSK31", underlying=["usb"]), DigitalMode("bpsk31", "BPSK31", underlying=["usb"]),
DigitalMode("bpsk63", "BPSK63", underlying=["usb"]), DigitalMode("bpsk63", "BPSK63", underlying=["usb"]),
DigitalMode("rtty170", "RTTY 45/170", underlying=["usb", "lsb"]), DigitalMode("rtty170", "RTTY 45/170", underlying=["usb", "lsb"]),