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

change display precision behavior to reference Hertz

Browse Source
This commit is contained in:
Jakob Ketterl
2021-03-01 01:19:06 +01:00
parent 6bd47cf914
commit d81f0ae96c
7 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/lib/DemodulatorPanel.js
View File

@ -353,9 +353,9 @@ DemodulatorPanel.prototype.setMouseFrequency = function(freq) {
this.mouseFrequencyDisplay.setFrequency(freq);
};
DemodulatorPanel.prototype.setFrequencyPrecision = function(precision) {
this.tuneableFrequencyDisplay.setFrequencyPrecision(precision);
this.mouseFrequencyDisplay.setFrequencyPrecision(precision);
DemodulatorPanel.prototype.setTuningPrecision = function(precision) {
this.tuneableFrequencyDisplay.setTuningPrecision(precision);
this.mouseFrequencyDisplay.setTuningPrecision(precision);
};
$.fn.demodulatorPanel = function(){

9
htdocs/lib/FrequencyDisplay.js
View File

@ -7,7 +7,7 @@ function FrequencyDisplay(element) {
};
this.element = $(element);
this.digits = [];
this.precision = 4;
this.precision = 2;
this.setupElements();
this.setFrequency(0);
}
@ -31,9 +31,10 @@ FrequencyDisplay.prototype.setFrequency = function(freq) {
this.frequency = freq;
this.exponent = Math.floor(Math.log10(this.frequency) / 3) * 3;
var digits = Math.max(0, this.exponent - this.precision);
var formatted = (freq / 10 ** this.exponent).toLocaleString(
undefined,
{maximumFractionDigits: this.precision, minimumFractionDigits: this.precision}
{maximumFractionDigits: digits, minimumFractionDigits: digits}
);
var children = this.digitContainer.children();
for (var i = 0; i < formatted.length; i++) {
@ -55,8 +56,8 @@ FrequencyDisplay.prototype.setFrequency = function(freq) {
this.unitContainer.text(' ' + this.getPrefix() + 'Hz');
};
FrequencyDisplay.prototype.setFrequencyPrecision = function(precision) {
if (!precision) return;
FrequencyDisplay.prototype.setTuningPrecision = function(precision) {
if (typeof(precision) == 'undefined') return;
this.precision = precision;
this.setFrequency(this.frequency);
};

4
htdocs/openwebrx.js
View File

@ -770,8 +770,8 @@ function on_ws_recv(evt) {
waterfall_clear();
}
if ('frequency_display_precision' in config)
$('#openwebrx-panel-receiver').demodulatorPanel().setFrequencyPrecision(config['frequency_display_precision']);
if ('tuning_precision' in config)
$('#openwebrx-panel-receiver').demodulatorPanel().setTuningPrecision(config['tuning_precision']);
break;
case "secondary_config":