refactor progressbars into objects

htdocs/index.html

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

htdocs/lib/ProgressBar.js

@@ -0,0 +1,113 @@
+ProgressBar = function(el) {
+    this.$el = $(el);
+    this.$innerText = this.$el.find('.openwebrx-progressbar-text');
+    this.$innerBar = this.$el.find('.openwebrx-progressbar-bar');
+    this.$innerBar.css('width', '0%');
+};
+
+ProgressBar.prototype.set = function(val, text, over) {
+    this.setValue(val);
+    this.setText(text);
+    this.setOver(over);
+};
+
+ProgressBar.prototype.setValue = function(val) {
+    if (val < 0) val = 0;
+    if (val > 1) val = 1;
+    this.$innerBar.stop().animate({width: val * 100 + '%'}, 700);
+};
+
+ProgressBar.prototype.setText = function(text) {
+    this.$innerText.html(text);
+};
+
+ProgressBar.prototype.setOver = function(over) {
+    this.$innerBar.css('backgroundColor', (over) ? "#ff6262" : "#00aba6");
+};
+
+AudioBufferProgressBar = function(el, sampleRate) {
+    ProgressBar.call(this, el);
+    this.sampleRate = sampleRate;
+};
+
+AudioBufferProgressBar.prototype = new ProgressBar();
+
+AudioBufferProgressBar.prototype.setBuffersize = function(buffersize) {
+    var audio_buffer_value = buffersize / this.sampleRate;
+    var overrun = audio_buffer_value > audio_buffer_maximal_length_sec;
+    var underrun = audio_buffer_value === 0;
+    var text = "buffer";
+    if (overrun) {
+        text = "overrun";
+    }
+    if (underrun) {
+        text = "underrun";
+    }
+    this.set(audio_buffer_value, "Audio " + text + " [" + (audio_buffer_value).toFixed(1) + " s]", overrun || underrun);
+};
+
+
+NetworkSpeedProgressBar = function(el) {
+    ProgressBar.call(this, el);
+};
+
+NetworkSpeedProgressBar.prototype = new ProgressBar();
+
+NetworkSpeedProgressBar.prototype.setSpeed = function(speed) {
+   this.set(speed * 8 / 2000, "Network usage [" + (speed * 8).toFixed(1) + " kbps]", false);
+};
+
+AudioSpeedProgressBar = function(el) {
+    ProgressBar.call(this, el);
+};
+
+AudioSpeedProgressBar.prototype = new ProgressBar();
+
+AudioSpeedProgressBar.prototype.setSpeed = function(speed) {
+    this.set(speed / 500000, "Audio stream [" + (speed / 1000).toFixed(0) + " kbps]", false);
+};
+
+AudioOutputProgressBar = function(el, sampleRate) {
+    ProgressBar.call(this, el);
+    this.maxRate = sampleRate * 1.25;
+    this.minRate = sampleRate * .25;
+};
+
+AudioOutputProgressBar.prototype = new ProgressBar();
+
+AudioOutputProgressBar.prototype.setAudioRate = function(audioRate) {
+    this.set(audioRate / this.maxRate, "Audio output [" + (audioRate / 1000).toFixed(1) + " ksps]", audioRate > this.maxRate || audioRate < this.minRate);
+};
+
+ClientsProgressBar = function(el) {
+    ProgressBar.call(this, el);
+    this.clients = 0;
+    this.maxClients = 0;
+};
+
+ClientsProgressBar.prototype = new ProgressBar();
+
+ClientsProgressBar.prototype.setClients = function(clients) {
+    this.clients = clients;
+    this.render();
+};
+
+ClientsProgressBar.prototype.setMaxClients = function(maxClients) {
+    this.maxClients = maxClients;
+    this.render();
+};
+
+ClientsProgressBar.prototype.render = function() {
+    console.info(this);
+    this.set(this.clients / this.maxClients, "Clients [" + this.clients + "]", this.clients > this.maxClients * 0.85);
+};
+
+CpuProgressBar = function(el) {
+    ProgressBar.call(this, el);
+};
+
+CpuProgressBar.prototype = new ProgressBar();
+
+CpuProgressBar.prototype.setUsage = function(usage) {
+    this.set(usage, "Server CPU [" + Math.round(usage * 100) + "%]", usage > .85);
+};

htdocs/openwebrx.js

