* dygraphs.
*/
-/*jshint globalstrict: true */
+var DygraphLayout = (function() {
+
/*global Dygraph:false */
"use strict";
this.yTicks_ = null;
};
-DygraphLayout.prototype.attr_ = function(name) {
- return this.dygraph_.attr_(name);
-};
-
/**
* Add points for a single series.
*
y: 0
};
- area.w = this.dygraph_.width_ - area.x - this.attr_('rightGap');
+ area.w = this.dygraph_.width_ - area.x - this.dygraph_.getOption('rightGap');
area.h = this.dygraph_.height_;
// Let plugins reserve space.
// The Dygraph object's annotations aren't parsed. We parse them here and
// save a copy. If there is no parser, then the user must be using raw format.
this.annotations = [];
- var parse = this.attr_('xValueParser') || function(x) { return x; };
+ var parse = this.dygraph_.getOption('xValueParser') || function(x) { return x; };
for (var i = 0; i < ann.length; i++) {
var a = {};
if (!ann[i].xval && ann[i].x === undefined) {
- this.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'))) {
- this.dygraph_.error("Must set width and height when setting " +
- "annotation.icon property");
+ console.error("Must set width and height when setting " +
+ "annotation.icon property");
return;
}
Dygraph.update(a, ann[i]);
};
DygraphLayout.prototype.evaluate = function() {
+ this._xAxis = {};
this._evaluateLimits();
this._evaluateLineCharts();
this._evaluateLineTicks();
DygraphLayout.prototype._evaluateLimits = function() {
var xlimits = this.dygraph_.xAxisRange();
- this.minxval = xlimits[0];
- this.maxxval = xlimits[1];
+ this._xAxis.minval = xlimits[0];
+ this._xAxis.maxval = xlimits[1];
var xrange = xlimits[1] - xlimits[0];
- this.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.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++) {
var axis = this.yAxes_[i];
axis.minyval = axis.computedValueRange[0];
axis.yrange = axis.maxyval - axis.minyval;
axis.yscale = (axis.yrange !== 0 ? 1.0 / axis.yrange : 1.0);
- if (axis.g.attr_("logscale")) {
+ if (this.dygraph_.getOption("logscale")) {
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)) {
- axis.g.error('axis ' + i + ' of graph at ' + axis.g +
- ' can\'t be displayed in log scale for range [' +
- axis.minyval + ' - ' + axis.maxyval + ']');
+ console.error('axis ' + i + ' of graph at ' + axis.g +
+ ' can\'t be displayed in log scale for range [' +
+ axis.minyval + ' - ' + axis.maxyval + ']');
}
}
}
};
-DygraphLayout._calcYNormal = function(axis, value, logscale) {
+DygraphLayout.calcXNormal_ = function(value, xAxis, logscale) {
+ if (logscale) {
+ return ((Dygraph.log10(value) - Dygraph.log10(xAxis.minval)) * xAxis.xlogscale);
+ } else {
+ return (value - xAxis.minval) * xAxis.scale;
+ }
+};
+
+/**
+ * @param {DygraphAxisType} axis
+ * @param {number} value
+ * @param {boolean} logscale
+ * @return {number}
+ */
+DygraphLayout.calcYNormal_ = function(axis, value, logscale) {
if (logscale) {
- return 1.0 - ((Dygraph.log10(value) - Dygraph.log10(axis.minyval)) * axis.ylogscale);
+ var x = 1.0 - ((Dygraph.log10(value) - Dygraph.log10(axis.minyval)) * axis.ylogscale);
+ return isFinite(x) ? x : NaN; // shim for v8 issue; see pull request 276
} else {
return 1.0 - ((value - axis.minyval) * axis.yscale);
}
};
DygraphLayout.prototype._evaluateLineCharts = function() {
- var connectSeparated = this.attr_('connectSeparatedPoints');
- var isStacked = this.attr_("stackedGraph");
- var hasBars = this.attr_('errorBars') || this.attr_('customBars');
+ var isStacked = this.dygraph_.getOption("stackedGraph");
+ var isLogscaleForX = this.dygraph_.getOptionForAxis("logscale", 'x');
- var boundaryIdStart = this.dygraph_.getLeftBoundary_();
for (var setIdx = 0; setIdx < this.points.length; setIdx++) {
var points = this.points[setIdx];
var setName = this.setNames[setIdx];
+ var connectSeparated = this.dygraph_.getOption('connectSeparatedPoints', setName);
var axis = this.dygraph_.axisPropertiesForSeries(setName);
// TODO (konigsberg): use optionsForAxis instead.
var logscale = this.dygraph_.attributes_.getForSeries("logscale", setName);
var point = points[j];
// Range from 0-1 where 0 represents left and 1 represents right.
- point.x = (point.xval - this.minxval) * this.xscale;
+ point.x = DygraphLayout.calcXNormal_(point.xval, this._xAxis, isLogscaleForX);
// Range from 0-1 where 0 represents top and 1 represents bottom
var yval = point.yval;
if (isStacked) {
- point.y_stacked = DygraphLayout._calcYNormal(
+ point.y_stacked = DygraphLayout.calcYNormal_(
axis, point.yval_stacked, logscale);
if (yval !== null && !isNaN(yval)) {
yval = point.yval_stacked;
point.yval = NaN;
}
}
- point.y = DygraphLayout._calcYNormal(axis, yval, logscale);
-
- if (hasBars) {
- point.y_top = DygraphLayout._calcYNormal(
- axis, yval - point.yval_minus, logscale);
- point.y_bottom = DygraphLayout._calcYNormal(
- axis, yval + point.yval_plus, logscale);
- }
+ point.y = DygraphLayout.calcYNormal_(axis, yval, logscale);
}
- }
-};
-/**
- * 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;
+ this.dygraph_.dataHandler_.onLineEvaluated(points, axis, logscale);
}
-
- // Assume it's a number or NaN. If it's something else, I'll be shocked.
- return val;
};
DygraphLayout.prototype._evaluateLineTicks = function() {
for (i = 0; i < this.xTicks_.length; i++) {
tick = this.xTicks_[i];
label = tick.label;
- pos = this.xscale * (tick.v - this.minxval);
- if ((pos >= 0.0) && (pos <= 1.0)) {
+ pos = this.dygraph_.toPercentXCoord(tick.v);
+ if ((pos >= 0.0) && (pos < 1.0)) {
this.xticks.push([pos, label]);
}
}
tick = axis.ticks[j];
label = tick.label;
pos = this.dygraph_.toPercentYCoord(tick.v, i);
- if ((pos >= 0.0) && (pos <= 1.0)) {
+ if ((pos > 0.0) && (pos <= 1.0)) {
this.yticks.push([i, pos, label]);
}
}
this.setPointsLengths = [];
this.setPointsOffsets = [];
};
+
+return DygraphLayout;
+
+})();
projects / dygraphs.git / blobdiff