Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-09-21 02:31:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add simple support of decimal values on the y axis.

Browse Source
This commit is contained in:
Thomas Pelletier 2012-05-14 10:52:47 +01:00
parent 942e121caa
commit dbc114e060
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
morris.coffee
View File

@ -204,12 +204,18 @@ class Morris.Line
drawGrid: ->
# draw y axis labels, horizontal lines
yInterval = (@options.ymax - @options.ymin) / (@options.numLines - 1)
firstY = Math.ceil(@options.ymin / yInterval) * yInterval
lastY = Math.floor(@options.ymax / yInterval) * yInterval
firstY = (@options.ymin / yInterval) * yInterval
lastY = (@options.ymax / yInterval) * yInterval
if (yInterval < 1)
precision = -parseInt(yInterval.toExponential().split('e')[1])
else
precision = 0
for lineY in [firstY..lastY] by yInterval
v = Math.floor(lineY)
v = lineY
y = @transY(v)
@r.text(@left - @options.marginLeft/2, y, @yLabelFormat(v))
@r.text(@left - @options.marginLeft/2, y, @yLabelFormat(v.toFixed(precision)))
.attr('font-size', @options.gridTextSize)
.attr('fill', @options.gridTextColor)
.attr('text-anchor', 'end')

15
morris.js
View File

@ -241,15 +241,20 @@
};
Line.prototype.drawGrid = function() {
var drawLabel, firstY, i, l, labelText, lastY, lineY, prevLabelMargin, v, xLabelMargin, y, yInterval, ypos, _i, _j, _k, _len, _ref, _ref1, _results, _results1,
var drawLabel, firstY, i, l, labelText, lastY, lineY, precision, prevLabelMargin, v, xLabelMargin, y, yInterval, ypos, _i, _j, _k, _len, _ref, _ref1, _results, _results1,
_this = this;
yInterval = (this.options.ymax - this.options.ymin) / (this.options.numLines - 1);
firstY = Math.ceil(this.options.ymin / yInterval) * yInterval;
lastY = Math.floor(this.options.ymax / yInterval) * yInterval;
firstY = (this.options.ymin / yInterval) * yInterval;
lastY = (this.options.ymax / yInterval) * yInterval;
if (yInterval < 1) {
precision = -parseInt(yInterval.toExponential().split('e')[1]);
} else {
precision = 0;
}
for (lineY = _i = firstY; firstY <= lastY ? _i <= lastY : _i >= lastY; lineY = _i += yInterval) {
v = Math.floor(lineY);
v = lineY;
y = this.transY(v);
this.r.text(this.left - this.options.marginLeft / 2, y, this.yLabelFormat(v)).attr('font-size', this.options.gridTextSize).attr('fill', this.options.gridTextColor).attr('text-anchor', 'end');
this.r.text(this.left - this.options.marginLeft / 2, y, this.yLabelFormat(v.toFixed(precision))).attr('font-size', this.options.gridTextSize).attr('fill', this.options.gridTextColor).attr('text-anchor', 'end');
this.r.path("M" + this.left + "," + y + "H" + (this.left + this.width)).attr('stroke', this.options.gridLineColor).attr('stroke-width', this.options.gridStrokeWidth);
}
ypos = this.options.marginTop + this.height + this.options.marginBottom / 2;

2
morris.min.js vendored
View File

File diff suppressed because one or more lines are too long