Better vertical line exntension. #67

adayim · Sep 9, 2024 · 863b012 · 863b012
1 parent 670808f
commit 863b012
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 18 deletions.
diff --git a/R/forest.R b/R/forest.R
@@ -508,7 +508,8 @@ forest <- function(data,
                           vert_line(x = ref_line[idx],
                                     gp = theme$refline,
                                     xlim = xlim[[idx]],
-                                    x_trans = x_trans[idx]),
+                                    x_trans = x_trans[idx],
+                                    nrow = nrow(data)),
                           t = 2,
                           l = j,
                           b = tot_row, r = j,
@@ -531,7 +532,8 @@ forest <- function(data,
                             vert_line(x = vert_line[[idx]],
                                       gp = theme$vertline,
                                       xlim = xlim[[idx]],
-                                      x_trans = x_trans[idx]),
+                                      x_trans = x_trans[idx],
+                                      nrow = nrow(data)),
                             t = 2,
                             l = j,
                             b = tot_row, r = j,

diff --git a/R/helper.R b/R/helper.R
@@ -41,19 +41,22 @@ get_wh <- function(plot, unit = c("in", "cm", "mm")){
 
 
 # Add vertical line
-vert_line <- function(x, gp = grid::gpar(), xlim, x_trans = "none"){
+vert_line <- function(x, gp = grid::gpar(), xlim, x_trans = "none", nrow = 10){
 
   if(x_trans != "none")
     x <- xscale(x, scale = x_trans)
 
+  # Multiplyer
+  denom <- max(c(nrow, 10))
+
   out_indx <- x > max(xlim) | x < min(xlim)
   if(all(out_indx)){
     return(nullGrob())
   }else{
     segmentsGrob(x0 = unit(x[!out_indx],"native"),
                 x1 = unit(x[!out_indx],"native"),
-                y0 = unit(0,"npc"),
-                y1 = unit(1,"npc"),
+                y0 = unit(0,"npc") + unit(0.1,"npc")/denom,
+                y1 = unit(1,"npc") - unit(0.1,"npc")/denom,
                 gp = gp,
                 vp = viewport(xscale = xlim))
   }

diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf
diff --git a/tests/testthat/_snaps/forest/edit-plot-with-theme.svg b/tests/testthat/_snaps/forest/edit-plot-with-theme.svg
diff --git a/tests/testthat/_snaps/forest/insert-text-vector.svg b/tests/testthat/_snaps/forest/insert-text-vector.svg
diff --git a/tests/testthat/_snaps/forest/multiple-columns-and-multi-parameters.svg b/tests/testthat/_snaps/forest/multiple-columns-and-multi-parameters.svg
diff --git a/tests/testthat/_snaps/forest/multiple-columns.svg b/tests/testthat/_snaps/forest/multiple-columns.svg
diff --git a/tests/testthat/_snaps/forest/simple-forest-plot-with-theme.svg b/tests/testthat/_snaps/forest/simple-forest-plot-with-theme.svg
diff --git a/tests/testthat/_snaps/forest/simple-forest-plot.svg b/tests/testthat/_snaps/forest/simple-forest-plot.svg
diff --git a/tests/testthat/_snaps/forest/summary-ci.svg b/tests/testthat/_snaps/forest/summary-ci.svg