Merge branch 'master' into remove-old-options

Conflicts:
	dygraph-options.js
	dygraph.js

diff --git a/dygraph-options.js b/dygraph-options.js
index 9a4f6bf..dd7bb6b 100644 (file)
--- a/dygraph-options.js
+++ b/dygraph-options.js
@@ -9,11 +9,11 @@
 /*
  * Interesting member variables:
  * dygraph_ - the graph.
- * global - global attributes (common among all graphs, AIUI)
+ * global_ - global attributes (common among all graphs, AIUI)
  * user - attributes set by the user
- * axes - map of options specific to the axis.
- * series - { seriesName -> { idx, yAxis, options }
- * labels - used as mapping from index to series name.
+ * axes_ - array of axis index to { series : [ series names ] , options : { axis-specific options. }
+ * series_ - { seriesName -> { idx, yAxis, options }}
+ * labels_ - used as mapping from index to series name.
  */
 
 /**
@@ -55,7 +55,7 @@ var DygraphOptions = function(dygraph) {
 DygraphOptions.prototype.reparseSeries = function() {
   this.labels = this.get("labels").slice(1);
 
-  this.axes_ = [ {} ]; // Always one axis at least.
+  this.axes_ = [ { series : [], options : {}} ]; // Always one axis at least.
   this.series_ = {};
 
   var axisId = 0; // 0-offset; there's always one.
@@ -69,8 +69,14 @@ DygraphOptions.prototype.reparseSeries = function() {
     var axis = optionsForSeries["axis"];
     if (typeof(axis) == 'object') {
       yAxis = ++axisId;
-      this.axes_[yAxis] = axis;
+      this.axes_[yAxis] = { series : [ seriesName ], options : axis };
     }
+
+    // Associate series without axis options with axis 0.
+    if (!axis) { // undefined
+      this.axes_[0].series.push(seriesName);
+    }
+
     this.series_[seriesName] = { idx: idx, yAxis: yAxis, options : optionsForSeries };
   }
 
@@ -87,7 +93,9 @@ DygraphOptions.prototype.reparseSeries = function() {
                    "series " + axis + ", which does not define its own axis.");
         return null;
       }
-      this.series_[seriesName].yAxis = this.series_[axis].yAxis;
+      var yAxis = this.series_[axis].yAxis;
+      this.series_[seriesName].yAxis = yAxis;
+      this.axes_[yAxis].series.push(seriesName);
     }
   }
 
@@ -97,12 +105,12 @@ DygraphOptions.prototype.reparseSeries = function() {
     var axis_opts = this.user_.axes;
 
     if (axis_opts.hasOwnProperty("y")) {
-      Dygraph.update(this.axes_[0], axis_opts.y);
+      Dygraph.update(this.axes_[0].options, axis_opts.y);
     }
 
     if (axis_opts.hasOwnProperty("y2")) {
-      this.axes_[1] = this.axes_[1] || {};
-      Dygraph.update(this.axes_[1], axis_opts.y2);
+      this.axes_[1] = this.axes_[1] || {}; // FIX
+      Dygraph.update(this.axes_[1].options, axis_opts.y2);
     }
   }
 };
@@ -139,7 +147,7 @@ DygraphOptions.prototype.getForAxis = function(name, axis) {
     axisIdx = (axis == "y2") ? 1 : 0;
   }
 
-  var axisOptions = this.axes_[axisIdx];
+  var axisOptions = this.axes_[axisIdx].options;
   if (axisOptions.hasOwnProperty(name)) {
     return axisOptions[name];
   }
@@ -177,3 +185,31 @@ DygraphOptions.prototype.getForSeries = function(name, series) {
   return this.getForAxis(name, seriesObj["yAxis"]);
 };
 
+/**
+ * Returns the number of y-axes on the chart.
+ * @return {Number} the number of axes.
+ */
+DygraphOptions.prototype.numAxes = function() {
+  return this.axes_.length;
+}
+
+/**
+ * Return the y-axis for a given series, specified by name.
+ */
+DygraphOptions.prototype.axisForSeries = function(seriesName) {
+  return this.series_[seriesName].yAxis;
+}
+
+/**
+ * Returns the options for the specified axis.
+ */
+DygraphOptions.prototype.axisOptions = function(yAxis) {
+  return this.axes_[yAxis].options;
+}
+
+/**
+ * Return the series associated with an axis.
+ */
+DygraphOptions.prototype.seriesForAxis = function(yAxis) {
+  return this.axes_[yAxis].series;
+}

diff --git a/dygraph.js b/dygraph.js
index 3783907..4b275d9 100644 (file)
--- a/dygraph.js
+++ b/dygraph.js
@@ -573,7 +573,6 @@ Dygraph.prototype.attr_ = function(name, seriesName) {
     Dygraph.OPTIONS_REFERENCE[name] = true;
   }
 // </REMOVE_FOR_COMBINED>
