add parameter to control spacing between scalebars

uclahs-cds · Oct 30, 2024 · 52dbd68 · 52dbd68
1 parent 41ce8c9
commit 52dbd68
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/R/SRCGrob.R b/R/SRCGrob.R
@@ -31,7 +31,8 @@ SRCGrob <- function(
     scale.bar = FALSE,
     scale.bar.coords = c(0.5, 1),
     scale.size.1 = NA,
-    scale.size.2 = NA
+    scale.size.2 = NA,
+    scale.padding = 1
     ) {
 
     add.node.text <- !is.null(node.text);
@@ -118,7 +119,8 @@ SRCGrob <- function(
         scale.bar = scale.bar,
         scale.bar.coords = scale.bar.coords,
         scale.size.1 = scale.size.1,
-        scale.size.2 = scale.size.2
+        scale.size.2 = scale.size.2,
+        scale.padding = scale.padding
         );
 
     out.tree <- gTree(

diff --git a/R/make.clone.tree.grobs.R b/R/make.clone.tree.grobs.R
@@ -41,6 +41,7 @@ make.clone.tree.grobs <- function(
     scale.bar.coords,
     scale.size.1,
     scale.size.2,
+    scale.padding,
     ...
     ) {
 
@@ -173,7 +174,8 @@ make.clone.tree.grobs <- function(
             scale.length = scale.lengths,
             main.cex = axis.label.cex$y,
             label.cex = axis.cex$y,
-            pos = scale.bar.coords
+            pos = scale.bar.coords,
+            padding = scale.padding
             );
         }
 

diff --git a/R/scale.bar.R b/R/scale.bar.R
@@ -30,6 +30,7 @@ add.scale.bar <- function(
     yaxis1.label,
     yaxis2.label,
     pos,
+    padding,
     ...
     ) {
 
@@ -68,7 +69,7 @@ add.scale.bar <- function(
             edge.width = most.common.value(clone.out$v$edge.width.2),
             edge.type = most.common.value(clone.out$v$edge.type.2),
             left.x = pos[1],
-            top.y = pos[2] + 0.1,
+            top.y = pos[2] + (padding / 10),
             ...
             );
         clone.out$grobs <- c(
@@ -153,7 +154,7 @@ create.scale.bar <- function(
     tick.labels <- textGrob(
         label = c(0, scale.length$label),
         x = xat,
-        y = vp.y - tick.length * 2,
+        y = vp.y - tick.length * 2.5,
         gp = gpar(
             cex = label.cex
             )