projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Legend follows highlighted points
[dygraphs.git]
/
dygraph-layout.js
diff --git
a/dygraph-layout.js
b/dygraph-layout.js
index
057e7c6
..
4caa935
100644
(file)
--- a/
dygraph-layout.js
+++ b/
dygraph-layout.js
@@
-149,14
+149,14
@@
DygraphLayout.prototype.setAnnotations = function(ann) {
for (var i = 0; i < ann.length; i++) {
var a = {};
if (!ann[i].xval && ann[i].x === undefined) {
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");
+
Dygraph
.error("Annotations must have an 'x' property");
return;
}
if (ann[i].icon &&
!(ann[i].hasOwnProperty('width') &&
ann[i].hasOwnProperty('height'))) {
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");
+
Dygraph
.error("Must set width and height when setting " +
+ "annotation.icon property");
return;
}
Dygraph.update(a, ann[i]);
return;
}
Dygraph.update(a, ann[i]);
@@
-199,15
+199,21
@@
DygraphLayout.prototype._evaluateLimits = function() {
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.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 + ']');
+
Dygraph
.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) {
+/**
+ * @param {DygraphAxisType} axis
+ * @param {number} value
+ * @param {boolean} logscale
+ * @return {number}
+ */
+DygraphLayout.calcYNormal_ = function(axis, value, logscale) {
if (logscale) {
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
if (logscale) {
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
@@
-235,7
+241,7
@@
DygraphLayout.prototype._evaluateLineCharts = function() {
// Range from 0-1 where 0 represents top and 1 represents bottom
var yval = point.yval;
if (isStacked) {
// 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;
axis, point.yval_stacked, logscale);
if (yval !== null && !isNaN(yval)) {
yval = point.yval_stacked;
@@
-247,7
+253,7
@@
DygraphLayout.prototype._evaluateLineCharts = function() {
point.yval = NaN;
}
}
point.yval = NaN;
}
}
- point.y = DygraphLayout.
_calcYNormal
(axis, yval, logscale);
+ point.y = DygraphLayout.
calcYNormal_
(axis, yval, logscale);
}
this.dygraph_.dataHandler_.onLineEvaluated(points, axis, logscale);
}
this.dygraph_.dataHandler_.onLineEvaluated(points, axis, logscale);