Calculate arrows in a smarter way

Author: initialcommit-io

git_story/git_story.py

@@ -140,35 +140,37 @@ def parseCommits(self, commit, i, prevCircle, toFadeOut):
             isNewCommit = commit.hexsha not in self.drawnCommits
 
             if ( not self.args.reverse ):
-                if ( not offset and isNewCommit ):
-                    arrow = Arrow(start=RIGHT, end=LEFT, color=self.fontColor).next_to(circle, LEFT, buff=0)
-                    length = 1
-                elif ( offset and isNewCommit ):
-                    arrow = Arrow(end=prevCircle.get_center(), start=circle.get_center(), color=self.fontColor)
-                    length = numpy.linalg.norm(circle.get_center()-prevCircle.get_center())-3
-                elif ( offset and not isNewCommit ):
-                    arrow = Arrow(end=prevCircle.get_center(), start=self.drawnCommits[commit.hexsha].get_center(), color=self.fontColor)
-                    length = numpy.linalg.norm(self.drawnCommits[commit.hexsha].get_center()-prevCircle.get_center())-3
-                elif ( not offset and not isNewCommit ):
-                    arrow = Arrow(end=prevCircle.get_center(), start=self.drawnCommits[commit.hexsha].get_center(), color=self.fontColor)
-                    length = numpy.linalg.norm(self.drawnCommits[commit.hexsha].get_center()-prevCircle.get_center())-3
+                if ( isNewCommit ):
+                    start = circle.get_center()
+                    end = prevCircle.get_center() if prevCircle else LEFT
+                else:
+                    start = self.drawnCommits[commit.hexsha].get_center()
+                    end = prevCircle.get_center()
 
             else:
-                if ( not offset and isNewCommit ):
-                    arrow = Arrow(start=LEFT, end=RIGHT, color=self.fontColor).next_to(circle, LEFT, buff=0)
-                    length = 1
-                elif ( offset and isNewCommit ):
-                    arrow = Arrow(start=prevCircle.get_center(), end=circle.get_center(), color=self.fontColor)
-                    length = numpy.linalg.norm(prevCircle.get_center()-circle.get_center())-3
-                elif ( offset and not isNewCommit ):
-                    arrow = Arrow(start=prevCircle.get_center(), end=self.drawnCommits[commit.hexsha].get_center(), color=self.fontColor)
-                    length = numpy.linalg.norm(prevCircle.get_center()-self.drawnCommits[commit.hexsha].get_center())-3
-                elif ( not offset and not isNewCommit ):
-                    arrow = Arrow(start=prevCircle.get_center(), end=self.drawnCommits[commit.hexsha].get_center(), color=self.fontColor)
-                    length = numpy.linalg.norm(prevCircle.get_center()-self.drawnCommits[commit.hexsha].get_center())-3
-
+                if ( isNewCommit ):
+                    start = prevCircle.get_center() if prevCircle else LEFT
+                    end = circle.get_center()
+                else:
+                    start = prevCircle.get_center()
+                    end = self.drawnCommits[commit.hexsha].get_center()
+
+            arrow = Arrow(start, end, color=self.fontColor)
+            length = numpy.linalg.norm(start-end) - ( 1.5 if start[1] == end[1] else 3  )
             arrow.set_length(length)
 
+            angle = arrow.get_angle()
+            lineRect = Rectangle(height=0.1, width=length, color="#123456").move_to(arrow.get_center()).rotate(angle)
+
+            for commitCircle in self.drawnCommits.values():
+                inter = Intersection(lineRect, commitCircle)
+                if ( inter.has_points() ):
+                    arrow = CurvedArrow(start, end)
+                    if ( start[1] == end[1]  ):
+                        arrow.shift(UP*1.25)
+                    if ( start[0] < end[0] and start[1] == end[1] ):
+                        arrow.flip(RIGHT).shift(UP)
+                
             commitId = Text(commit.hexsha[0:6], font="Monospace", font_size=20, color=self.fontColor).next_to(circle, UP)
 
             commitMessage = commit.message[:40].replace("\n", " ")