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

Add annotation functions for unrooted tree layouts and other fixes. #152

Merged
merged 7 commits into from
Sep 12, 2017

Conversation

JustGitting
Copy link
Contributor

Hi,

I've added/modified the annotation functions to annotate the clades of the unrooted tree layouts. I've also fixed the labels for unrooted trees so they are easier to read.

Cheers,
JG

JustGitting and others added 7 commits April 20, 2017 14:22
Add updates from GCY ggtree.
PR from Guang Chuang Yu repo.
… unrooted trees.

Fixed layoutDaylight ave_change calculation.

Fixed bug in getTreeArcAngles() for cases where the branch root node and origin node are the same.

Added getNodeEuclDistances() function.

Fixed isTip() function to check if nodes has children, instead of checking of the data variable had the isTip field set.
Merge branch 'master' of https://github.com/JustGitting/ggtree

# Conflicts:
#	R/geom_cladelabel.R
#	R/tidytree.R
Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	R/geom_cladelabel.R
#	R/geom_hilight.R
@GuangchuangYu GuangchuangYu merged commit f4f64c2 into YuLab-SMU:master Sep 12, 2017
@GuangchuangYu
Copy link
Member

GuangchuangYu pushed a commit that referenced this pull request Sep 12, 2017
@GuangchuangYu
Copy link
Member

FYI: I have fixed the R check 9653250.

BTW: You can add your name in author list https://github.com/GuangchuangYu/ggtree/blob/master/DESCRIPTION#L6-L10.

@JustGitting
Copy link
Contributor Author

Can you explain why you change the parameter at https://github.com/GuangchuangYu/ggtree/pull/152/files#diff-b67b4c9e48f0ba337b73d00861518a6fR41?

If you mean this function:

getMRCA.df_internal <- function(data, tip1, tip2)
to
getMRCA.df_internal <- function(data, tip, anc) {

I only changed the parameter names that made it clearer what the parameters meant. My understand was that "tip" is a tree tip and "anc" is the tips ancester. I felt it was a bit better than tip1 and tip2... but I could be wrong, please change back if you need to.

@GuangchuangYu
Copy link
Member

I change them to node1 & node2, see 07063f9.

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.

2 participants