projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change x-axis pixel spacing default to 70.
[dygraphs.git]
/
dygraph.js
diff --git
a/dygraph.js
b/dygraph.js
index
c9130e4
..
43768a9
100644
(file)
--- a/
dygraph.js
+++ b/
dygraph.js
@@
-47,7
+47,6
@@
if (typeof(DEBUG) === 'undefined') DEBUG=true;
var Dygraph = (function() {
if (typeof(DEBUG) === 'undefined') DEBUG=true;
var Dygraph = (function() {
-/*jshint globalstrict: true */
/*global DygraphLayout:false, DygraphCanvasRenderer:false, DygraphOptions:false, G_vmlCanvasManager:false,ActiveXObject:false */
"use strict";
/*global DygraphLayout:false, DygraphCanvasRenderer:false, DygraphOptions:false, G_vmlCanvasManager:false,ActiveXObject:false */
"use strict";
@@
-118,10
+117,8
@@
Dygraph.KMG2_SMALL_LABELS = [ 'm', 'u', 'n', 'p', 'f', 'a', 'z', 'y' ];
* and maxNumberWidth options.
* @param {number} x The number to be formatted
* @param {Dygraph} opts An options view
* and maxNumberWidth options.
* @param {number} x The number to be formatted
* @param {Dygraph} opts An options view
- * @param {string} name The name of the point's data series
- * @param {Dygraph} g The dygraph object
*/
*/
-Dygraph.numberValueFormatter = function(x, opts
, pt, g
) {
+Dygraph.numberValueFormatter = function(x, opts) {
var sigFigs = opts('sigFigs');
if (sigFigs !== null) {
var sigFigs = opts('sigFigs');
if (sigFigs !== null) {
@@
-192,8
+189,8
@@
Dygraph.numberValueFormatter = function(x, opts, pt, g) {
* variant for use as an axisLabelFormatter.
* @private
*/
* variant for use as an axisLabelFormatter.
* @private
*/
-Dygraph.numberAxisLabelFormatter = function(x, granularity, opts
, g
) {
- return Dygraph.numberValueFormatter(x, opts
, g
);
+Dygraph.numberAxisLabelFormatter = function(x, granularity, opts) {
+ return Dygraph.numberValueFormatter(x, opts);
};
/**
};
/**
@@
-229,12
+226,12
@@
Dygraph.dateAxisLabelFormatter = function(date, granularity, opts) {
if (granularity >= Dygraph.DECADAL) {
return '' + year;
} else if (granularity >= Dygraph.MONTHLY) {
if (granularity >= Dygraph.DECADAL) {
return '' + year;
} else if (granularity >= Dygraph.MONTHLY) {
- return Dygraph.SHORT_MONTH_NAMES_[month] + '
' + year;
+ return Dygraph.SHORT_MONTH_NAMES_[month] + '
 
' + year;
} else {
var frac = hours * 3600 + mins * 60 + secs + 1e-3 * millis;
if (frac === 0 || granularity >= Dygraph.DAILY) {
} else {
var frac = hours * 3600 + mins * 60 + secs + 1e-3 * millis;
if (frac === 0 || granularity >= Dygraph.DAILY) {
- // e.g. '21Jan' (%d%b)
- return Dygraph.zeropad(day) + Dygraph.SHORT_MONTH_NAMES_[month];
+ // e.g. '21
Jan' (%d%b)
+ return Dygraph.zeropad(day) +
' ' +
Dygraph.SHORT_MONTH_NAMES_[month];
} else {
return Dygraph.hmsString_(hours, mins, secs);
}
} else {
return Dygraph.hmsString_(hours, mins, secs);
}
@@
-293,8
+290,6
@@
Dygraph.DEFAULT_ATTRS = {
axisTickSize: 3,
axisLabelFontSize: 14,
axisTickSize: 3,
axisLabelFontSize: 14,
- xAxisLabelWidth: 50,
- yAxisLabelWidth: 50,
rightGap: 5,
showRoller: false,
rightGap: 5,
showRoller: false,
@@
-363,7
+358,8
@@
Dygraph.DEFAULT_ATTRS = {
// per-axis options
axes: {
x: {
// per-axis options
axes: {
x: {
- pixelsPerLabel: 60,
+ pixelsPerLabel: 70,
+ axisLabelWidth: 60,
axisLabelFormatter: Dygraph.dateAxisLabelFormatter,
valueFormatter: Dygraph.dateValueFormatter,
drawGrid: true,
axisLabelFormatter: Dygraph.dateAxisLabelFormatter,
valueFormatter: Dygraph.dateValueFormatter,
drawGrid: true,
@@
-372,6
+368,7
@@
Dygraph.DEFAULT_ATTRS = {
ticker: null // will be set in dygraph-tickers.js
},
y: {
ticker: null // will be set in dygraph-tickers.js
},
y: {
+ axisLabelWidth: 50,
pixelsPerLabel: 30,
valueFormatter: Dygraph.numberValueFormatter,
axisLabelFormatter: Dygraph.numberAxisLabelFormatter,
pixelsPerLabel: 30,
valueFormatter: Dygraph.numberValueFormatter,
axisLabelFormatter: Dygraph.numberAxisLabelFormatter,
@@
-381,10
+378,11
@@
Dygraph.DEFAULT_ATTRS = {
ticker: null // will be set in dygraph-tickers.js
},
y2: {
ticker: null // will be set in dygraph-tickers.js
},
y2: {
+ axisLabelWidth: 50,
pixelsPerLabel: 30,
valueFormatter: Dygraph.numberValueFormatter,
axisLabelFormatter: Dygraph.numberAxisLabelFormatter,
pixelsPerLabel: 30,
valueFormatter: Dygraph.numberValueFormatter,
axisLabelFormatter: Dygraph.numberAxisLabelFormatter,
- drawAxis:
false,
+ drawAxis:
true, // only applies when there are two axes of data.
drawGrid: false,
independentTicks: false,
ticker: null // will be set in dygraph-tickers.js
drawGrid: false,
independentTicks: false,
ticker: null // will be set in dygraph-tickers.js
@@
-555,6
+553,7
@@
Dygraph.prototype.__init__ = function(div, file, attrs) {
var handlers = pluginInstance.activate(this);
for (var eventName in handlers) {
var handlers = pluginInstance.activate(this);
for (var eventName in handlers) {
+ if (!handlers.hasOwnProperty(eventName)) continue;
// TODO(danvk): validate eventName.
pluginDict.events[eventName] = handlers[eventName];
}
// TODO(danvk): validate eventName.
pluginDict.events[eventName] = handlers[eventName];
}
@@
-1079,7
+1078,7
@@
Dygraph.prototype.toPercentXCoord = function(x) {
var xRange = this.xAxisRange();
var pct;
var logscale = this.attributes_.getForAxis("logscale", 'x') ;
var xRange = this.xAxisRange();
var pct;
var logscale = this.attributes_.getForAxis("logscale", 'x') ;
- if (logscale ==
true) {
// logscale can be null so we test for true explicitly.
+ if (logscale ==
= true) {
// logscale can be null so we test for true explicitly.
var logr0 = Dygraph.log10(xRange[0]);
var logr1 = Dygraph.log10(xRange[1]);
pct = (Dygraph.log10(x) - logr0) / (logr1 - logr0);
var logr0 = Dygraph.log10(xRange[0]);
var logr1 = Dygraph.log10(xRange[1]);
pct = (Dygraph.log10(x) - logr0) / (logr1 - logr0);
@@
-2319,7
+2318,7
@@
Dygraph.prototype.addXTicks_ = function() {
var xTicks = xAxisOptionsView('ticker')(
range[0],
range[1],
var xTicks = xAxisOptionsView('ticker')(
range[0],
range[1],
- this.
width_
, // TODO(danvk): should be area.width
+ this.
plotter_.area.w
, // TODO(danvk): should be area.width
xAxisOptionsView,
this);
// var msg = 'ticker(' + range[0] + ', ' + range[1] + ', ' + this.width_ + ', ' + this.attr_('pixelsPerXLabel') + ') -> ' + JSON.stringify(xTicks);
xAxisOptionsView,
this);
// var msg = 'ticker(' + range[0] + ', ' + range[1] + ', ' + this.width_ + ', ' + this.attr_('pixelsPerXLabel') + ') -> ' + JSON.stringify(xTicks);
@@
-2973,7
+2972,7
@@
Dygraph.prototype.computeYAxisRanges_ = function(extremes) {
var ticker = opts('ticker');
axis.ticks = ticker(axis.computedValueRange[0],
axis.computedValueRange[1],
var ticker = opts('ticker');
axis.ticks = ticker(axis.computedValueRange[0],
axis.computedValueRange[1],
- this.
height_, // TODO(danvk): should be area.height
+ this.
plotter_.area.h,
opts,
this);
// Define the first independent axis as primary axis.
opts,
this);
// Define the first independent axis as primary axis.
@@
-3004,7
+3003,7
@@
Dygraph.prototype.computeYAxisRanges_ = function(extremes) {
axis.ticks = ticker(axis.computedValueRange[0],
axis.computedValueRange[1],
axis.ticks = ticker(axis.computedValueRange[0],
axis.computedValueRange[1],
- this.
height_, // TODO(danvk): should be area.height
+ this.
plotter_.area.h,
opts,
this,
tick_values);
opts,
this,
tick_values);
@@
-3555,6
+3554,7
@@
Dygraph.prototype.updateOptions = function(input_attrs, block_redraw) {
Dygraph.mapLegacyOptions_ = function(attrs) {
var my_attrs = {};
for (var k in attrs) {
Dygraph.mapLegacyOptions_ = function(attrs) {
var my_attrs = {};
for (var k in attrs) {
+ if (!attrs.hasOwnProperty(k)) continue;
if (k == 'file') continue;
if (attrs.hasOwnProperty(k)) my_attrs[k] = attrs[k];
}
if (k == 'file') continue;
if (attrs.hasOwnProperty(k)) my_attrs[k] = attrs[k];
}
@@
-3588,6
+3588,8
@@
Dygraph.mapLegacyOptions_ = function(attrs) {
map('drawXAxis', 'x', 'drawAxis');
map('drawYGrid', 'y', 'drawGrid');
map('drawYAxis', 'y', 'drawAxis');
map('drawXAxis', 'x', 'drawAxis');
map('drawYGrid', 'y', 'drawGrid');
map('drawYAxis', 'y', 'drawAxis');
+ map('xAxisLabelWidth', 'x', 'axisLabelWidth');
+ map('yAxisLabelWidth', 'y', 'axisLabelWidth');
return my_attrs;
};
return my_attrs;
};