joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor frequency display

Browse Source
This commit is contained in:
Jakob Ketterl 2020-01-18 21:33:10 +01:00
parent 470fc43646
commit ae98e6bc56
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/index.html
View File

@ -31,6 +31,7 @@
<script src="static/lib/AudioEngine.js"></script> <script src="static/lib/AudioEngine.js"></script>
<script src="static/lib/ProgressBar.js"></script> <script src="static/lib/ProgressBar.js"></script>
<script src="static/lib/Measurement.js"></script> <script src="static/lib/Measurement.js"></script>
<script src="static/lib/FrequencyDisplay.js"></script>
<link rel="stylesheet" type="text/css" href="static/lib/nanoscroller.css" /> <link rel="stylesheet" type="text/css" href="static/lib/nanoscroller.css" />
<link rel="stylesheet" type="text/css" href="static/css/openwebrx.css" /> <link rel="stylesheet" type="text/css" href="static/css/openwebrx.css" />
<meta charset="utf-8"> <meta charset="utf-8">

7
htdocs/lib/FrequencyDisplay.js Normal file
View File

@ -0,0 +1,7 @@
function FrequencyDisplay(element) {
this.element = $(element);
}
FrequencyDisplay.prototype.setFrequency = function(freq) {
this.element.html((freq / 1e6).toLocaleString(undefined, {maximumFractionDigits: 4, minimumFractionDigits: 3}) + " MHz");
}

17
htdocs/openwebrx.js
View File

@ -512,7 +512,7 @@ function Demodulator_default_analog(offset_frequency, subtype) {
mkenvelopes(this.visible_range); mkenvelopes(this.visible_range);
this.parent.set(); this.parent.set();
//will have to change this when changing to multi-demodulator mode: //will have to change this when changing to multi-demodulator mode:
e("webrx-actual-freq").innerHTML = format_frequency("{x} MHz", center_freq + this.parent.offset_frequency, 1e6, 4); tunedFrequencyDisplay.setFrequency(center_freq + this.parent.offset_frequency);
return true; return true;
}; };
@ -570,7 +570,7 @@ function demodulator_set_offset_frequency(which, to_what) {
demodulators[0].offset_frequency = Math.round(to_what); demodulators[0].offset_frequency = Math.round(to_what);
demodulators[0].set(); demodulators[0].set();
mkenvelopes(get_visible_freq_range()); mkenvelopes(get_visible_freq_range());
$("#webrx-actual-freq").html(format_frequency("{x} MHz", center_freq + to_what, 1e6, 4)); tunedFrequencyDisplay.setFrequency(center_freq + to_what);
} }
function waterfallWidth() { function waterfallWidth() {
@ -584,9 +584,13 @@ function waterfallWidth() {
var scale_ctx; var scale_ctx;
var scale_canvas; var scale_canvas;
var tunedFrequencyDisplay;
var mouseFrequencyDisplay;
function scale_setup() { function scale_setup() {
e("webrx-actual-freq").innerHTML = format_frequency("{x} MHz", canvas_get_frequency(window.innerWidth / 2), 1e6, 4); tunedFrequencyDisplay = new FrequencyDisplay($('#webrx-actual-freq'));
tunedFrequencyDisplay.setFrequency(canvas_get_frequency(window.innerWidth / 2));
mouseFrequencyDisplay = new FrequencyDisplay($('#webrx-mouse-freq'));
scale_canvas = e("openwebrx-scale-canvas"); scale_canvas = e("openwebrx-scale-canvas");
scale_ctx = scale_canvas.getContext("2d"); scale_ctx = scale_canvas.getContext("2d");
scale_canvas.addEventListener("mousedown", scale_canvas_mousedown, false); scale_canvas.addEventListener("mousedown", scale_canvas_mousedown, false);
@ -640,7 +644,7 @@ function scale_canvas_mousemove(evt) {
function frequency_container_mousemove(evt) { function frequency_container_mousemove(evt) {
var frequency = center_freq + scale_offset_freq_from_px(evt.pageX); var frequency = center_freq + scale_offset_freq_from_px(evt.pageX);
e("webrx-mouse-freq").innerHTML = format_frequency("{x} MHz", frequency, 1e6, 4); mouseFrequencyDisplay.setFrequency(frequency);
} }
function scale_canvas_end_drag(x) { function scale_canvas_end_drag(x) {
@ -916,8 +920,9 @@ function canvas_mousemove(evt) {
mkscale(); mkscale();
bookmarks.position(); bookmarks.position();
} }
} else {
mouseFrequencyDisplay.setFrequency(canvas_get_frequency(relativeX));
} }
else e("webrx-mouse-freq").innerHTML = format_frequency("{x} MHz", canvas_get_frequency(relativeX), 1e6, 4);
} }
function canvas_container_mouseleave() { function canvas_container_mouseleave() {
@ -1534,7 +1539,7 @@ function initialize_demodulator() {
demodulator_analog_replace(starting_mod); demodulator_analog_replace(starting_mod);
if (starting_offset_frequency) { if (starting_offset_frequency) {
demodulators[0].offset_frequency = starting_offset_frequency; demodulators[0].offset_frequency = starting_offset_frequency;
e("webrx-actual-freq").innerHTML = format_frequency("{x} MHz", center_freq + starting_offset_frequency, 1e6, 4); tunedFrequencyDisplay.setFrequency(center_freq + starting_offset_frequency);
demodulators[0].set(); demodulators[0].set();
mkscale(); mkscale();
} }