@@ -1063,8 +1063,6 @@ function resize_waterfall_container(check_init) {
 
 var debug_ws_data_received = 0;
 var debug_ws_time_start;
-var max_clients_num = 0;
-var client_num = 0;
 var currentprofile;
 
 var COMPRESS_FFT_PAD_N = 10; //should be the same as in csdr.c
@@ -1099,8 +1097,7 @@ function on_ws_recv(evt) {
                         divlog("Audio stream is " + ((audio_compression === "adpcm") ? "compressed" : "uncompressed") + ".");
                         fft_compression = config['fft_compression'];
                         divlog("FFT stream is " + ((fft_compression === "adpcm") ? "compressed" : "uncompressed") + ".");
-                        max_clients_num = config['max_clients'];
+                        clientProgressBar.setMaxClients(config['max_clients']);
-                        progressbar_set(e("openwebrx-bar-clients"), client_num / max_clients_num, "Clients [" + client_num + "]", client_num > max_clients_num * 0.85);
                         mathbox_waterfall_colors = config['mathbox_waterfall_colors'];
                         mathbox_waterfall_frequency_resolution = config['mathbox_waterfall_frequency_resolution'];
                         mathbox_waterfall_history_length = config['mathbox_waterfall_history_length'];
@@ -1134,12 +1131,10 @@ function on_ws_recv(evt) {
                         setSmeterAbsoluteValue(smeter_level);
                         break;
                     case "cpuusage":
-                        var server_cpu_usage = json['value'];
+                        cpuProgressBar.setUsage(json['value']);
-                        progressbar_set(e("openwebrx-bar-server-cpu"), server_cpu_usage, "Server CPU [" + Math.round(server_cpu_usage * 100) + "%]", server_cpu_usage > 85);
                         break;
                     case "clients":
-                        client_num = json['value'];
+                        clientProgressBar.setClients(json['value']);
-                        progressbar_set(e("openwebrx-bar-clients"), client_num / max_clients_num, "Clients [" + client_num + "]", client_num > max_clients_num * 0.85);
                         break;
                     case "profiles":
                         var listbox = e("openwebrx-sdr-profiles-listbox");
@@ -1937,40 +1932,39 @@ function init_header() {
     });
 }
 
-function audio_buffer_progressbar_update(buffersize) {
+var audioBufferProgressBar;
-    var audio_buffer_value = buffersize / audioEngine.getSampleRate();
+var networkSpeedProgressBar;
-    var overrun = audio_buffer_value > audio_buffer_maximal_length_sec;
+var audioSpeedProgressBar;
-    var underrun = audio_buffer_value === 0;
+var audioOutputProgressBar;
-    var text = "buffer";
+var clientProgressBar;
-    if (overrun) {
+var cpuProgressBar;
-        text = "overrun";
+
-    }
+function initProgressBars() {
-    if (underrun) {
+    audioBufferProgressBar = new AudioBufferProgressBar($('#openwebrx-bar-audio-buffer'), audioEngine.getSampleRate());
-        text = "underrun";
+    networkSpeedProgressBar = new NetworkSpeedProgressBar($('#openwebrx-bar-network-speed'));
-    }
+    audioSpeedProgressBar = new AudioSpeedProgressBar($('#openwebrx-bar-audio-speed'));
-    progressbar_set(e("openwebrx-bar-audio-buffer"), audio_buffer_value, "Audio " + text + " [" + (audio_buffer_value).toFixed(1) + " s]", overrun || underrun);
+    audioOutputProgressBar = new AudioOutputProgressBar($('#openwebrx-bar-audio-output'), audioEngine.getSampleRate());
-}
+    clientProgressBar = new ClientsProgressBar($('#openwebrx-bar-clients'));
+    cpuProgressBar = new CpuProgressBar($('#openwebrx-bar-server-cpu'));
+};
 
 function updateNetworkStats() {
     var elapsed = (new Date() - debug_ws_time_start) / 1000;
     var network_speed_value = (debug_ws_data_received / 1000) /  elapsed;
-    progressbar_set(e("openwebrx-bar-network-speed"), network_speed_value * 8 / 2000, "Network usage [" + (network_speed_value * 8).toFixed(1) + " kbps]", false);
+    networkSpeedProgressBar.setSpeed(network_speed_value);
 }
 
 function audioReporter(stats) {
     if (typeof(stats.buffersize) !== 'undefined') {
-        audio_buffer_progressbar_update(stats.buffersize);
+        audioBufferProgressBar.setBuffersize(stats.buffersize);
     }
 
     if (typeof(stats.audioByteRate) !== 'undefined') {
-        var audio_speed_value = stats.audioByteRate * 8;
+        audioSpeedProgressBar.setSpeed(stats.audioByteRate * 8);
-        progressbar_set(e("openwebrx-bar-audio-speed"), audio_speed_value / 500000, "Audio stream [" + (audio_speed_value / 1000).toFixed(0) + " kbps]", false);
     }
 
     if (typeof(stats.audioRate) !== 'undefined') {
-        var audio_max_rate = audioEngine.getSampleRate() * 1.25;
+        audioOutputProgressBar.setAudioRate(stats.audioRate);
-        var audio_min_rate = audioEngine.getSampleRate() * .25;
-        progressbar_set(e("openwebrx-bar-audio-output"), stats.audioRate / audio_max_rate, "Audio output [" + (stats.audioRate / 1000).toFixed(1) + " ksps]", stats.audioRate > audio_max_rate || stats.audioRate < audio_min_rate);
     }
 }
 
@@ -1986,6 +1980,7 @@ function openwebrx_init() {
     } else {
         audioEngine.start(onAudioStart);
     }
+    initProgressBars();
     init_rx_photo();
     open_websocket();
     setInterval(updateNetworkStats, 1000);
@@ -2162,24 +2157,6 @@ function place_panels(function_apply) {
     }
 }
 
-function progressbar_set(obj, val, text, over) {
-    if (val < 0.05) val = 0;
-    if (val > 1) val = 1;
-    var innerBar = null;
-    var innerText = null;
-    for (var i = 0; i < obj.children.length; i++) {
-        if (obj.children[i].className === "openwebrx-progressbar-text") innerText = obj.children[i];
-        else if (obj.children[i].className === "openwebrx-progressbar-bar") innerBar = obj.children[i];
-    }
-    if (innerBar == null) return;
-    //.h: function animate(object,style_name,unit,from,to,accel,time_ms,fps,to_exec)
-    animate(innerBar, "width", "px", innerBar.clientWidth, val * obj.clientWidth, 0.7, 700, 60);
-    //innerBar.style.width=(val*100).toFixed(0)+"%";
-    innerBar.style.backgroundColor = (over) ? "#ff6262" : "#00aba6";
-    if (innerText == null) return;
-    innerText.innerHTML = text;
-}
-
 function demodulator_buttons_update() {
     $(".openwebrx-demodulator-button").removeClass("highlighted");
     if (secondary_demod) {