Skip to content
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.

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

Change DAG layout technique #648

Merged
merged 4 commits into from
Jan 18, 2017
Merged

Change DAG layout technique #648

merged 4 commits into from
Jan 18, 2017

Conversation

laerreal
Copy link
Contributor

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>
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>
Signed-off-by: Efimov Vasily <real@ispras.ru>
Signed-off-by: Efimov Vasily <real@ispras.ru>
@davvid
Copy link
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
davvid added a commit that referenced this pull request Jan 18, 2017
* 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.
"""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the detailed comment, much appreciated!

davvid added a commit that referenced this pull request Jan 18, 2017
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants