*/
/*jshint globalstrict: true */
-/*global DygraphRangeSelector:false, DygraphLayout:false, DygraphCanvasRenderer:false, G_vmlCanvasManager:false */
+/*global DygraphLayout:false, DygraphCanvasRenderer:false, DygraphOptions:false, G_vmlCanvasManager:false */
"use strict";
/**
Dygraph.Plotters.linePlotter
],
+ plugins: [ ],
+
// per-axis options
axes: {
x: {
// TODO(nikhilk): Add any other stackedGraph checks here.
}
- // These two options have a bad interaction. See issue 359.
- if (attrs.showRangeSelector && attrs.animatedZooms) {
- this.warn('You should not set animatedZooms=true when using the range selector.');
- attrs.animatedZooms = false;
- }
-
// DEPRECATION WARNING: All option processing should be moved from
// attrs_ and user_attrs_ to options_, which holds all this information.
//
// Activate plugins.
this.plugins_ = [];
- for (var i = 0; i < Dygraph.PLUGINS.length; i++) {
- var Plugin = Dygraph.PLUGINS[i];
+ var plugins = Dygraph.PLUGINS.concat(this.getOption('plugins'));
+ for (var i = 0; i < plugins.length; i++) {
+ var Plugin = plugins[i];
var pluginInstance = new Plugin();
var pluginDict = {
plugin: pluginInstance,
}
}
+ this.createDragInterface_();
+
this.start_();
};
Dygraph.prototype.getOptionForAxis = function(name, axis) {
return this.attributes_.getForAxis(name, axis);
-}
+};
+
/**
* @private
* @param String} axis The name of the axis (i.e. 'x', 'y' or 'y2')
this.hidden_ = this.createPlotKitCanvas_(this.canvas_);
this.hidden_ctx_ = Dygraph.getContext(this.hidden_);
- if (this.attr_('showRangeSelector')) {
- // The range selector must be created here so that its canvases and contexts get created here.
- // For some reason, if the canvases and contexts don't get created here, things don't work in IE.
- this.rangeSelector_ = new DygraphRangeSelector(this);
- }
-
// The interactive parts of the graph are drawn on top of the chart.
this.graphDiv.appendChild(this.hidden_);
this.graphDiv.appendChild(this.canvas_);
// Create the grapher
this.layout_ = new DygraphLayout(this);
- if (this.rangeSelector_) {
- // This needs to happen after the graph canvases are added to the div and the layout object is created.
- this.rangeSelector_.addToGraph(this.graphDiv, this.layout_);
- }
-
var dygraph = this;
this.mouseMoveHandler = function(e) {
};
this.addEvent(this.mouseEventElement_, 'mouseout', this.mouseOutHandler);
- this.createDragInterface_();
-
this.resizeHandler = function(e) {
dygraph.resize();
};
/**
* Reset the zoom to the original view coordinates. This is the same as
* double-clicking on the graph.
- *
- * @private
*/
-Dygraph.prototype.doUnzoom_ = function() {
+Dygraph.prototype.resetZoom = function() {
var dirty = false, dirtyX = false, dirtyY = false;
if (this.dateWindow_ !== null) {
dirty = true;
Dygraph.prototype.predraw_ = function() {
var start = new Date();
+ this.layout_.computePlotArea();
+
// TODO(danvk): move more computations out of drawGraph_ and into here.
this.computeYAxes_();
this.cascadeEvents_('predraw');
- if (this.rangeSelector_) {
- this.rangeSelector_.renderStaticLayer();
- }
-
// Convert the raw data (a 2D array) into the internal format and compute
// rolling averages.
this.rolledSeries_ = [null]; // x-axis is the first series and it's special
this.canvas_.getContext('2d').clearRect(0, 0, this.canvas_.width,
this.canvas_.height);
- // Generate a static legend before any particular point is selected.
-
- if (this.rangeSelector_) {
- this.rangeSelector_.renderInteractiveLayer();
- }
if (this.attr_("drawCallback") !== null) {
this.attr_("drawCallback")(this, is_initial_draw);
}
// data computation as well as options storage.
// Go through once and add all the axes.
this.axes_ = [];
-
+
for (axis = 0; axis < this.attributes_.numAxes(); axis++) {
// Add a new axis, making a copy of its per-axis options.
opts = { g : this };
var includeZero = this.attributes_.getForAxis("includeZero", i);
series = this.attributes_.seriesForAxis(i);
- if (series.length == 0) {
+ if (series.length === 0) {
// If no series are defined or visible then use a reasonable default
axis.extremeRange = [0, 1];
} else {
this.attrs_.axes.x.ticker = Dygraph.numericLinearTicks;
this.attrs_.axes.x.axisLabelFormatter = this.attrs_.axes.x.valueFormatter;
}
-}
+};
/**
* Parses the value as a floating point number. This is like the parseFloat()
// createInterface_ reset the layout, so we need to do this.
this.layout_.setAnnotations(this.annotations_);
}
+ this.createDragInterface_();
this.predraw_();
}