projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge in kberg's changes
[dygraphs.git]
/
dygraph-canvas.js
diff --git
a/dygraph-canvas.js
b/dygraph-canvas.js
index
5c0fada
..
b90695b
100644
(file)
--- a/
dygraph-canvas.js
+++ b/
dygraph-canvas.js
@@
-89,7
+89,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);
- axis.ylogrange =
Math.log(axis.maxyval) - Math.log
(axis.minyval);
+ axis.ylogrange =
Dygraph.log10(axis.maxyval) - Dygraph.log10
(axis.minyval);
axis.ylogscale = (axis.ylogrange != 0 ? 1.0 / axis.ylogrange : 1.0);
}
};
axis.ylogscale = (axis.ylogrange != 0 ? 1.0 / axis.ylogrange : 1.0);
}
};
@@
-106,16
+106,16
@@
DygraphLayout.prototype._evaluateLineCharts = function() {
for (var j = 0; j < dataset.length; j++) {
var item = dataset[j];
for (var j = 0; j < dataset.length; j++) {
var item = dataset[j];
- var
foo
;
- if (
this.dygraph_.attr_("logscale")
) {
-
foo = 1.0 - ((Math.log(parseFloat(item[1])) - Math.log
(axis.minyval)) * axis.ylogscale); // really should just be yscale.
+ var
yval
;
+ if (
axis.logscale
) {
+
yval = 1.0 - ((Dygraph.log10(parseFloat(item[1])) - Dygraph.log10
(axis.minyval)) * axis.ylogscale); // really should just be yscale.
} else {
} else {
-
foo
= 1.0 - ((parseFloat(item[1]) - axis.minyval) * axis.yscale);
+
yval
= 1.0 - ((parseFloat(item[1]) - axis.minyval) * axis.yscale);
}
var point = {
// TODO(danvk): here
x: ((parseFloat(item[0]) - this.minxval) * this.xscale),
}
var point = {
// TODO(danvk): here
x: ((parseFloat(item[0]) - this.minxval) * this.xscale),
- y:
foo
,
+ y:
yval
,
xval: parseFloat(item[0]),
yval: parseFloat(item[1]),
name: setName
xval: parseFloat(item[0]),
yval: parseFloat(item[1]),
name: setName
@@
-766,7
+766,7
@@
DygraphCanvasRenderer.prototype._renderLineChart = function() {
continue;
}
continue;
}
- // TODO(danvk): here
is a comment.
+ // TODO(danvk): here
if (stepPlot) {
var newYs = [ prevY - point.errorPlus * yscale,
prevY + point.errorMinus * yscale ];
if (stepPlot) {
var newYs = [ prevY - point.errorPlus * yscale,
prevY + point.errorMinus * yscale ];