X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Faxis_labels.js;h=e50b002f25755ec20bf45eaae278e89dced8626d;hb=94647da23ed251ba0f1da8d155d2552680a4e9cf;hp=6d861e13c2df3538b7ec050bba8acb587e19c739;hpb=5ab6387715ede38379e4768e2af0f0ae1d6a3044;p=dygraphs.git

diff --git a/auto_tests/tests/axis_labels.js b/auto_tests/tests/axis_labels.js
index 6d861e1..e50b002 100644
--- a/auto_tests/tests/axis_labels.js
+++ b/auto_tests/tests/axis_labels.js
@@ -55,7 +55,7 @@ AxisLabelsTestCase.prototype.testMinusOneToOne = function() {
   assertEquals(['0','20','40','60','80','100'], Util.getYLabels());
 
   g.setSelection(0);
-  assertEquals('0: Y:-1', Util.getLegend());
+  assertEquals('0: Y: -1', Util.getLegend());
 };
 
 AxisLabelsTestCase.prototype.testSmallRangeNearZero = function() {
@@ -88,7 +88,7 @@ AxisLabelsTestCase.prototype.testSmallRangeNearZero = function() {
                Util.makeNumbers(Util.getYLabels()));
 
   g.setSelection(1);
-  assertEquals('1: Y:0', Util.getLegend());
+  assertEquals('1: Y: 0', Util.getLegend());
 };
 
 AxisLabelsTestCase.prototype.testSmallRangeAwayFromZero = function() {
@@ -119,7 +119,7 @@ AxisLabelsTestCase.prototype.testSmallRangeAwayFromZero = function() {
   assertEquals(["10","10","10","10","10","10","10","10","10","10"], Util.getYLabels());
 
   g.setSelection(1);
-  assertEquals('1: Y:0', Util.getLegend());
+  assertEquals('1: Y: 0', Util.getLegend());
 };
 
 AxisLabelsTestCase.prototype.testXAxisTimeLabelFormatter = function() {
@@ -152,7 +152,7 @@ AxisLabelsTestCase.prototype.testXAxisTimeLabelFormatter = function() {
 
   // The legend does not use the axisLabelFormatter:
   g.setSelection(1);
-  assertEquals('5.1: Y1:1', Util.getLegend());
+  assertEquals('5.1: Y1: 1', Util.getLegend());
 };
 
 AxisLabelsTestCase.prototype.testAxisLabelFormatter = function () {
@@ -192,7 +192,7 @@ AxisLabelsTestCase.prototype.testAxisLabelFormatter = function () {
   assertEquals(['y0','y2','y4','y6','y8','y10','y12','y14','y16','y18'], Util.getYLabels());
 
   g.setSelection(2);
-  assertEquals("2: y:4", Util.getLegend());
+  assertEquals("2: y: 4", Util.getLegend());
 };
 
 AxisLabelsTestCase.prototype.testDateAxisLabelFormatter = function () {
@@ -232,7 +232,7 @@ AxisLabelsTestCase.prototype.testDateAxisLabelFormatter = function () {
   assertEquals(['y2','y4','y6','y8','y10','y12','y14','y16','y18'], Util.getYLabels());
 
   g.setSelection(0);
-  assertEquals("2011/01/01: y:2", Util.getLegend());
+  assertEquals("2011/01/01: y: 2", Util.getLegend());
 };
 
 // This test verifies that when a valueFormatter is set (but not an
@@ -278,7 +278,7 @@ AxisLabelsTestCase.prototype.testValueFormatter = function () {
 
   // they do affect the legend, however.
   g.setSelection(2);
-  assertEquals("x2: y:y4", Util.getLegend());
+  assertEquals("x2: y: y4", Util.getLegend());
 };
 
 AxisLabelsTestCase.prototype.testDateValueFormatter = function () {
@@ -321,7 +321,7 @@ AxisLabelsTestCase.prototype.testDateValueFormatter = function () {
 
   // the valueFormatter options also affect the legend.
   g.setSelection(2);
-  assertEquals('x2011/01/03: y:y6', Util.getLegend());
+  assertEquals('x2011/01/03: y: y6', Util.getLegend());
 };
 
 // This test verifies that when both a valueFormatter and an axisLabelFormatter
@@ -361,7 +361,7 @@ AxisLabelsTestCase.prototype.testAxisLabelFormatterPrecedence = function () {
   assertEquals(['y0','y2','y4','y6','y8','y10','y12','y14','y16','y18'], Util.getYLabels());
 
   g.setSelection(9);
-  assertEquals("xvf9: y:yvf18", Util.getLegend());
+  assertEquals("xvf9: y: yvf18", Util.getLegend());
 };
 
 // This is the same as the previous test, except that options are added
@@ -419,7 +419,7 @@ AxisLabelsTestCase.prototype.testAxisLabelFormatterIncremental = function () {
   assertEquals(['y0','y2','y4','y6','y8','y10','y12','y14','y16','y18'], Util.getYLabels());
 
   g.setSelection(9);
-  assertEquals("xvf9: y:yvf18", Util.getLegend());
+  assertEquals("xvf9: y: yvf18", Util.getLegend());
 };
 
 AxisLabelsTestCase.prototype.testGlobalFormatters = function() {
@@ -445,7 +445,7 @@ AxisLabelsTestCase.prototype.testGlobalFormatters = function() {
   assertEquals(['alf0','alf2','alf4','alf6','alf8','alf10','alf12','alf14','alf16','alf18'], Util.getYLabels());
 
   g.setSelection(9);
-  assertEquals("vf9: y:vf18", Util.getLegend());
+  assertEquals("vf9: y: vf18", Util.getLegend());
 };
 
 AxisLabelsTestCase.prototype.testSeriesOrder = function() {
@@ -464,7 +464,7 @@ AxisLabelsTestCase.prototype.testSeriesOrder = function() {
   var g = new Dygraph(graph, data, opts);
 
   g.setSelection(2);
-  assertEquals('2: 00:103 01:203 10:303 11:403', Util.getLegend());
+  assertEquals('2: 00: 103 01: 203 10: 303 11: 403', Util.getLegend());
 
   // Sanity checks for indexFromSetName
   assertEquals(0, g.indexFromSetName("x"));
@@ -521,7 +521,7 @@ AxisLabelsTestCase.prototype.testLabelKMG2 = function() {
       Util.getYLabels());
 };
 
-// Same sa testLabelKMG2 but specifies the option at the
+// Same as testLabelKMG2 but specifies the option at the
 // top of the option dictionary.
 AxisLabelsTestCase.prototype.testLabelKMG2_top = function() {
   var data = [];
@@ -703,3 +703,333 @@ AxisLabelsTestCase.prototype.testAxisLabelColorNull = function() {
   assertColor($(".dygraph-axis-label-x"), "rgb(0, 0, 0)");
   assertColor($(".dygraph-axis-label-y"), "rgb(0, 0, 0)");
 }
+
+/*
+ * This test shows that the label formatter overrides labelsKMB for all values.
+ */
+AxisLabelsTestCase.prototype.testLabelFormatterOverridesLabelsKMB = function() {
+  var g = new Dygraph(
+      document.getElementById("graph"),
+      "X,a,b\n" +
+      "1,0,2000\n" +
+      "2,500,1500\n" +
+      "3,1000,1000\n" +
+      "4,2000,0\n", {
+        labelsKMB: true,
+        axisLabelFormatter: function (v) {
+          return v + ":X";
+        }
+      });
+  assertEquals(["0:X","500:X","1000:X","1500:X","2000:X"], Util.getYLabels());
+  assertEquals(["1:X","1.5:X","2:X","2.5:X","3:X","3.5:X"], Util.getXLabels());
+}
+
+/*
+ * This test shows that you can override labelsKMB on the axis level.
+ */
+AxisLabelsTestCase.prototype.testLabelsKMBPerAxis = function() {
+  var g = new Dygraph(
+      document.getElementById("graph"),
+      "x,a,b\n" +
+      "1000,0,2000\n" +
+      "2000,500,1500\n" +
+      "3000,1000,1000\n" +
+      "4000,2000,0\n", {
+        labelsKMB: false,
+        axes: {
+          y2: { labelsKMB: true },
+          x: { labelsKMB: true }
+        },
+        series: {
+          b: { axis: "y2" },
+        }
+      });
+
+  // labelsKMB doesn't apply to the x axis. This value should be different.
+  assertEquals(["1000", "1500", "2000", "2500", "3000", "3500"], Util.getXLabels());
+  assertEquals( ["0","500","1000","1500","2000"], Util.getYLabels(1));
+  assertEquals(["0","500","1K","1.5K","2K"], Util.getYLabels(2));
+};
+
+/*
+ * This test shows that you can override labelsKMG2 on the axis level.
+ */
+AxisLabelsTestCase.prototype.testLabelsKMBG2IPerAxis = function() {
+  var g = new Dygraph(
+      document.getElementById("graph"),
+      "x,a,b\n" +
+      "1000,0,2000\n" +
+      "2000,500,1500\n" +
+      "3000,1000,1000\n" +
+      "4000,2000,0\n", {
+        labelsKMG2: false,
+        axes: {
+          y2: { labelsKMG2: true },
+          x: { labelsKMG2: true }
+        },
+        series: {
+          b: { axis: "y2" },
+        }
+      });
+
+  // It is weird that labelsKMG2 does something on the x axis but KMB does not.
+  // Plus I can't be sure they're doing the same thing as they're done in different
+  // bits of code.
+  assertEquals(["1024","1536","2048","2560","3072","3584"], Util.getXLabels());
+  assertEquals( ["0","500","1000","1500","2000"], Util.getYLabels(1));
+  assertEquals(["0","500","1000","1.46k","1.95k"], Util.getYLabels(2));
+};
+
+/**
+ * This test shows you can override sigFigs on the axis level.
+ */
+AxisLabelsTestCase.prototype.testSigFigsPerAxis = function() {
+  var g = new Dygraph(
+      document.getElementById("graph"),
+      "x,a,b\n" +
+      "1000,0,2000\n" +
+      "2000,500,1500\n" +
+      "3000,1000,1000\n" +
+      "4000,2000,0\n", {
+        sigFigs: 2,
+        axes: {
+          y2: { sigFigs: 6 },
+          x: { sigFigs: 8 }
+        },
+        series: {
+          b: { axis: "y2" },
+        }
+
+      });
+  // sigFigs doesn't apply to the x axis. This value should be different.
+  assertEquals(["1000","1500","2000","2500","3000","3500"], Util.getXLabels());
+  assertEquals(["0.0","5.0e+2","1.0e+3","1.5e+3","2.0e+3"], Util.getYLabels(1));
+  assertEquals(["0.00000","500.000","1000.00","1500.00","2000.00"], Util.getYLabels(2));
+}
+
+/**
+ * This test shows you can override digitsAfterDecimal on the axis level.
+ */
+AxisLabelsTestCase.prototype.testDigitsAfterDecimalPerAxis = function() {
+  var g = new Dygraph(
+      document.getElementById("graph"),
+      "x,a,b\n" +
+      "0.006,0.001,0.008\n" +
+      "0.007,0.002,0.007\n" +
+      "0.008,0.003,0.006\n" +
+      "0.009,0.004,0.005\n", {
+        digitsAfterDecimal: 1,
+        series: {
+          b: { axis: "y2" },
+        }
+
+      });
+
+  g.updateOptions({ axes: { y: { digitsAfterDecimal: 3 }}});
+  assertEquals(["0.001","0.002","0.002","0.003","0.003","0.004","0.004"], Util.getYLabels(1));
+  g.updateOptions({ axes: { y: { digitsAfterDecimal: 4 }}});
+  assertEquals(["0.001","0.0015","0.002","0.0025","0.003","0.0035","0.004"], Util.getYLabels(1));
+  g.updateOptions({ axes: { y: { digitsAfterDecimal: 5 }}});
+  assertEquals(["0.001","0.0015","0.002","0.0025","0.003","0.0035","0.004"], Util.getYLabels(1));
+  g.updateOptions({ axes: { y: { digitsAfterDecimal: null }}});
+  assertEquals(["1e-3","2e-3","2e-3","3e-3","3e-3","4e-3","4e-3"], Util.getYLabels(1));
+
+  g.updateOptions({ axes: { y2: { digitsAfterDecimal: 3 }}});
+  assertEquals(["0.005","0.006","0.006","0.007","0.007","0.008","0.008"], Util.getYLabels(2));
+  g.updateOptions({ axes: { y2: { digitsAfterDecimal: 4 }}});
+  assertEquals(["0.005","0.0055","0.006","0.0065","0.007","0.0075","0.008"], Util.getYLabels(2));
+  g.updateOptions({ axes: { y2: { digitsAfterDecimal: 5 }}});
+  assertEquals(["0.005","0.0055","0.006","0.0065","0.007","0.0075","0.008"], Util.getYLabels(2));
+  g.updateOptions({ axes: { y2: { digitsAfterDecimal: null }}});
+  assertEquals(["5e-3","6e-3","6e-3","7e-3","7e-3","7e-3","8e-3"], Util.getYLabels(2));
+
+
+  // digitsAfterDecimal is ignored for the x-axis.
+  g.updateOptions({ axes: { x: { digitsAfterDecimal: 3 }}});
+  assertEquals(["0.006","0.006500000000000001","0.007","0.0075","0.008","0.0085"], Util.getXLabels());
+  g.updateOptions({ axes: { x: { digitsAfterDecimal: 4 }}});
+  assertEquals(["0.006","0.006500000000000001","0.007","0.0075","0.008","0.0085"], Util.getXLabels());
+  g.updateOptions({ axes: { x: { digitsAfterDecimal: 5 }}});
+  assertEquals(["0.006","0.006500000000000001","0.007","0.0075","0.008","0.0085"], Util.getXLabels());
+  g.updateOptions({ axes: { x: { digitsAfterDecimal: null }}});
+  assertEquals(["0.006","0.006500000000000001","0.007","0.0075","0.008","0.0085"], Util.getXLabels());
+}
+
+/**
+ * This test shows you can override digitsAfterDecimal on the axis level.
+ */
+AxisLabelsTestCase.prototype.testMaxNumberWidthPerAxis = function() {
+  var g = new Dygraph(
+      document.getElementById("graph"),
+      "x,a,b\n" +
+      "12401,12601,12804\n" +
+      "12402,12602,12803\n" +
+      "12403,12603,12802\n" +
+      "12404,12604,12801\n", {
+        maxNumberWidth: 1,
+        series: {
+          b: { axis: "y2" },
+        }
+      });
+fail = function(x) {console.log(x)};
+  g.updateOptions({ axes: { y: { maxNumberWidth: 4 }}});
+  assertEquals(["1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4"] , Util.getYLabels(1));
+  g.updateOptions({ axes: { y: { maxNumberWidth: 5 }}});
+  assertEquals(["12601","12601.5","12602","12602.5","12603","12603.5","12604"] , Util.getYLabels(1));
+  g.updateOptions({ axes: { y: { maxNumberWidth: null }}});
+  assertEquals(["1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4"] , Util.getYLabels(1));
+
+  g.updateOptions({ axes: { y2: { maxNumberWidth: 4 }}});
+  assertEquals(["1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4"], Util.getYLabels(2));
+  g.updateOptions({ axes: { y2: { maxNumberWidth: 5 }}});
+  assertEquals(["12801","12801.5","12802","12802.5","12803","12803.5","12804"], Util.getYLabels(2));
+  g.updateOptions({ axes: { y2: { maxNumberWidth: null }}});
+  assertEquals(["1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4"], Util.getYLabels(2));
+
+  // maxNumberWidth is ignored for the x-axis.
+  g.updateOptions({ axes: { x: { maxNumberWidth: 4 }}});
+  assertEquals(["12401","12401.5","12402","12402.5","12403","12403.5"], Util.getXLabels());
+  g.updateOptions({ axes: { x: { maxNumberWidth: 5 }}});
+  assertEquals(["12401","12401.5","12402","12402.5","12403","12403.5"], Util.getXLabels());
+  g.updateOptions({ axes: { x: { maxNumberWidth: null }}});
+  assertEquals(["12401","12401.5","12402","12402.5","12403","12403.5"], Util.getXLabels());
+}
+
+/*
+// Regression test for http://code.google.com/p/dygraphs/issues/detail?id=147
+// Checks that axis labels stay sane across a DST change.
+AxisLabelsTestCase.prototype.testLabelsCrossDstChange = function() {
+  // (From tests/daylight-savings.html)
+  var g = new Dygraph(
+      document.getElementById("graph"),
+      "Date/Time,Purchases\n" +
+      "2010-11-05 00:00:00,167082\n" +
+      "2010-11-06 00:00:00,168571\n" +
+      "2010-11-07 00:00:00,177796\n" +
+      "2010-11-08 00:00:00,165587\n" +
+      "2010-11-09 00:00:00,164380\n",
+      { width: 1024 }
+      );
+
+  // Dates and "nice" hours: 6AM/PM and noon, not 5AM/11AM/...
+  var okLabels = {
+    '05Nov': true,
+    '06Nov': true,
+    '07Nov': true,
+    '08Nov': true,
+    '09Nov': true,
+    '06:00': true,
+    '12:00': true,
+    '18:00': true
+  };
+
+  var xLabels = Util.getXLabels();
+  for (var i = 0; i < xLabels.length; i++) {
+    assertTrue(okLabels[xLabels[i]]);
+  }
+
+  // This range had issues of its own on tests/daylight-savings.html.
+  g.updateOptions({
+    dateWindow: [1289109997722.8127, 1289261208937.7659]
+  });
+  xLabels = Util.getXLabels();
+  for (var i = 0; i < xLabels.length; i++) {
+    assertTrue(okLabels[xLabels[i]]);
+  }
+};
+
+
+// Tests data which crosses a "fall back" at a high enough frequency that you
+// can see both 1:00 A.M.s.
+AxisLabelsTestCase.prototype.testLabelsCrossDstChangeHighFreq = function() {
+  // Generate data which crosses the EST/EDT boundary.
+  var dst_data = [];
+  var base_ms = 1383454200000;
+  for (var x = base_ms; x < base_ms + 1000 * 60 * 80; x += 1000) {
+    dst_data.push([new Date(x), x]);
+  }
+
+  var g = new Dygraph(
+          document.getElementById("graph"),
+          dst_data,
+      { width: 1024, labels: ['Date', 'Value'] }
+      );
+
+  assertEquals([
+    '00:50', '00:55',
+    '01:00', '01:05', '01:10', '01:15', '01:20', '01:25',
+    '01:30', '01:35', '01:40', '01:45', '01:50', '01:55',
+    '01:00', '01:05'  // 1 AM number two!
+  ], Util.getXLabels());
+
+  // Now zoom past the initial 1 AM. This used to cause trouble.
+  g.updateOptions({
+    dateWindow: [1383454200000 + 15*60*1000, g.xAxisExtremes()[1]]}
+  );
+  assertEquals([
+    '01:05', '01:10', '01:15', '01:20', '01:25',
+    '01:30', '01:35', '01:40', '01:45', '01:50', '01:55',
+    '01:00', '01:05'  // 1 AM number two!
+  ], Util.getXLabels());
+};
+
+
+// Tests data which crosses a "spring forward" at a low frequency.
+// Regression test for http://code.google.com/p/dygraphs/issues/detail?id=433
+AxisLabelsTestCase.prototype.testLabelsCrossSpringForward = function() {
+  var g = new Dygraph(
+      document.getElementById("graph"),
+      "Date/Time,Purchases\n" +
+      "2011-03-11 00:00:00,167082\n" +
+      "2011-03-12 00:00:00,168571\n" +
+      "2011-03-13 00:00:00,177796\n" +
+      "2011-03-14 00:00:00,165587\n" +
+      "2011-03-15 00:00:00,164380\n",
+      {
+        width: 1024,
+        dateWindow: [1299989043119.4365, 1300080693627.4866]
+      });
+
+  var okLabels = {
+    '13Mar': true,
+    // '02:00': true,  // not a real time!
+    '04:00': true,
+    '06:00': true,
+    '08:00': true,
+    '10:00': true,
+    '12:00': true,
+    '14:00': true,
+    '16:00': true,
+    '18:00': true,
+    '20:00': true,
+    '22:00': true,
+    '14Mar': true
+  };
+
+  var xLabels = Util.getXLabels();
+  for (var i = 0; i < xLabels.length; i++) {
+    assertTrue(okLabels[xLabels[i]]);
+  }
+};
+
+AxisLabelsTestCase.prototype.testLabelsCrossSpringForwardHighFreq = function() {
+  var base_ms_spring = 1299999000000;
+  var dst_data_spring = [];
+  for (var x = base_ms_spring; x < base_ms_spring + 1000 * 60 * 80; x += 1000) {
+    dst_data_spring.push([new Date(x), x]);
+  }
+
+  var g = new Dygraph(
+      document.getElementById("graph"),
+      dst_data_spring,
+      { width: 1024, labels: ['Date', 'Value'] }
+  );
+
+  assertEquals([
+    '01:50', '01:55',
+    '03:00', '03:05', '03:10', '03:15', '03:20', '03:25',
+    '03:30', '03:35', '03:40', '03:45', '03:50', '03:55',
+    '04:00', '04:05'
+  ], Util.getXLabels());
+};
+*/