-
   return seriesName ? this.attributes_.getForSeries(name, seriesName) : this.attributes_.get(name);
 };
 
@@ -1137,7 +1136,7 @@ Dygraph.prototype.getPropertiesForSeries = function(series_name) {
     column: idx,
     visible: this.visibility()[idx - 1],
     color: this.colorsMap_[series_name],
-    axis: 1 + this.seriesToAxisMap_[series_name]
+    axis: 1 + this.attributes_.axisForSeries(series_name)
   };
 };
 
@@ -2420,9 +2419,8 @@ Dygraph.prototype.renderGraph_ = function(is_initial_draw) {
  * currently being displayed. This includes things like the number of axes and
  * the style of the axes. It does not include the range of each axis and its
  * tick marks.
- * This fills in this.axes_ and this.seriesToAxisMap_.
+ * This fills in this.axes_.
  * axes_ = [ { options } ]
- * seriesToAxisMap_ = { seriesName: 0, seriesName2: 1, ... }
  *   indices are into the axes_ array.
  */
 Dygraph.prototype.computeYAxes_ = function() {
@@ -2437,7 +2435,6 @@ Dygraph.prototype.computeYAxes_ = function() {
   }
 
   this.axes_ = [{ yAxisId : 0, g : this }];  // always have at least one y-axis.
-  this.seriesToAxisMap_ = {};
 
   // Get a list of series names.
   var labels = this.attr_("labels");
@@ -2469,7 +2466,6 @@ Dygraph.prototype.computeYAxes_ = function() {
     if (!series.hasOwnProperty(seriesName)) continue;
     axis = this.attr_("axis", seriesName);
     if (axis === null) {
-      this.seriesToAxisMap_[seriesName] = 0;
       continue;
     }
     if (typeof(axis) == 'object') {
@@ -2482,23 +2478,6 @@ Dygraph.prototype.computeYAxes_ = function() {
       opts.g = this;
       Dygraph.update(opts, axis);
       this.axes_.push(opts);
-      this.seriesToAxisMap_[seriesName] = yAxisId;
-    }
-  }
-
-  // Go through one more time and assign series to an axis defined by another
-  // series, e.g. { 'Y1: { axis: {} }, 'Y2': { axis: 'Y1' } }
-  for (seriesName in series) {
-    if (!series.hasOwnProperty(seriesName)) continue;
-    axis = this.attr_("axis", seriesName);
-    if (typeof(axis) == 'string') {
-      if (!this.seriesToAxisMap_.hasOwnProperty(axis)) {
-        this.error("Series " + seriesName + " wants to share a y-axis with " +
-                   "series " + axis + ", which does not define its own axis.");
-        return null;
-      }
-      var idx = this.seriesToAxisMap_[axis];
-      this.seriesToAxisMap_[seriesName] = idx;
     }
   }
 
@@ -2531,13 +2510,7 @@ Dygraph.prototype.computeYAxes_ = function() {
  * @return {Number} the number of axes.
  */
 Dygraph.prototype.numAxes = function() {
-  var last_axis = 0;
-  for (var series in this.seriesToAxisMap_) {
-    if (!this.seriesToAxisMap_.hasOwnProperty(series)) continue;
-    var idx = this.seriesToAxisMap_[series];
-    if (idx > last_axis) last_axis = idx;
-  }
-  return 1 + last_axis;
+  return this.attributes_.numAxes();
 };
 
 /**
@@ -2549,7 +2522,7 @@ Dygraph.prototype.numAxes = function() {
  */
 Dygraph.prototype.axisPropertiesForSeries = function(series) {
   // TODO(danvk): handle errors.
-  return this.axes_[this.seriesToAxisMap_[series]];
+  return this.axes_[this.attributes_.axisForSeries(series)];
 };
 
 /**
@@ -2560,16 +2533,15 @@ Dygraph.prototype.axisPropertiesForSeries = function(series) {
  */
 Dygraph.prototype.computeYAxisRanges_ = function(extremes) {
   // Build a map from axis number -> [list of series names]
-  var seriesForAxis = [], series;
-  for (series in this.seriesToAxisMap_) {
-    if (!this.seriesToAxisMap_.hasOwnProperty(series)) continue;
-    var idx = this.seriesToAxisMap_[series];
-    while (seriesForAxis.length <= idx) seriesForAxis.push([]);
-    seriesForAxis[idx].push(series);
+  var seriesForAxis = [];
+  var series;
+  var numAxes = this.attributes_.numAxes();
+  for (var yAxis = 0; yAxis < numAxes; yAxis++) {
+    seriesForAxis[yAxis] = this.attributes_.seriesForAxis(yAxis);
   }
 
   // Compute extreme values, a span and tick marks for each axis.
-  for (var i = 0; i < this.axes_.length; i++) {
+  for (var i = 0; i < numAxes; i++) {
     var axis = this.axes_[i];
 
     if (!seriesForAxis[i]) {