Merge pull request #152 from uclahs-cds/hwinata-dendrogram-add-spread

Use `spread` in dendrogram mode
uclahs-cds · Oct 14, 2024 · 0800654 · 0800654
2 parents 2742a44 + 41bd1a3
commit 0800654
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/NEWS.md b/NEWS.md
@@ -20,6 +20,9 @@
 * Set default parameters for heatmaps, defaulting to BPG defaults unless necessary
 * Improved default node style
 
+## Bug
+* Resolved issue where the spread parameter was not applied in dendrogram mode.
+
 # CancerEvolutionVisualization 2.0.1 (2023-11-17)
 
 ## Added

diff --git a/R/angles.R b/R/angles.R
@@ -131,7 +131,8 @@ split.equal.x.dist <- function(
         angle <- angles[tree$tip == child.id];
         if (is.na(angle)) {
             y <- tree$length[tree$tip == child.id];
-            angle <- atan((current.pos * dx.scale) / y);
+            pair.spread <- v$spread[v$id %in% child.ids[c(i - 1, i)]];
+            angle <- atan((current.pos * dx.scale * mean(pair.spread)) / y);
             angles[tree$tip == child.id] <- angle;
             }
         idx <- idx + n.leaves;