always refresh if the previous rate calc failed

castedmo · Feb 4, 2017 · 02dc1da · 02dc1da
1 parent 7a93d06
commit 02dc1da
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -51,6 +51,9 @@ This panel is based on [FlipClock](http://flipclockjs.com/) and built upon [Graf
 
 #### Changelog
 
+##### v0.0.4
+- Always refresh if the previous rate calculation failed
+
 ##### v0.0.3
 - Throttle refresh frequency
 

diff --git a/dist/README.md b/dist/README.md
@@ -51,6 +51,9 @@ This panel is based on [FlipClock](http://flipclockjs.com/) and built upon [Graf
 
 #### Changelog
 
+##### v0.0.4
+- Always refresh if the previous rate calculation failed
+
 ##### v0.0.3
 - Throttle refresh frequency
 

diff --git a/dist/ctrl.js b/dist/ctrl.js
diff --git a/dist/ctrl.js.map b/dist/ctrl.js.map
diff --git a/dist/plugin.json b/dist/plugin.json
@@ -20,8 +20,8 @@
             "name": "Showcase",
             "path": "screenshots/counter1.png"
         }],
-        "version": "0.0.2",
-        "updated": "2017-01-18"
+        "version": "0.0.4",
+        "updated": "2017-02-04"
     },
 
     "dependencies": {

diff --git a/src/ctrl.js b/src/ctrl.js
@@ -64,6 +64,7 @@ class CounterPanelCtrl extends MetricsPanelCtrl {
     });
     this.statChangeInterval = null;
     this.lastRefreshTime = new Date(2016, 1, 1, 1, 1, 1);
+    this.refreshRate = 0;
     this.newData = false;
     this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
     this.events.on('render', this.onRender.bind(this));
@@ -160,15 +161,18 @@ class CounterPanelCtrl extends MetricsPanelCtrl {
         var timeDiff = lastPoint[1] -  prevPoint[1];
         var rate = Math.floor(timeDiff / lastPoint[0]);
         this.statCounter.setTime(whole-lastPoint[0]);
+        if (this.statChangeInterval)
+          clearInterval(this.statChangeInterval);
         if (rate > 0) {
-          if (this.statChangeInterval)
-            clearInterval(this.statChangeInterval);
           var sc = this.statCounter;
           if (isFinite(rate)){
+            this.refreshRate = rate;
             this.statChangeInterval = setInterval(function () {
               //for (var i=0; i<7; i++)
                 sc.increment();
             }, rate);
+          }else{
+            this.refreshRate = 0;
           }
         }
       }
@@ -357,7 +361,7 @@ class CounterPanelCtrl extends MetricsPanelCtrl {
     this.data = data;
 
     var now = Date.now();
-    if (Math.floor(now - this.lastRefreshTime) >= this.panel.refreshMinSec*1000){
+    if (this.refreshRate === 0 ||  Math.floor(now - this.lastRefreshTime) >= this.panel.refreshMinSec*1000){
       this.newData = true;
       this.lastRefreshTime = now;
       this.render();

diff --git a/src/plugin.json b/src/plugin.json
@@ -20,8 +20,8 @@
             "name": "Showcase",
             "path": "screenshots/counter1.png"
         }],
-        "version": "0.0.2",
-        "updated": "2017-01-18"
+        "version": "0.0.4",
+        "updated": "2017-02-04"
     },
 
     "dependencies": {