X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-layout.js;h=a5e690888a7468f24cd389fe5ee433426131f3fd;hb=cbe41be103cc129ff2477a872cb802538aafb3d3;hp=1fe4228fb8652c1c017d666e921626ece036556f;hpb=22c615a882ac861c8ca70a08f66af9778897214f;p=dygraphs.git

diff --git a/dygraph-layout.js b/dygraph-layout.js
index 1fe4228..a5e6908 100644
--- a/dygraph-layout.js
+++ b/dygraph-layout.js
@@ -63,48 +63,60 @@ DygraphLayout.prototype.computePlotArea_ = function() {
     x: 0,
     y: 0
   };
-  if (this.attr_('drawYAxis')) {
-   area.x = this.attr_('yAxisLabelWidth') + 2 * this.attr_('axisTickSize');
-  }
 
   area.w = this.dygraph_.width_ - area.x - this.attr_('rightGap');
   area.h = this.dygraph_.height_;
-  if (this.attr_('drawXAxis')) {
-    if (this.attr_('xAxisHeight')) {
-      area.h -= this.attr_('xAxisHeight');
-    } else {
-      area.h -= this.attr_('axisLabelFontSize') + 2 * this.attr_('axisTickSize');
-    }
-  }
-
-  // Shrink the drawing area to accomodate additional y-axes.
-  if (this.dygraph_.numAxes() == 2) {
-    // TODO(danvk): per-axis setting.
-    area.w -= (this.attr_('yAxisLabelWidth') + 2 * this.attr_('axisTickSize'));
-  } else if (this.dygraph_.numAxes() > 2) {
-    this.dygraph_.error("Only two y-axes are supported at this time. (Trying " +
-                        "to use " + this.dygraph_.numAxes() + ")");
-  }
 
-  // Add space for chart labels: title, xlabel and ylabel.
-  if (this.attr_('title')) {
-    area.h -= this.attr_('titleHeight');
-    area.y += this.attr_('titleHeight');
-  }
-  if (this.attr_('xlabel')) {
-    area.h -= this.attr_('xLabelHeight');
-  }
-  if (this.attr_('ylabel')) {
-    // It would make sense to shift the chart here to make room for the y-axis
-    // label, but the default yAxisLabelWidth is large enough that this results
-    // in overly-padded charts. The y-axis label should fit fine. If it
-    // doesn't, the yAxisLabelWidth option can be increased.
-  }
-
-  if (this.attr_('y2label')) {
-    // same logic applies here as for ylabel.
-    // TODO(danvk): make yAxisLabelWidth a per-axis property
-  }
+  // Let plugins reserve space.
+  var e = {
+    chart_div: this.dygraph_.graphDiv,
+    reserveSpaceLeft: function(px) {
+      var r = {
+        x: area.x,
+        y: area.y,
+        w: px,
+        h: area.h
+      };
+      area.x += px;
+      area.w -= px;
+      return r;
+    },
+    reserveSpaceRight: function(px) {
+      var r = {
+        x: area.x + area.w - px,
+        y: area.y,
+        w: px,
+        h: area.h
+      };
+      area.w -= px;
+      return r;
+    },
+    reserveSpaceTop: function(px) {
+      var r = {
+        x: area.x,
+        y: area.y,
+        w: area.w,
+        h: px
+      };
+      area.y += px;
+      area.h -= px;
+      return r;
+    },
+    reserveSpaceBottom: function(px) {
+      var r = {
+        x: area.x,
+        y: area.y + area.h - px,
+        w: area.w,
+        h: px
+      };
+      area.h -= px;
+      return r;
+    },
+    chartRect: function() {
+      return {x:area.x, y:area.y, w:area.w, h:area.h};
+    }
+  };
+  this.dygraph_.cascadeEvents_('layout', e);
 
   // Add space for range selector, if needed.
   if (this.attr_('showRangeSelector')) {
@@ -219,16 +231,17 @@ DygraphLayout.prototype._evaluateLineCharts = function() {
   // points and drawing the lines. The brunt of the cost comes from allocating
   // the |point| structures.
   var i = 0;
+  var setIdx;
 
   // Preallocating the size of points reduces reallocations, and therefore,
   // calls to collect garbage.
   var totalPoints = 0;
-  for (var setIdx = 0; setIdx < this.datasets.length; ++setIdx) {
+  for (setIdx = 0; setIdx < this.datasets.length; ++setIdx) {
     totalPoints += this.datasets[setIdx].length;
   }
   this.points = new Array(totalPoints);
 
-  for (var setIdx = 0; setIdx < this.datasets.length; ++setIdx) {
+  for (setIdx = 0; setIdx < this.datasets.length; ++setIdx) {
     this.setPointsOffsets.push(i);
     var dataset = this.datasets[setIdx];
     var setName = this.setNames[setIdx];
@@ -236,15 +249,15 @@ DygraphLayout.prototype._evaluateLineCharts = function() {
 
     for (var j = 0; j < dataset.length; j++) {
       var item = dataset[j];
-      var xValue = item[0];
-      var yValue = item[1];
+      var xValue = DygraphLayout.parseFloat_(item[0]);
+      var yValue = DygraphLayout.parseFloat_(item[1]);
 
       // Range from 0-1 where 0 represents left and 1 represents right.
       var xNormal = (xValue - this.minxval) * this.xscale;
       // Range from 0-1 where 0 represents top and 1 represents bottom
       var yNormal = DygraphLayout._calcYNormal(axis, yValue);
 
-      if (connectSeparated && yValue === null) {
+      if (connectSeparated && item[1] === null) {
         yValue = null;
       }
       this.points[i] = {
@@ -261,6 +274,20 @@ DygraphLayout.prototype._evaluateLineCharts = function() {
   }
 };
 
+/**
+ * Optimized replacement for parseFloat, which was way too slow when almost
+ * all values were type number, with few edge cases, none of which were strings.
+ */
+DygraphLayout.parseFloat_ = function(val) {
+  // parseFloat(null) is NaN
+  if (val === null) {
+    return NaN;
+  }
+
+  // Assume it's a number or NaN. If it's something else, I'll be shocked.
+  return val;
+}
+
 DygraphLayout.prototype._evaluateLineTicks = function() {
   var i, tick, label, pos;
   this.xticks = [];
@@ -305,13 +332,13 @@ DygraphLayout.prototype.evaluateWithError = function() {
     var axis = this.dygraph_.axisPropertiesForSeries(setName);
     for (j = 0; j < dataset.length; j++, i++) {
       var item = dataset[j];
-      var xv = item[0];
-      var yv = item[1];
+      var xv = DygraphLayout.parseFloat_(item[0]);
+      var yv = DygraphLayout.parseFloat_(item[1]);
 
       if (xv == this.points[i].xval &&
           yv == this.points[i].yval) {
-        var errorMinus = item[2];
-        var errorPlus = item[3];
+        var errorMinus = DygraphLayout.parseFloat_(item[2]);
+        var errorPlus = DygraphLayout.parseFloat_(item[3]);
 
         var yv_minus = yv - errorMinus;
         var yv_plus = yv + errorPlus;