Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-10 21:36:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

xLabelMargin optionx.

Browse Source
This commit is contained in:
Olly Smith 2012-12-20 19:15:33 +00:00
parent 0662095c29
commit 4f53479cf0
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/decimal-custom-hover.html
View File

@ -30,7 +30,8 @@ window.m = Morris.Line({
hoverCallback: function (index, options) {
var row = options.data[index];
return "sin(" + row.x + ") = " + row.y;
}
},
xLabelMargin: 10
});
</pre>
</body>

4
lib/morris.bar.coffee
View File

@ -25,6 +25,7 @@ class Morris.Bar extends Morris.Grid
'#cb4b4b'
'#9440ed'
]
xLabelMargin: 50
# Do any size-related calculations
#
@ -55,7 +56,6 @@ class Morris.Bar extends Morris.Grid
drawXAxis: ->
# draw x axis labels
ypos = @bottom + @options.gridTextSize * 1.25
xLabelMargin = 50 # make this an option?
prevLabelMargin = null
for i in [0...@data.length]
row = @data[@data.length - 1 - i]
@ -67,7 +67,7 @@ class Morris.Bar extends Morris.Grid
# labels don't overflow the container
if (not prevLabelMargin? or prevLabelMargin >= labelBox.x + labelBox.width) and
labelBox.x >= 0 and (labelBox.x + labelBox.width) < @el.width()
prevLabelMargin = labelBox.x - xLabelMargin
prevLabelMargin = labelBox.x - @options.xLabelMargin
else
label.remove()

4
lib/morris.line.coffee
View File

@ -35,6 +35,7 @@ class Morris.Line extends Morris.Grid
smooth: true
xLabels: 'auto'
xLabelFormat: null
xLabelMargin: 50
continuousLine: true
hideHover: false
@ -135,7 +136,6 @@ class Morris.Line extends Morris.Grid
drawXAxis: ->
# draw x axis labels
ypos = @bottom + @options.gridTextSize * 1.25
xLabelMargin = 50 # make this an option?
prevLabelMargin = null
drawLabel = (labelText, xpos) =>
label = @r.text(@transX(xpos), ypos, labelText)
@ -146,7 +146,7 @@ class Morris.Line extends Morris.Grid
# labels don't overflow the container
if (not prevLabelMargin? or prevLabelMargin >= labelBox.x + labelBox.width) and
labelBox.x >= 0 and (labelBox.x + labelBox.width) < @el.width()
prevLabelMargin = labelBox.x - xLabelMargin
prevLabelMargin = labelBox.x - @options.xLabelMargin
else
label.remove()
if @options.parseTime

14
morris.js
View File

@ -575,6 +575,7 @@
smooth: true,
xLabels: 'auto',
xLabelFormat: null,
xLabelMargin: 50,
continuousLine: true,
hideHover: false
};
@ -728,17 +729,16 @@
};
Line.prototype.drawXAxis = function() {
var drawLabel, l, labels, prevLabelMargin, row, xLabelMargin, ypos, _i, _len, _results,
var drawLabel, l, labels, prevLabelMargin, row, ypos, _i, _len, _results,
_this = this;
ypos = this.bottom + this.options.gridTextSize * 1.25;
xLabelMargin = 50;
prevLabelMargin = null;
drawLabel = function(labelText, xpos) {
var label, labelBox;
label = _this.r.text(_this.transX(xpos), ypos, labelText).attr('font-size', _this.options.gridTextSize).attr('fill', _this.options.gridTextColor);
labelBox = label.getBBox();
if ((!(prevLabelMargin != null) || prevLabelMargin >= labelBox.x + labelBox.width) && labelBox.x >= 0 && (labelBox.x + labelBox.width) < _this.el.width()) {
return prevLabelMargin = labelBox.x - xLabelMargin;
return prevLabelMargin = labelBox.x - _this.options.xLabelMargin;
} else {
return label.remove();
}
@ -1132,7 +1132,8 @@
Bar.prototype.defaults = {
barSizeRatio: 0.75,
barGap: 3,
barColors: ['#0b62a4', '#7a92a3', '#4da74d', '#afd8f8', '#edc240', '#cb4b4b', '#9440ed']
barColors: ['#0b62a4', '#7a92a3', '#4da74d', '#afd8f8', '#edc240', '#cb4b4b', '#9440ed'],
xLabelMargin: 50
};
Bar.prototype.calc = function() {
@ -1176,9 +1177,8 @@
};
Bar.prototype.drawXAxis = function() {
var i, label, labelBox, prevLabelMargin, row, xLabelMargin, ypos, _i, _ref, _results;
var i, label, labelBox, prevLabelMargin, row, ypos, _i, _ref, _results;
ypos = this.bottom + this.options.gridTextSize * 1.25;
xLabelMargin = 50;
prevLabelMargin = null;
_results = [];
for (i = _i = 0, _ref = this.data.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
@ -1186,7 +1186,7 @@
label = this.r.text(row._x, ypos, row.label).attr('font-size', this.options.gridTextSize).attr('fill', this.options.gridTextColor);
labelBox = label.getBBox();
if ((!(prevLabelMargin != null) || prevLabelMargin >= labelBox.x + labelBox.width) && labelBox.x >= 0 && (labelBox.x + labelBox.width) < this.el.width()) {
_results.push(prevLabelMargin = labelBox.x - xLabelMargin);
_results.push(prevLabelMargin = labelBox.x - this.options.xLabelMargin);
} else {
_results.push(label.remove());
}

2
morris.min.js vendored
View File

File diff suppressed because one or more lines are too long