fixing based on @rashidkpc review

elastic · Jan 13, 2017 · 2b07d6a · 2b07d6a
1 parent 6100b5f
commit 2b07d6a
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 4 deletions.
diff --git a/src/core_plugins/timelion/public/panels/timechart/schema.js b/src/core_plugins/timelion/public/panels/timechart/schema.js
@@ -165,6 +165,43 @@ module.exports = function timechartFn(Private, config, $rootScope, timefilter, $
           });
         }
 
+        function floorInBase(n, base) {
+          return base * Math.floor(n / base);
+        }
+
+        function generateTicks(axis) {
+          const returnTicks = [];
+          let tickSize = 2;
+          let delta = axis.delta;
+          let steps = 0;
+          let tickVal;
+          let tickCount = 0;
+
+          //Count the steps
+          while (Math.abs(delta) >= 1024) {
+            steps++;
+            delta /= 1024;
+          }
+
+          //Set the tick size relative to the remaining delta
+          while (tickSize <= 1024) {
+            if (delta <= tickSize) {
+              break;
+            }
+            tickSize *= 2;
+          }
+          axis.tickSize = tickSize * Math.pow(1024,steps);
+
+          //Calculate the new ticks
+          const tickMin = floorInBase(axis.min, axis.tickSize);
+          do {
+            tickVal = tickMin + (tickCount++) * axis.tickSize;
+            returnTicks.push(tickVal);
+          } while (tickVal < axis.max);
+
+          return returnTicks;
+        }
+
         let legendScope = $scope.$new();
         function drawPlot(plotConfig) {
 
@@ -228,6 +265,10 @@ module.exports = function timechartFn(Private, config, $rootScope, timefilter, $
               _.forEach(options.yaxes, yaxis => {
                 if (yaxis.units) {
                   yaxis.tickFormatter = tickFormatters[yaxis.units[0]];
+                  const byteModes = ['bits', 'bits/s', 'bytes', 'bytes/s'];
+                  if (byteModes.includes(yaxis.units[0])) {
+                    yaxis.tickGenerator = generateTicks(yaxis);
+                  }
                 }
               });
             }

diff --git a/src/core_plugins/timelion/public/services/tick_formatters.js b/src/core_plugins/timelion/public/services/tick_formatters.js
@@ -5,7 +5,7 @@ define(function (require) {
       'bits': function (val, axis) {
         var labels = ['b','kb','mb','gb','tb','pb'];
         var index = 0;
-        while (val > 1000 && index < labels.length) {
+        while (val >= 1000 && index < labels.length) {
           val /= 1000;
           index++;
         }
@@ -14,7 +14,7 @@ define(function (require) {
       'bits/s': function (val, axis) {
         var labels = ['b/s','kb/s','mb/s','gb/s','tb/s','pb/s'];
         var index = 0;
-        while (val > 1000 && index < labels.length) {
+        while (val >= 1000 && index < labels.length) {
           val /= 1000;
           index++;
         }
@@ -23,7 +23,7 @@ define(function (require) {
       'bytes': function (val, axis) {
         var labels = ['B','KB','MB','GB','TB','PB'];
         var index = 0;
-        while (val > 1024 && index < labels.length) {
+        while (val >= 1024 && index < labels.length) {
           val /= 1024;
           index++;
         }
@@ -32,7 +32,7 @@ define(function (require) {
       'bytes/s': function (val, axis) {
         var labels = ['B/s','KB/s','MB/s','GB/s','TB/s','PB/s'];
         var index = 0;
-        while (val > 1024 && index < labels.length) {
+        while (val >= 1024 && index < labels.length) {
           val /= 1024;
           index++;
         }