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

Support ignoring branch lengths during layout; update tree properties panel UI; some minor clade collapsing changes #363

Merged
merged 14 commits into from
Sep 2, 2020

Conversation

fedarko
Copy link
Collaborator

@fedarko fedarko commented Sep 1, 2020

Closes #271. Also wound up closing #321 (ran into it along the way).

ignoooore

The main challenge here was making sure that updating the "ignore lengths?" setting didn't mess with the tree state. This mostly wasn't a problem, but I had to mess around some with how clade collapsing works (since as far as I can tell the previous clade collapsing stuff assumed that clades computed for a given layout could be cached; but here the same layout can have multiple ways of collapsing since the node coordinates vary based on the ignore lengths setting). I believe this works as it should now, but I'm not very familiar with this part of this code.

Other thing we should discuss -- the UI says that "the root node's length is always ignored", but it looks like the unrooted layout uses the root node's length at one point. Since we don't require that the root node has a valid or even specified length, we should discuss this to see what to do.

Thanks!

@emperor-helper
Copy link

The following artifacts were built for this PR: empire-biplot.qzv, empire.qzv, empress-tree.qzv

Copy link
Member

@ElDeveloper ElDeveloper left a comment

Choose a reason for hiding this comment

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

This is awesome! That long branch is no longer misguiding the visual space of plot, pretty cool! Just two minor comments.

empress/support_files/templates/side-panel.html Outdated Show resolved Hide resolved
empress/support_files/js/bp-tree.js Show resolved Hide resolved
Copy link
Collaborator

@kwcantrell kwcantrell left a comment

Choose a reason for hiding this comment

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

Thanks @fedarko this looks nice! I just have one minor comment.

empress/support_files/js/empress.js Show resolved Hide resolved
@ElDeveloper
Copy link
Member

Thanks both!

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.

Support ignoring branch lengths during layout
4 participants