Fix for #67 - Scale Chart X axis when layers > 100

j7126 · Oct 4, 2019 · a69269f · a69269f
1 parent d858ce2
commit a69269f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/octoprint_dashboard/__init__.py b/octoprint_dashboard/__init__.py
@@ -40,7 +40,7 @@ def psUtilGetStats(self):
     def on_after_startup(self):
         self._logger.info("Dashboard started")
 
-        self.timer = RepeatedTimer(2.0, self.send_notifications, run_first=True)
+        self.timer = RepeatedTimer(3.0, self.send_notifications, run_first=True)
         self.timer.start()
 
     def send_notifications(self):

diff --git a/octoprint_dashboard/static/js/dashboard.js b/octoprint_dashboard/static/js/dashboard.js
@@ -337,11 +337,9 @@ $(function () {
                     showGrid: false,
                     showLabel: true,
                     labelInterpolationFnc: function skipLabels(value, index, labels) {
-                        if(labels.length > 100) {
-                            return index % 8  === 0 ? value : null;
-                        }
-                        else if(labels.length > 50) {
-                            return index % 4  === 0 ? value : null;
+                        let labelScale = Math.round( ( labels.length + 60 ) / 10 );
+                        if(labels.length > 40) {
+                            return index % labelScale  === 0 ? value : null;
                         } else {
                             return value;
                         }