this.registeredEvents_ = [];
this.eventListeners_ = {};
+ this.attributes_ = new DygraphOptions(this);
+
// Create the containing DIV and other interactive elements
this.createInterface_();
}
// </REMOVE_FOR_COMBINED>
+ // Building an array which we peruse in backwards order to find the correct value.
+ // Options are checked in this order:
+ // series, axis, user attrs, global attrs.
+ // TODO(konigsberg): Can this be made faster by starting with the series and working outward,
+ // rather than building an array?
+
var sources = [];
sources.push(this.attrs_);
if (this.user_attrs_) {
if (this.user_attrs_.hasOwnProperty(seriesName)) {
sources.push(this.user_attrs_[seriesName]);
}
+
+ // TODO(konigsberg): This special case ought to be documented.
if (seriesName === this.highlightSet_ &&
this.user_attrs_.hasOwnProperty('highlightSeriesOpts')) {
sources.push(this.user_attrs_.highlightSeriesOpts);
break;
}
}
- return ret;
+
+ var computedValue = seriesName ? this.attributes_.findForSeries(name, seriesName) : this.attributes_.find(name);
+ if (ret !== computedValue) {
+ console.log("Mismatch", name, seriesName, ret, computedValue);
+ }
+
+ var USE_NEW_VALUE = true;
+ return USE_NEW_VALUE ? computedValue : ret;
};
/**
newValueRanges = [];
for (i = 0; i < this.axes_.length; i++) {
var axis = this.axes_[i];
- newValueRanges.push(axis.valueRange !== null ?
+ newValueRanges.push((axis.valueRange !== null &&
+ axis.valueRange !== undefined) ?
axis.valueRange : axis.extremeRange);
}
}
// rolling averages.
this.rolledSeries_ = [null]; // x-axis is the first series and it's special
for (var i = 1; i < this.numColumns(); i++) {
- var logScale = this.attr_('logscale', i); // TODO(klausw): this looks wrong
+ // var logScale = this.attr_('logscale', i); // TODO(klausw): this looks wrong // konigsberg thinks so too.
+ var logScale = this.attr_('logscale');
var series = this.extractSeries_(this.rawData_, i, logScale);
series = this.rollingAverage(series, this.rollPeriod_);
this.rolledSeries_.push(series);
*/
Dygraph.prototype.parseCSV_ = function(data) {
var ret = [];
- var lines = data.split("\n");
+ var line_delimiter = Dygraph.detectLineDelimiter(data);
+ var lines = data.split(line_delimiter || "\n");
var vals, j;
// Use the default delimiter or fall back to a tab if that makes sense.
// User hasn't explicitly set labels, so they're (presumably) in the CSV.
start = 1;
this.attrs_.labels = lines[0].split(delim); // NOTE: _not_ user_attrs_.
+ this.attributes_.reparseSeries();
}
var line_no = 0;
"in the options parameter");
this.attrs_.labels = [ "X" ];
for (i = 1; i < data[0].length; i++) {
- this.attrs_.labels.push("Y" + i);
+ this.attrs_.labels.push("Y" + i); // Not user_attrs_.
}
+ this.attributes_.reparseSeries();
} else {
var num_labels = this.attr_("labels");
if (num_labels.length != data[0].length) {
this.predraw_();
} else if (typeof data == 'string') {
// Heuristic: a newline means it's CSV data. Otherwise it's an URL.
- if (data.indexOf('\n') >= 0) {
+ var line_delimiter = Dygraph.detectLineDelimiter(data);
+ if (line_delimiter) {
this.loadedEvent_(data);
} else {
var req = new XMLHttpRequest();