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

Coffeescript non-date X values.

Browse Source
This commit is contained in:
Olly Smith 2012-03-06 22:05:00 +00:00
parent 35b46d15aa
commit 28cb48bb36
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
morris.coffee
View File

@ -57,6 +57,7 @@ class Morris.Line
hoverFontSize: 12
smooth: true
hideHover: false
parseTime: true
# Do any necessary pre-processing for a new dataset
#
@ -74,7 +75,10 @@ class Morris.Line
# translate x labels into nominal dates
# note: currently using decimal years to specify dates
@xvals = $.map @columnLabels, (x) => @parseYear x
if @options.parseTime
@xvals = $.map @columnLabels, (x) => @parseYear x
else
@xvals = [(@columnLabels.length-1)..0]
@xmin = Math.min.apply null, @xvals
@xmax = Math.max.apply null, @xvals
if @xmin is @xmax
@ -132,7 +136,8 @@ class Morris.Line
prevLabelMargin = null
xLabelMargin = 50 # make this an option?
for i in [Math.ceil(@xmin)..Math.floor(@xmax)]
label = @r.text(transX(i), @options.marginTop + height + @options.marginBottom / 2, i)
labelText = if @options.parseTime then i else @columnLabels[@columnLabels.length-i-1]
label = @r.text(transX(i), @options.marginTop + height + @options.marginBottom / 2, labelText)
.attr('font-size', @options.gridTextSize)
.attr('fill', @options.gridTextColor)
labelBox = label.getBBox()