Skip to content

Add the ability to add diagonal goals #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavidBennettPIO wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add the ability to add diagonal goals #555

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions lib/morris.grid.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,16 @@ class Morris.Grid extends Morris.EventEmitter
ymin = if @cumulative then 0 else null

if @options.goals.length > 0
minGoal = Math.min @options.goals...
maxGoal = Math.max @options.goals...
flatGoals = []
for g in @options.goals
if g instanceof Array
[from, to] = g
flatGoals.push(from)
flatGoals.push(to)
else
flatGoals.push(e)
minGoal = Math.min flatGoals...
maxGoal = Math.max flatGoals...
ymin = if ymin? then Math.min(ymin, minGoal) else minGoal
ymax = if ymax? then Math.max(ymax, maxGoal) else maxGoal

Expand Down Expand Up @@ -445,11 +453,22 @@ class Morris.Grid extends Morris.EventEmitter
@drawEvent(event, color)

drawGoal: (goal, color) ->
y = Math.floor(@transY(goal)) + 0.5
if not @options.horizontal
path = "M#{@xStart},#{y}H#{@xEnd}"
if goal instanceof Array
[from, to] = goal
from = Math.floor(@transY(from)) + 0.5
to = Math.floor(@transY(to)) + 0.5

if not @options.horizontal
path = "M#{@xStart},#{from}L#{@xEnd},#{to}"
else
path = "M#{from},#{@xStart}L#{to},#{@xEnd}"

else
path = "M#{y},#{@xStart}V#{@xEnd}"
y = Math.floor(@transY(goal)) + 0.5
if not @options.horizontal
path = "M#{@xStart},#{y}H#{@xEnd}"
else
path = "M#{y},#{@xStart}V#{@xEnd}"

@raphael.path(path)
.attr('stroke', color)
Expand Down