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

automatically switch SI prefixes based on frequency

This commit is contained in:
Jakob Ketterl 2021-02-28 15:51:07 +01:00
parent 06b6054071
commit 094f470ebb
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/lib/FrequencyDisplay.js
View File

@ -1,4 +1,10 @@
function FrequencyDisplay(element) { function FrequencyDisplay(element) {
this.prefixes = {
'k': 3,
'M': 6,
'G': 9,
'T': 12
};
this.element = $(element); this.element = $(element);
this.digits = []; this.digits = [];
this.precision = 4; this.precision = 4;
@ -9,13 +15,23 @@ function FrequencyDisplay(element) {
FrequencyDisplay.prototype.setupElements = function() { FrequencyDisplay.prototype.setupElements = function() {
this.displayContainer = $('<div>'); this.displayContainer = $('<div>');
this.digitContainer = $('<span>'); this.digitContainer = $('<span>');
this.displayContainer.html([this.digitContainer, $('<span> MHz</span>')]); this.unitContainer = $('<span> Hz</span>');
this.displayContainer.html([this.digitContainer, this.unitContainer]);
this.element.html(this.displayContainer); this.element.html(this.displayContainer);
}; };
FrequencyDisplay.prototype.getPrefix = function() {
var me = this;
return Object.keys(me.prefixes).filter(function(key){
return me.prefixes[key] == me.exponent;
})[0] || "";
};
FrequencyDisplay.prototype.setFrequency = function(freq) { FrequencyDisplay.prototype.setFrequency = function(freq) {
this.frequency = freq; this.frequency = freq;
var formatted = (freq / 1e6).toLocaleString( this.exponent = Math.floor(Math.log10(this.frequency) / 3) * 3;
var formatted = (freq / 10 ** this.exponent).toLocaleString(
undefined, undefined,
{maximumFractionDigits: this.precision, minimumFractionDigits: this.precision} {maximumFractionDigits: this.precision, minimumFractionDigits: this.precision}
); );
@ -36,6 +52,7 @@ FrequencyDisplay.prototype.setFrequency = function(freq) {
while (this.digits.length > formatted.length) { while (this.digits.length > formatted.length) {
this.digits.pop().remove(); this.digits.pop().remove();
} }
this.unitContainer.text(' ' + this.getPrefix() + 'Hz');
}; };
FrequencyDisplay.prototype.setFrequencyPrecision = function(precision) { FrequencyDisplay.prototype.setFrequencyPrecision = function(precision) {
@ -68,7 +85,7 @@ TuneableFrequencyDisplay.prototype.setupEvents = function() {
var index = me.digitContainer.find('.digit').index(e.target); var index = me.digitContainer.find('.digit').index(e.target);
if (index < 0) return; if (index < 0) return;
var delta = 10 ** (Math.floor(Math.max(6, Math.log10(me.frequency))) - index); var delta = 10 ** (Math.floor(Math.max(me.exponent, Math.log10(me.frequency))) - index);
if (e.originalEvent.deltaY > 0) delta *= -1; if (e.originalEvent.deltaY > 0) delta *= -1;
var newFrequency = me.frequency + delta; var newFrequency = me.frequency + delta;

16
htdocs/lib/settings/ExponentialInput.js
View File

@ -1,9 +1,9 @@
$.fn.exponentialInput = function() { $.fn.exponentialInput = function() {
var suffixes = { var prefixes = {
"K": 3, 'K': 3,
"M": 6, 'M': 6,
"G": 9, 'G': 9,
"T": 12 'T': 12
}; };
this.each(function(){ this.each(function(){
@ -26,9 +26,9 @@ $.fn.exponentialInput = function() {
$input.on('keydown', function(e) { $input.on('keydown', function(e) {
var c = String.fromCharCode(e.which); var c = String.fromCharCode(e.which);
if (c in suffixes) { if (c in prefixes) {
currentExponent = suffixes[c]; currentExponent = prefixes[c];
$exponent.val(suffixes[c]); $exponent.val(prefixes[c]);
} }
}); });