Commit aa99660f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #2709 from hiroponz/improve-network-graph-2

Improve network graph
parents 62cb5140 70687cd5
...@@ -16,6 +16,7 @@ module Gitlab ...@@ -16,6 +16,7 @@ module Gitlab
@commits = collect_commits @commits = collect_commits
@days = index_commits @days = index_commits
@space = 0
end end
def to_json(*args) def to_json(*args)
...@@ -97,8 +98,8 @@ module Gitlab ...@@ -97,8 +98,8 @@ module Gitlab
if leaves.empty? if leaves.empty?
return return
end end
space = find_free_space(leaves, map) @space = find_free_space(leaves, map)
leaves.each{|l| l.space = space} leaves.each{|l| l.space = @space}
# and mark it as reserved # and mark it as reserved
min_time = leaves.last.time min_time = leaves.last.time
parents = leaves.last.parents.collect parents = leaves.last.parents.collect
...@@ -115,7 +116,7 @@ module Gitlab ...@@ -115,7 +116,7 @@ module Gitlab
else else
max_time = parent_time - 1 max_time = parent_time - 1
end end
mark_reserved(min_time..max_time, space) mark_reserved(min_time..max_time, @space)
# Visit branching chains # Visit branching chains
leaves.each do |l| leaves.each do |l|
...@@ -139,9 +140,10 @@ module Gitlab ...@@ -139,9 +140,10 @@ module Gitlab
reserved += @_reserved[day] reserved += @_reserved[day]
end end
space = base_space(leaves, map) space = base_space(leaves, map)
while reserved.include? space do while (reserved.include? space) || (space == @space) do
space += 1 space += 1
end end
space space
end end
......
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
if (c.space == this.commits[i].space) { if (c.space == this.commits[i].space) {
r.path([ r.path([
"M", x, y, "M", x, y,
"L", x - 20 * (c.time + 1), y "L", cx, cy
]).attr({ ]).attr({
stroke: this.colors[c.space], stroke: this.colors[c.space],
"stroke-width": 2 "stroke-width": 2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment