Change DAG layout technique #648

Merged
merged 4 commits into from Jan 18, 2017

Conversation

Projects
None yet
2 participants
@laerreal
Contributor

laerreal commented Jan 17, 2017

Current commit layout algorithm returns bad looking graph in several
sophisticated configurations. Defects could be found near commits

a049169
2462221

of Git Cola graph. The ambiguous edge overlapping may confuse a user.

The new algorithm is free of this defects. No other defects were found in
Git Cola graph too. While overall appearance still could be improved there
are no confusing configuration noticed.

The layout technique description is presented by comments in the code.

laerreal added some commits Jan 17, 2017

dag: add 'column' field to Commit
Signed-off-by: Efimov Vasily <real@ispras.ru>
dag: change commit nodes layout algorithm
Current commit layout algorithm returns bad looking graph in several
sophisticated configurations. Defects could be found near commits

a049169
2462221

of Git Cola graph. The ambiguous edge overlapping may confuse a user.

The new algorithm is free of this defects. No other defects were found in
Git Cola graph too. While overall appearance still could be improved there
are no confusing configuration noticed.

The layout technique description is presented by comments in the code.

Signed-off-by: Efimov Vasily <real@ispras.ru>
dag: remove useless 'nodes' argument of 'position_nodes' method
Signed-off-by: Efimov Vasily <real@ispras.ru>
dag: remove useless 'nodes' argument of 'layout_commits' method
Signed-off-by: Efimov Vasily <real@ispras.ru>
@davvid

This comment has been minimized.

Show comment
Hide comment
@davvid

davvid Jan 18, 2017

Member

This sounds like a great idea. I was vaguely aware that there were some configurations that could lead to issues, but didn't have a chance to look into it. I'll test this and get it merged in time for the next release. cheers!

Member

davvid commented Jan 18, 2017

This sounds like a great idea. I was vaguely aware that there were some configurations that could lead to issues, but didn't have a chance to look into it. I'll test this and get it merged in time for the next release. cheers!

@davvid davvid merged commit c52e723 into git-cola:master Jan 18, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

davvid added a commit that referenced this pull request Jan 18, 2017

Merge pull request #648 from laerreal/new_layout
* laerreal/new_layout:
  dag: remove useless 'nodes' argument of 'layout_commits' method
  dag: remove useless 'nodes' argument of 'position_nodes' method
  dag: change commit nodes layout algorithm
  dag: add 'column' field to Commit

Signed-off-by: David Aguilar <davvid@gmail.com>
+
+ After the algorithm was done all commit graphic items are assigned
+coordinates based on its row and column multiplied by the coefficient.
+ """

This comment has been minimized.

@davvid

davvid Jan 18, 2017

Member

Thanks for the detailed comment, much appreciated!

@davvid

davvid Jan 18, 2017

Member

Thanks for the detailed comment, much appreciated!

davvid added a commit that referenced this pull request Jan 18, 2017

doc: update v2.11 release notes draft
Related-to: #648
Signed-off-by: David Aguilar <davvid@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment