Merge branch 'master' of http://github.com/danvk/dygraphs

[dygraphs.git] / tests / zoom.html
diff --git a/tests/zoom.html b/tests/zoom.html

index 24a2828..d37a26d 100644 (file)
--- a/tests/zoom.html
+++ b/tests/zoom.html
@@ -2,7 +2,7 @@
    <head>
      <title>zoom</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="../strftime/strftime-min.js"></script>
      <script type="text/javascript" src="../rgbcolor/rgbcolor.js"></script>
@@ -12,11 +12,18 @@
    </head>
    <body>
      <h3>Click the buttons to change the zoom level or just use the normal
-    click-and drag.</h3>
+    click-and drag. While zoom typically works by click-and-drag, the
+    buttons are useful for testing.</h3>
      <h4>Window coordinates (in dates and values):</h4>
-    <div id = "dimensions"></div>
+    <div id="xdimensions"></div> <div id="ydimensions"></div>
+    <div style="float: right">
+        <p>Zoomed: <span id="zoomed">False</span><p/>
+        <p>Zoomed X: <span id="zoomedX">False</span><p/>
+        <p>Zoomed Y: <span id="zoomedY">False</span><p/>
+    </div>
      <div id="div_g" style="width:600px; height:300px;"></div>
  
+
      <p><b>Zoom operations:</b></p>
      <p>
        <input type="button" value="Y (3,5)" onclick="zoomGraphY(3,5)">&nbsp;
@@ -38,7 +45,15 @@
        g = new Dygraph(
              document.getElementById("div_g"),
              NoisyData, {
-              zoomCallback : function(a,b,c,d) { showDimensions(a,b,c,d); }
+              errorBars: true,
+              zoomCallback : function(minDate, maxDate, yRange) {
+                showDimensions(minDate, maxDate, yRange);
+              },
+              drawCallback: function(me, initial) {
+                document.getElementById("zoomed").innerHTML = "" + me.isZoomed();
+                document.getElementById("zoomedX").innerHTML = "" + me.isZoomed("x");
+                document.getElementById("zoomedY").innerHTML = "" + me.isZoomed("y");
+              }
              }
            );
  
@@ -48,27 +63,43 @@
        // Pull an initial value for logging.
        var minDate = g.xAxisRange()[0];
        var maxDate = g.xAxisRange()[1];
-      var minValue = g.yAxisRange()[0];
-      var maxValue = g.yAxisRange()[1];
-      showDimensions(minDate, maxDate, minValue, maxValue);
+      var minValue = g.yAxisRange();
+      showDimensions(minDate, maxDate, yAxisRange);
+
+      function showDimensions(minDate, maxDate, yAxisRange) {
+        showXDimensions(minDate, maxDate);
+        showYDimensions(yAxisRange);
+      }
+
+      function showXDimensions(first, second) {
+        var elem = document.getElementById("xdimensions");
+        elem.innerHTML = "dateWindow : [" + first + ", "+ second + "]";
+      }
  
-      function showDimensions(minDate, maxDate, minValue, maxValue) {
-        var elem = document.getElementById("dimensions");
-        elem.innerHTML =
-          "dateWindow : [" + minDate + " , "+ maxDate + "],<br>" +
-          "valueRange : [" + minValue + " , "+ maxValue + "],";
+      function showYDimensions(range) {
+        var elem = document.getElementById("ydimensions");
+        elem.innerHTML = "valueRange : [" + range + "]";
        }
  
        function zoomGraphX(minDate, maxDate) {
-        g.doZoomXDates_(minDate, maxDate);
+        g.updateOptions({
+          dateWindow: [minDate, maxDate]
+        });
+        showXDimensions(minDate, maxDate);
        }
  
        function zoomGraphY(minValue, maxValue) {
-        g.doZoomYValues_(minValue, maxValue);
+        g.updateOptions({
+          valueRange: [minValue, maxValue]
+        });
+        showYDimensions(minValue, maxValue);
        }
  
        function unzoomGraph() {
-        g.doUnzoom_();
+        g.updateOptions({
+          dateWindow: null,
+          valueRange: null
+        });
        }
      </script>