projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add get(Type)Option methods
[dygraphs.git]
/
dygraph-layout.js
diff --git
a/dygraph-layout.js
b/dygraph-layout.js
index
e766e8f
..
e8be590
100644
(file)
--- a/
dygraph-layout.js
+++ b/
dygraph-layout.js
@@
-53,10
+53,6
@@
var DygraphLayout = function(dygraph) {
this.yTicks_ = null;
};
this.yTicks_ = null;
};
-DygraphLayout.prototype.attr_ = function(name) {
- return this.dygraph_.attr_(name);
-};
-
/**
* Add points for a single series.
*
/**
* Add points for a single series.
*
@@
-88,7
+84,7
@@
DygraphLayout.prototype.computePlotArea = function() {
y: 0
};
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.
area.h = this.dygraph_.height_;
// Let plugins reserve space.
@@
-149,7
+145,7
@@
DygraphLayout.prototype.setAnnotations = function(ann) {
// 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 = [];
// 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) {
for (var i = 0; i < ann.length; i++) {
var a = {};
if (!ann[i].xval && ann[i].x === undefined) {
@@
-199,7
+195,7
@@
DygraphLayout.prototype._evaluateLimits = function() {
axis.yrange = axis.maxyval - axis.minyval;
axis.yscale = (axis.yrange !== 0 ? 1.0 / axis.yrange : 1.0);
axis.yrange = axis.maxyval - axis.minyval;
axis.yscale = (axis.yrange !== 0 ? 1.0 / axis.yrange : 1.0);
- if (axis.g.
attr_
("logscale")) {
+ if (axis.g.
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.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)) {
@@
-213,20
+209,20
@@
DygraphLayout.prototype._evaluateLimits = function() {
DygraphLayout._calcYNormal = function(axis, value, logscale) {
if (logscale) {
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() {
} 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");
for (var setIdx = 0; setIdx < this.points.length; setIdx++) {
var points = this.points[setIdx];
var setName = this.setNames[setIdx];
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 axis = this.dygraph_.axisPropertiesForSeries(setName);
// TODO (konigsberg): use optionsForAxis instead.
var logscale = this.dygraph_.attributes_.getForSeries("logscale", setName);
@@
-252,14
+248,9
@@
DygraphLayout.prototype._evaluateLineCharts = function() {
}
}
point.y = DygraphLayout._calcYNormal(axis, yval, logscale);
}
}
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);
- }
}
}
+
+ this.dygraph_.dataHandler_.onLineEvaluated(points, axis, logscale);
}
};
}
};
@@
-284,7
+275,7
@@
DygraphLayout.prototype._evaluateLineTicks = function() {
tick = this.xTicks_[i];
label = tick.label;
pos = this.xscale * (tick.v - this.minxval);
tick = this.xTicks_[i];
label = tick.label;
pos = this.xscale * (tick.v - this.minxval);
- if ((pos >= 0.0) && (pos <
=
1.0)) {
+ if ((pos >= 0.0) && (pos < 1.0)) {
this.xticks.push([pos, label]);
}
}
this.xticks.push([pos, label]);
}
}
@@
-296,7
+287,7
@@
DygraphLayout.prototype._evaluateLineTicks = function() {
tick = axis.ticks[j];
label = tick.label;
pos = this.dygraph_.toPercentYCoord(tick.v, i);
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.yticks.push([i, pos, label]);
}
}