projects
/
dygraphs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
34bbe78
)
add per-series attributes in attr_
author
Dan Vanderkam
<danvdk@gmail.com>
Wed, 29 Sep 2010 10:35:05 +0000
(12:35 +0200)
committer
Dan Vanderkam
<danvdk@gmail.com>
Wed, 29 Sep 2010 10:35:05 +0000
(12:35 +0200)
dygraph.js
patch
|
blob
|
blame
|
history
diff --git
a/dygraph.js
b/dygraph.js
index
4adb716
..
7dab8c7
100644
(file)
--- a/
dygraph.js
+++ b/
dygraph.js
@@
-240,8
+240,12
@@
Dygraph.prototype.__init__ = function(div, file, attrs) {
this.start_();
};
this.start_();
};
-Dygraph.prototype.attr_ = function(name) {
- if (typeof(this.user_attrs_[name]) != 'undefined') {
+Dygraph.prototype.attr_ = function(name, series) {
+ if (series &&
+ typeof(this.user_attrs_[series]) != 'undefined' &&
+ typeof(this.user_attrs_[series][name]) != 'undefined') {
+ return this.user_attrs_[series][name];
+ } else if (typeof(this.user_attrs_[name]) != 'undefined') {
return this.user_attrs_[name];
} else if (typeof(this.attrs_[name]) != 'undefined') {
return this.attrs_[name];
return this.user_attrs_[name];
} else if (typeof(this.attrs_[name]) != 'undefined') {
return this.attrs_[name];
@@
-1581,8
+1585,6
@@
Dygraph.prototype.drawGraph_ = function(data) {
this.setColors_();
this.attrs_['pointSize'] = 0.5 * this.attr_('highlightCircleSize');
this.setColors_();
this.attrs_['pointSize'] = 0.5 * this.attr_('highlightCircleSize');
- var connectSeparatedPoints = this.attr_('connectSeparatedPoints');
-
// Loop over the fields (series). Go from the last to the first,
// because if they're stacked that's how we accumulate the values.
// Loop over the fields (series). Go from the last to the first,
// because if they're stacked that's how we accumulate the values.
@@
-1593,6
+1595,8
@@
Dygraph.prototype.drawGraph_ = function(data) {
for (var i = data[0].length - 1; i >= 1; i--) {
if (!this.visibility()[i - 1]) continue;
for (var i = data[0].length - 1; i >= 1; i--) {
if (!this.visibility()[i - 1]) continue;
+ var connectSeparatedPoints = this.attr_('connectSeparatedPoints', i);
+
var series = [];
for (var j = 0; j < data.length; j++) {
if (data[j][i] != null || !connectSeparatedPoints) {
var series = [];
for (var j = 0; j < data.length; j++) {
if (data[j][i] != null || !connectSeparatedPoints) {
@@
-2306,6
+2310,9
@@
Dygraph.prototype.updateOptions = function(attrs) {
if (attrs.valueRange) {
this.valueRange_ = attrs.valueRange;
}
if (attrs.valueRange) {
this.valueRange_ = attrs.valueRange;
}
+
+ // TODO(danvk): validate per-series options.
+
Dygraph.update(this.user_attrs_, attrs);
Dygraph.update(this.renderOptions_, attrs);
Dygraph.update(this.user_attrs_, attrs);
Dygraph.update(this.renderOptions_, attrs);