projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #257 from kberg/auto-tests
[dygraphs.git]
/
dygraph-layout.js
diff --git
a/dygraph-layout.js
b/dygraph-layout.js
index
4caafc0
..
54496aa
100644
(file)
--- a/
dygraph-layout.js
+++ b/
dygraph-layout.js
@@
-52,12
+52,18
@@
DygraphLayout.prototype.addDataset = function(setname, set_xy) {
this.setNames.push(setname);
};
this.setNames.push(setname);
};
+/**
+ * Returns the box which the chart should be drawn in. This is the canvas's
+ * box, less space needed for the axis and chart labels.
+ *
+ * @return {{x: number, y: number, w: number, h: number}}
+ */
DygraphLayout.prototype.getPlotArea = function() {
return this.area_;
};
// Compute the box which the chart should be drawn in. This is the canvas's
DygraphLayout.prototype.getPlotArea = function() {
return this.area_;
};
// Compute the box which the chart should be drawn in. This is the canvas's
-// box, less space needed for axis
and chart label
s.
+// box, less space needed for axis
, chart labels, and other plug-in
s.
// NOTE: This should only be called by Dygraph.predraw_().
DygraphLayout.prototype.computePlotArea = function() {
var area = {
// NOTE: This should only be called by Dygraph.predraw_().
DygraphLayout.prototype.computePlotArea = function() {
var area = {
@@
-156,10
+162,6
@@
DygraphLayout.prototype.setYAxes = function (yAxes) {
this.yAxes_ = yAxes;
};
this.yAxes_ = yAxes;
};
-DygraphLayout.prototype.setDateWindow = function(dateWindow) {
- this.dateWindow_ = dateWindow;
-};
-
DygraphLayout.prototype.evaluate = function() {
this._evaluateLimits();
this._evaluateLineCharts();
DygraphLayout.prototype.evaluate = function() {
this._evaluateLimits();
this._evaluateLineCharts();
@@
-211,6
+213,7
@@
DygraphLayout.prototype._evaluateLineCharts = function() {
// on chrome+linux, they are 6 times more expensive than iterating through the
// points and drawing the lines. The brunt of the cost comes from allocating
// the |point| structures.
// on chrome+linux, they are 6 times more expensive than iterating through the
// points and drawing the lines. The brunt of the cost comes from allocating
// the |point| structures.
+ var boundaryIdStart = this.dygraph_.getLeftBoundary_();
for (var setIdx = 0; setIdx < this.datasets.length; setIdx++) {
var dataset = this.datasets[setIdx];
var setName = this.setNames[setIdx];
for (var setIdx = 0; setIdx < this.datasets.length; setIdx++) {
var dataset = this.datasets[setIdx];
var setName = this.setNames[setIdx];
@@
-242,7
+245,8
@@
DygraphLayout.prototype._evaluateLineCharts = function() {
y: yNormal,
xval: xValue,
yval: yValue,
y: yNormal,
xval: xValue,
yval: yValue,
- name: setName // TODO(danvk): is this really necessary?
+ name: setName, // TODO(danvk): is this really necessary?
+ idx: j + boundaryIdStart
};
}
};
}