projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x axis log scale.
[dygraphs.git]
/
dygraph-layout.js
diff --git
a/dygraph-layout.js
b/dygraph-layout.js
index
93e0c3a
..
2e81359
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) {
@@
-179,6
+175,7
@@
DygraphLayout.prototype.setYAxes = function (yAxes) {
};
DygraphLayout.prototype.evaluate = function() {
};
DygraphLayout.prototype.evaluate = function() {
+ this._xAxis = {};
this._evaluateLimits();
this._evaluateLineCharts();
this._evaluateLineTicks();
this._evaluateLimits();
this._evaluateLineCharts();
this._evaluateLineTicks();
@@
-187,11
+184,15
@@
DygraphLayout.prototype.evaluate = function() {
DygraphLayout.prototype._evaluateLimits = function() {
var xlimits = this.dygraph_.xAxisRange();
DygraphLayout.prototype._evaluateLimits = function() {
var xlimits = this.dygraph_.xAxisRange();
- this.minxval = xlimits[0];
- this.maxxval = xlimits[1];
+ this.
_xAxis.
minxval = xlimits[0];
+ this.
_xAxis.
maxxval = xlimits[1];
var xrange = xlimits[1] - xlimits[0];
var xrange = xlimits[1] - xlimits[0];
- this.xscale = (xrange !== 0 ? 1 / xrange : 1.0);
+ this.
_xAxis.
xscale = (xrange !== 0 ? 1 / xrange : 1.0);
+ if (this.dygraph_.getOptionForAxis("logscale", 'x')) {
+ this._xAxis.xlogrange = Dygraph.log10(this._xAxis.maxxval) - Dygraph.log10(this._xAxis.minxval);
+ 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];
for (var i = 0; i < this.yAxes_.length; i++) {
var axis = this.yAxes_[i];
axis.minyval = axis.computedValueRange[0];
@@
-199,7
+200,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 (
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.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)) {
@@
-211,6
+212,14
@@
DygraphLayout.prototype._evaluateLimits = function() {
}
};
}
};
+DygraphLayout._calcXNormal = function(value, axis, logscale) {
+ if (logscale) {
+ return ((Dygraph.log10(value) - Dygraph.log10(axis.minxval)) * axis.xlogscale);
+ } else {
+ return (value - axis.minxval) * axis.xscale;
+ }
+};
+
DygraphLayout._calcYNormal = function(axis, value, logscale) {
if (logscale) {
return 1.0 - ((Dygraph.log10(value) - Dygraph.log10(axis.minyval)) * axis.ylogscale);
DygraphLayout._calcYNormal = function(axis, value, logscale) {
if (logscale) {
return 1.0 - ((Dygraph.log10(value) - Dygraph.log10(axis.minyval)) * axis.ylogscale);
@@
-220,12
+229,13
@@
DygraphLayout._calcYNormal = function(axis, value, logscale) {
};
DygraphLayout.prototype._evaluateLineCharts = function() {
};
DygraphLayout.prototype._evaluateLineCharts = function() {
- var
connectSeparated = this.attr_('connectSeparatedPoints'
);
- var is
Stacked = this.attr_("stackedGraph"
);
+ var
isStacked = this.dygraph_.getOption("stackedGraph"
);
+ var is
LogscaleForX = this.dygraph_.getOptionForAxis("logscale", 'x'
);
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);
@@
-234,7
+244,7
@@
DygraphLayout.prototype._evaluateLineCharts = function() {
var point = points[j];
// Range from 0-1 where 0 represents left and 1 represents right.
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) {
// Range from 0-1 where 0 represents top and 1 represents bottom
var yval = point.yval;
if (isStacked) {
@@
-277,7
+287,7
@@
DygraphLayout.prototype._evaluateLineTicks = function() {
for (i = 0; i < this.xTicks_.length; i++) {
tick = this.xTicks_[i];
label = tick.label;
for (i = 0; i < this.xTicks_.length; i++) {
tick = this.xTicks_[i];
label = tick.label;
- pos = this.
xscale * (tick.v - this.minxval
);
+ pos = this.
dygraph_.toPercentXCoord(tick.v
);
if ((pos >= 0.0) && (pos <= 1.0)) {
this.xticks.push([pos, label]);
}
if ((pos >= 0.0) && (pos <= 1.0)) {
this.xticks.push([pos, label]);
}