projects / dygraphs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 8d4465c)
Merge branch 'master' of http://github.com/kberg/dygraphs
authorRobert Konigsberg <konigsberg@google.com>
Mon, 29 Nov 2010 22:16:30 +0000 (17:16 -0500)
committerRobert Konigsberg <konigsberg@google.com>
Mon, 29 Nov 2010 22:16:30 +0000 (17:16 -0500)
Conflicts:
dygraph.js
tests/zoom.html

dygraph.js patch | blob | blame | history
tests/gviz-infinity.html [new file with mode: 0644] patch | blob
tests/zoom.html patch | blob | blame | history

diff --git a/dygraph.js b/dygraph.js
index bd89a90..e28c273 100644 (file)
--- a/dygraph.js
+++ b/dygraph.js
@@ -2412,7 +2412,8 @@ Dygraph.prototype.parseCSV_ = function(data) {
   // Parse the x as a float or return null if it's not a number.
   var parseFloatOrNull = function(x) {
     var val = parseFloat(x);
-    return isNaN(val) ? null : val;
+    // isFinite() returns false for NaN and +/-Infinity.
+    return isFinite(val) ? val : null;
   };
 
   var xParser;
@@ -2644,6 +2645,11 @@ Dygraph.prototype.parseDataTable_ = function(data) {
     if (ret.length > 0 && row[0] < ret[ret.length - 1][0]) {
       outOfOrder = true;
     }
+
+    // Strip out infinities, which give dygraphs problems later on.
+    for (var j = 0; j < row.length; j++) {
+      if (!isFinite(row[j])) row[j] = null;
+    }
     ret.push(row);
   }
 
diff --git a/tests/gviz-infinity.html b/tests/gviz-infinity.html
new file mode 100644 (file)
index 0000000..9361a97
--- /dev/null
+++ b/tests/gviz-infinity.html
@@ -0,0 +1,62 @@
+<html>
+  <head>
+    <title>gviz</title>
+    <!--[if IE]>
+    <script type="text/javascript" src="../excanvas.js"></script>
+    <![endif]-->
+    <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>
+    <script type="text/javascript" src="http://www.google.com/jsapi"></script>
+    <script type="text/javascript">
+      google.load('visualization', '1', {packages: ['linechart']});
+
+      function createDataTable(dateType) {
+        data = new google.visualization.DataTable();
+        data.addColumn(dateType, 'Date');
+        data.addColumn('number', 'Column A');
+        data.addColumn('number', 'Column B');
+        data.addRows(4);
+        data.setCell(0, 0, new Date("2009/07/01"));
+        data.setCell(0, 1, 1);
+        data.setCell(0, 2, 7);
+        data.setCell(1, 0, new Date("2009/07/08"));
+        data.setCell(1, 1, 2);
+        data.setCell(1, 2, 4);
+        data.setCell(2, 0, new Date("2009/07/15"));
+        data.setCell(2, 1, 3);
+        data.setCell(2, 2, Infinity);
+        data.setCell(3, 0, new Date("2009/07/22"));
+        data.setCell(3, 1, 4);
+        data.setCell(3, 2, 0);
+        return data;
+      }
+
+      function drawVisualization() {
+        data = createDataTable('date');
+        new google.visualization.LineChart(
+            document.getElementById('gviz')).draw(data, null);
+
+        new Dygraph.GVizChart(document.getElementById('dygraphs'))
+          .draw(data, { });
+
+        data = createDataTable('datetime');
+        new Dygraph.GVizChart(
+            document.getElementById('dygraphs_datetime')).draw(data, {
+            });
+      }
+
+      google.setOnLoadCallback(drawVisualization);
+    </script>
+  </head>
+  <body>
+    <p>This tests that infinite values don't break dygraphs.</p>
+    <p>gviz line chart:</p>
+    <div id="gviz" style="width:600px; height:300px;"></div>
+
+    <p>same data drawn using dygraphs:</p>
+    date column:
+    <div id="dygraphs" style="width:600px; height:300px;"></div>
+  </body>
+</html>
diff --git a/tests/zoom.html b/tests/zoom.html
index 10b0457..1b60936 100644 (file)
--- a/tests/zoom.html
+++ b/tests/zoom.html
@@ -40,8 +40,8 @@
             document.getElementById("div_g"),
             NoisyData, {
               errorBars: true,
-              zoomCallback : function(minDate, maxDate, yRange) {
-                showDimensions(minDate, maxDate, yRange);
+             zoomCallback : function(minDate, maxDate, yRanges) {
+                 showDimensions(minDate, maxDate, yRanges); }
               }
             }
           );
@@ -52,12 +52,13 @@
       // Pull an initial value for logging.
       var minDate = g.xAxisRange()[0];
       var maxDate = g.xAxisRange()[1];
-      var minValue = g.yAxisRange();
-      showDimensions(minDate, maxDate, yAxisRange);
+      var minValue = g.yAxisRange()[0];
+      var maxValue = g.yAxisRange()[1];
+      showDimensions(minDate, maxDate, [minValue, maxValue]);
 
-      function showDimensions(minDate, maxDate, yAxisRange) {
-        showXDimensions(minDate, maxDate);
-        showYDimensions(yAxisRange);
+      function showDimensions(minDate, maxDate, yRanges) {
+       showXDimensions(minDate, maxDate);
+       showYDimensions(yRanges);
       }
 
       function showXDimensions(first, second) {
@@ -65,9 +66,9 @@
         elem.innerHTML = "dateWindow : [" + first + ", "+ second + "]";
       }
 
-      function showYDimensions(range) {
+      function showYDimensions(ranges) {
         var elem = document.getElementById("ydimensions");
-        elem.innerHTML = "valueRange : [" + range + "]";
+        elem.innerHTML = "valueRange : [" + ranges + "]";
       }
 
       function zoomGraphX(minDate, maxDate) {
@@ -81,7 +82,7 @@
         g.updateOptions({
           valueRange: [minValue, maxValue]
         });
-        showYDimensions(minValue, maxValue);
+        showYDimensions(this.getYRanges());
       }
 
       function unzoomGraph() {
danvk/dygraphs fork supporting touch events