Dygraph.DEFAULT_WIDTH = 480;
Dygraph.DEFAULT_HEIGHT = 320;
-Dygraph.ANIMATION_STEPS = 10;
+// For max 60 Hz. animation:
+Dygraph.ANIMATION_STEPS = 12;
Dygraph.ANIMATION_DURATION = 200;
// These are defined before DEFAULT_ATTRS so that it can refer to them.
attrs.animatedZooms = false;
}
+ // DEPRECATION WARNING: All option processing should be moved from
+ // attrs_ and user_attrs_ to options_, which holds all this information.
+ //
// Dygraphs has many options, some of which interact with one another.
// To keep track of everything, we maintain two sets of options:
//
// this.axes_ doesn't match this.attributes_.axes_.options. It's used for
// data computation as well as options storage.
- this.axes_ = [];
- for (axis = 0; axis < this.attributes_.numAxes(); axis++) {
- this.axes_.push({ yAxisId : i, g : this });
- }
-
- // all options which could be applied per-axis:
- // TODO(konigsberg)
- var globalAxisOptions = [
- 'includeZero',
- 'valueRange',
- 'labelsKMB',
- 'labelsKMG2',
- 'pixelsPerYLabel',
- 'yAxisLabelWidth',
- 'axisLabelFontSize',
- 'axisTickSize',
- 'logscale'
- ];
-
- // Copy global axis options over to the first axis.
- for (i = 0; i < globalAxisOptions.length; i++) {
- var k = globalAxisOptions[i];
- v = this.attr_(k);
- if (v) this.axes_[0][k] = v;
- }
-
// Go through once and add all the axes.
+ this.axes_ = [];
- // This seems to be right - starting at 1. I think this gets simpler now.
- for (axis = 1; axis < this.attributes_.numAxes(); axis++) {
+ for (axis = 0; axis < this.attributes_.numAxes(); axis++) {
// Add a new axis, making a copy of its per-axis options.
- opts = {};
- Dygraph.update(opts, this.axes_[0]);
- Dygraph.update(opts, { valueRange: null }); // shouldn't inherit this.
+ opts = { g : this };
Dygraph.update(opts, this.attributes_.axisOptions(axis));
this.axes_[axis] = opts;
}
}
}
- // New axes options
for (axis = 0; axis < this.axes_.length; axis++) {
if (axis === 0) {
opts = this.optionsViewForAxis_('y' + (axis ? '2' : ''));
}
}
- if (Dygraph.isDateLike(data[0][0])) {
+ if (Dygraph.isDateLike(data[0][0]) {
// Some intelligent defaults for a date x-axis.
this.attrs_.axes.x.valueFormatter = Dygraph.dateString_;
this.attrs_.axes.x.axisLabelFormatter = Dygraph.dateAxisFormatter;
};
var map = function(opt, axis, new_opt) {
if (typeof(attrs[opt]) != 'undefined') {
+ Dygraph.warn("Option " + opt + " is deprecated. Use the " +
+ new_opt + " option for the " + axis + " axis instead. " +
+ "(e.g. { axes : { " + axis + " : { " + new_opt + " : ... } } } " +
+ "(see http://dygraphs.com/per-axis.html for more information.");
set(axis, new_opt, attrs[opt]);
delete my_attrs[opt];
}