X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2FlabelsKMB.html;h=71d32326862b7146a6330eb33d43c58ef8004e10;hb=606568fef36a321148399da4c58a05e2753ac2f9;hp=9886d26b63c06884b57454bcdd216bf17c285f9e;hpb=02ecfa7a72bdf04b0648cb4daef5dc1bca66db67;p=dygraphs.git

diff --git a/tests/labelsKMB.html b/tests/labelsKMB.html
index 9886d26..71d3232 100644
--- a/tests/labelsKMB.html
+++ b/tests/labelsKMB.html
@@ -1,10 +1,12 @@
+<!DOCTYPE html>
 <html>
   <head>
     <title>labelsKMB</title>
     <!--[if IE]>
-    <script type="text/javascript" src="excanvas.js"></script>
+    <script type="text/javascript" src="../excanvas.js"></script>
     <![endif]-->
-    <script type="text/javascript" src="../dygraph-combined.js"></script>
+    <script type="text/javascript" src="../strftime/strftime-min.js"></script>
+    <script type="text/javascript" src="../rgbcolor/rgbcolor.js"></script>
     <script type="text/javascript" src="../dygraph-canvas.js"></script>
     <script type="text/javascript" src="../dygraph.js"></script>
   </head>
@@ -12,20 +14,41 @@
     <p>labelsKMB:</p>
     <div id="labelsKMB" style="width:600px; height: 300px;"></div>
 
-    <p>labelsKMG:</p>
+    <p>labelsKMG2:</p>
     <div id="labelsKMG2" style="width:600px; height: 300px;"></div>
 
+    <p>labelsKMG2 with yValueFormatter:</p>
+    <div id="labelsKMG2yValueFormatter" style="width:600px; height: 300px;"></div>
+
     <p>The curves are exponentials. Zooming in should reveal each of the 'K',
     'M', 'B', etc. labels.</p>
 
     <script type="text/javascript">
+      function round(num, places) {
+        var shift = Math.pow(10, places);
+        return Math.round(num * shift)/shift;
+      };
+
       var data = [];
       for (var i = 0, n = 1; i < 43; i++, n *= 2) {
         data.push([i, n]);
       }
 
+      var suffixes = ['', 'k', 'M', 'G', 'T'];
+      function formatValue(v) {
+        if (v < 1000) return v;
+
+        var magnitude = Math.floor(String(Math.floor(v)).length / 3);
+        if (magnitude > suffixes.length - 1)
+          magnitude = suffixes.length - 1;
+        return String(round(v / Math.pow(10, magnitude * 3), 2)) +
+          suffixes[magnitude];
+      }
+
       new Dygraph(document.getElementById("labelsKMB"), data, { labelsKMB: true });
       new Dygraph(document.getElementById("labelsKMG2"), data, { labelsKMG2: true });
+      var g = new Dygraph(document.getElementById("labelsKMG2yValueFormatter"), data,
+                          { labelsKMG2: true, yValueFormatter: formatValue });
     </script>
   </body>
 </html>
