* dygraphs.
*/
-/*jshint globalstrict: true */
+var DygraphLayout = (function() {
+
/*global Dygraph:false */
"use strict";
for (var i = 0; i < ann.length; i++) {
var a = {};
if (!ann[i].xval && ann[i].x === undefined) {
- Dygraph.error("Annotations must have an 'x' property");
+ console.error("Annotations must have an 'x' property");
return;
}
if (ann[i].icon &&
!(ann[i].hasOwnProperty('width') &&
ann[i].hasOwnProperty('height'))) {
- Dygraph.error("Must set width and height when setting " +
+ console.error("Must set width and height when setting " +
"annotation.icon property");
return;
}
DygraphLayout.prototype._evaluateLimits = function() {
var xlimits = this.dygraph_.xAxisRange();
- this._xAxis.minxval = xlimits[0];
- this._xAxis.maxxval = xlimits[1];
+ this._xAxis.minval = xlimits[0];
+ this._xAxis.maxval = xlimits[1];
var xrange = xlimits[1] - xlimits[0];
- this._xAxis.xscale = (xrange !== 0 ? 1 / xrange : 1.0);
+ this._xAxis.scale = (xrange !== 0 ? 1 / xrange : 1.0);
if (this.dygraph_.getOptionForAxis("logscale", 'x')) {
- this._xAxis.xlogrange = Dygraph.log10(this._xAxis.maxxval) - Dygraph.log10(this._xAxis.minxval);
+ this._xAxis.xlogrange = Dygraph.log10(this._xAxis.maxval) - Dygraph.log10(this._xAxis.minval);
this._xAxis.xlogscale = (this._xAxis.xlogrange !== 0 ? 1.0 / this._xAxis.xlogrange : 1.0);
}
for (var i = 0; i < this.yAxes_.length; i++) {
axis.ylogrange = Dygraph.log10(axis.maxyval) - Dygraph.log10(axis.minyval);
axis.ylogscale = (axis.ylogrange !== 0 ? 1.0 / axis.ylogrange : 1.0);
if (!isFinite(axis.ylogrange) || isNaN(axis.ylogrange)) {
- Dygraph.error('axis ' + i + ' of graph at ' + axis.g +
+ console.error('axis ' + i + ' of graph at ' + axis.g +
' can\'t be displayed in log scale for range [' +
axis.minyval + ' - ' + axis.maxyval + ']');
}
}
};
-DygraphLayout.calcXNormal_ = function(value, axis, logscale) {
+DygraphLayout.calcXNormal_ = function(value, xAxis, logscale) {
if (logscale) {
- return ((Dygraph.log10(value) - Dygraph.log10(axis.minxval)) * axis.xlogscale);
+ return ((Dygraph.log10(value) - Dygraph.log10(xAxis.minval)) * xAxis.xlogscale);
} else {
- return (value - axis.minxval) * axis.xscale;
+ return (value - xAxis.minval) * xAxis.scale;
}
};
this.setPointsLengths = [];
this.setPointsOffsets = [];
};
+
+return DygraphLayout;
+
+})();