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

Dendrogram mode #119

Merged
merged 68 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
74f34b8
Refactor tree segment functions
dan-knight Jan 19, 2024
13dbef6
Utility function for calculating tree segment coordinates
dan-knight Jan 19, 2024
7f19cf1
Refactor tree segment offset calculation
dan-knight Jan 19, 2024
f702816
Refactor segment grob creation
dan-knight Jan 19, 2024
3a1f070
Radial segment coord calculation
dan-knight Jan 20, 2024
8cda1ac
Dendrogram segment coord calculation
dan-knight Jan 20, 2024
fcada73
Dendrogram node positioning
dan-knight Jan 30, 2024
d3bdeb6
Disable node repositioning
dan-knight Jan 30, 2024
ef739b7
Utilities for handling points along a line
dan-knight Feb 6, 2024
42af8ac
Unit tests for point data utilities
dan-knight Feb 6, 2024
c887b97
Support dendrogram mode column in tree input
dan-knight Feb 6, 2024
b08d961
Extra connector line segments in dendrogram mode
dan-knight Feb 7, 2024
5ef3ff8
Rename variables for clarity
dan-knight Feb 7, 2024
d085ab7
Use full words for dendrogram mode
dan-knight Feb 21, 2024
d449259
Fix code style
dan-knight Feb 22, 2024
ac59093
Update changelog
dan-knight Feb 22, 2024
f4515f2
Fix dendrogram bugs with multiple segments
dan-knight Feb 29, 2024
d0be77b
Refactor segment grob creation
dan-knight Mar 1, 2024
09b3c0a
Filter dendrogram layers for connector segments
dan-knight Mar 1, 2024
67819cb
Dendrogram connector segment style parameters
dan-knight Mar 2, 2024
af179b5
Fix code style
dan-knight Apr 24, 2024
85f47ea
Utility functions for errors and warnings in tree prep
dan-knight Jun 14, 2024
1d47bbc
Fix bug in when finding edge type columns
dan-knight Jun 21, 2024
ae653fb
Utility function to prepare and validate column values with defaults
dan-knight Jun 22, 2024
ad136aa
Find all branch/edge name columns
dan-knight Jun 26, 2024
dcc4eb2
Use generic prep functions in prep.tree
dan-knight Jun 27, 2024
d0626fe
Handle second branch/edge in tree prep
dan-knight Jul 2, 2024
093177d
Prep default connector edge columns
dan-knight Jul 10, 2024
9eec98c
Checks for dendrogram x column conflicts
dan-knight Jul 11, 2024
bcef5cb
Unit tests for dendrogram column conflict checks
dan-knight Jul 11, 2024
dd592c7
Fix bugs in unit and regression/end-to-end tests
dan-knight Jul 11, 2024
23190d1
Fix bugs in column prep
dan-knight Jul 11, 2024
32b2231
Fix bug in dendrogram connector styling
dan-knight Jul 11, 2024
f1d8337
Fix bug in finding branch length colnames
dan-knight Jul 18, 2024
ccc59f4
Merge branch 'danknight-circular-angles' of github.com:uclahs-cds/pub…
whelena Jul 18, 2024
5ad5a7b
Specify dendrogram x.length
dan-knight Jul 19, 2024
96a3a7c
Merge branch 'main' of github.com:uclahs-cds/package-CancerEvolutionV…
dan-knight Jul 19, 2024
eb119f3
Merge branch 'dendrogram' of github.com:uclahs-cds/public-R-CancerEvo…
whelena Jul 23, 2024
90afed7
add some notes
whelena Jul 24, 2024
cf429d6
modify angle assignment for dendrogram mode
whelena Jul 25, 2024
c966207
add check to make sure all children are given the same parent
whelena Jul 25, 2024
2933a2b
option 2 of assigning dendrogram angles
whelena Jul 25, 2024
77162d7
refactor calculate.angles.radial to handle different modes
whelena Jul 26, 2024
cd12ddd
fix dendrogram dx calculation
whelena Jul 26, 2024
48fed2f
fix refatoring to use with full radial and full dend mode
whelena Jul 26, 2024
02ca32c
remove print and allow spread to modify x dist between nodes
whelena Jul 27, 2024
47f28f3
update NEWS and test + fix lintr
whelena Jul 27, 2024
09517cb
Merge branch 'main' of github.com:uclahs-cds/public-R-CancerEvolution…
whelena Aug 1, 2024
658240d
Fix bug in radial angle calculation
dan-knight Aug 6, 2024
d163f9f
Refactor adply implementation
dan-knight Aug 7, 2024
cb5cbcf
Fix code style
dan-knight Aug 7, 2024
6950f1c
Update function imports from base R
dan-knight Aug 7, 2024
5161148
Fix typo
dan-knight Aug 7, 2024
268d865
Fix bug when creating tree segments
dan-knight Aug 7, 2024
e768364
Handle types when calculating seg coords
dan-knight Aug 7, 2024
5b013a5
Dendrogram regression/E2E test case
dan-knight Aug 8, 2024
97e8944
Merge branch 'dendrogram' into hwinata-test-dendrogram
dan-knight Aug 8, 2024
5560b18
Refactor equal X-dist
dan-knight Aug 14, 2024
ceb4bed
Update dendrogram regression test
dan-knight Aug 14, 2024
5300cc0
Revert "Refactor equal X-dist"
whelena Aug 15, 2024
6ec021e
save reverted version with edits
whelena Aug 28, 2024
82d349e
edit dendrogram expected test result
whelena Aug 28, 2024
bcd41a7
Merge pull request #134 from uclahs-cds/hwinata-test-dendrogram
whelena Aug 28, 2024
adf1920
Merge branch 'main' of github.com:uclahs-cds/public-R-CancerEvolution…
whelena Aug 28, 2024
3052eaf
update version to 3.0.0
whelena Aug 28, 2024
8ef06ed
prep.draw.code to avoid error when draw.node column is not in input d…
whelena Aug 28, 2024
0189ea1
Update changelog
dan-knight Aug 28, 2024
ba1467b
minor typo fix
whelena Aug 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: CancerEvolutionVisualization
Title: Publication Quality Phylogenetic Tree Plots
Version: 2.1.0
Date: 2024-08-05
Version: 3.0.0
Date: 2024-08-28
Authors@R: c(
person("Paul Boutros", role = "cre", email = "[email protected]"),
person("Adriana Salcedo", role = "aut"),
Expand Down
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import(BoutrosLab.plotting.general)
importFrom("graphics", "par", "strheight", "strwidth")
importFrom("grDevices", "dev.list", "rainbow")
importFrom("utils", "read.table", "vi", "head")
importFrom("stats", "setNames", "aggregate", "reshape")
importFrom("stats", "median", "setNames", "aggregate", "reshape")
importFrom("grDevices", "col2rgb")

export(SRCGrob)
Expand Down
13 changes: 7 additions & 6 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
# CancerEvolutionVisualization 2.1.0 (2024-08-05)
# CancerEvolutionVisualization 3.0.0 (2024-08-28)

## Added
* Dendrogram mode
* Optional "spread" column to control node/branch spacing
* Plotting functions to visualize the distribution of clones across the genome.
* Documentation for heatmaps and clone-genome distirbution plor
* Option to disable node drawing with node-by-node control
* Documentation for heatmaps and clone-genome distribution plot
* Option to disable node drawing with node-by-node control

## Update
* Fixed angle calculation bug where child angles do not follow
their parent angle, instead moving "downward" at 0 degrees.
* Updated package metadata and README
* Split angle handling for `radial` and `dendrogram` modes to optimized each
* Set default parameters for heatmaps, defaulting too BPG defaults unless necessary
* Updated changelog format to NEWS.md Markdown format
* Refactored use of plyr/dplyr and stringr functions to remove dependencies

* Set default parameters for heatmaps, defaulting to BPG defaults unless necessary

# CancerEvolutionVisualization 2.0.1 (2023-11-17)

Expand Down Expand Up @@ -207,5 +209,4 @@
# CancerEvolutionVisualization 0.0.0 (2021-09-13)

INITIAL FEATURES

- Tree, CNA, and SNV input sampling
* Tree, CNA, and SNV input sampling
2 changes: 1 addition & 1 deletion R/add.nodes.R
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ add.normal <- function(clone.out, node.radius, label.cex, normal.cex = 1) {
'N',
x = unit(0.5, 'npc'),
y = unit(0.5, 'npc'),
name = 'ormal.label',
name = 'normal.label',
just = 'center',
gp = gpar(
col = 'black',
Expand Down
Loading
Loading