diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION deleted file mode 100644 index 3ee57a2..0000000 --- a/CRAN-SUBMISSION +++ /dev/null @@ -1,3 +0,0 @@ -Version: 1.1.0 -Date: 2023-04-10 12:37:28 UTC -SHA: 7ce849e22ca493e334be349f3c81c7fb8b3acd02 diff --git a/DESCRIPTION b/DESCRIPTION index efea296..30ba8d9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: forestploter Title: Create Flexible Forest Plot -Version: 1.1.1 +Version: 1.1.2 Authors@R: person(given="Alimu", family = "Dayimu", email = "ad938@cam.ac.uk", diff --git a/NEWS.md b/NEWS.md index 50e3ee4..c067a18 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# forestploter 1.1.2 + +* Draw reference line and other vertical lines under whiskers. + # forestploter 1.1.1 * Improved `ticks_digits` auto calculation. diff --git a/R/forest.R b/R/forest.R index 6ad8daf..2518c76 100644 --- a/R/forest.R +++ b/R/forest.R @@ -483,6 +483,8 @@ forest <- function(data, t = 2, l = j, b = tot_row, r = j, + # Make sure reference line is below the whisker + z = max(gt$layout$z[grepl("core-", gt$layout$name)]), clip = "off", name = paste0("ref.line-", j)) @@ -504,6 +506,7 @@ forest <- function(data, t = 2, l = j, b = tot_row, r = j, + z = max(gt$layout$z[grepl("core-", gt$layout$name)]), clip = "off", name = paste0("vert.line-", j)) diff --git a/cran-comments.md b/cran-comments.md index a869f25..5c0edc7 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -11,4 +11,4 @@ There were no ERRORs or WARNINGs. --- -This version includes 1 bug fix and 6 improvement. +This version includes 1 bug fix improvement. diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf index d4a3f32..f0fc511 100644 Binary files a/tests/testthat/Rplots.pdf and b/tests/testthat/Rplots.pdf differ diff --git a/tests/testthat/_snaps/addgrob/add-grob-body.svg b/tests/testthat/_snaps/addgrob/add-grob-body.svg index db0db17..dfaa3c0 100644 --- a/tests/testthat/_snaps/addgrob/add-grob-body.svg +++ b/tests/testthat/_snaps/addgrob/add-grob-body.svg @@ -288,6 +288,7 @@ - + + + @@ -304,7 +305,6 @@ - diff --git a/tests/testthat/_snaps/addgrob/add-grob-header.svg b/tests/testthat/_snaps/addgrob/add-grob-header.svg index 5a8f00e..549e7c3 100644 --- a/tests/testthat/_snaps/addgrob/add-grob-header.svg +++ b/tests/testthat/_snaps/addgrob/add-grob-header.svg @@ -287,6 +287,7 @@ - + + + @@ -303,7 +304,6 @@ - diff --git a/tests/testthat/_snaps/forest/arrow-end.svg b/tests/testthat/_snaps/forest/arrow-end.svg index 11af438..037ecf4 100644 --- a/tests/testthat/_snaps/forest/arrow-end.svg +++ b/tests/testthat/_snaps/forest/arrow-end.svg @@ -119,6 +119,7 @@ 1.47 (0.45 to 2.48) 1.19 (0.49 to 1.88) 1.63 (0.02 to 3.25) + @@ -133,7 +134,6 @@ - diff --git a/tests/testthat/_snaps/forest/arrow-start.svg b/tests/testthat/_snaps/forest/arrow-start.svg index 658ce87..8253a19 100644 --- a/tests/testthat/_snaps/forest/arrow-start.svg +++ b/tests/testthat/_snaps/forest/arrow-start.svg @@ -119,6 +119,7 @@ 1.47 (0.45 to 2.48) 1.19 (0.49 to 1.88) 1.63 (0.02 to 3.25) + @@ -133,7 +134,6 @@ - diff --git a/tests/testthat/_snaps/forest/different-sizes.svg b/tests/testthat/_snaps/forest/different-sizes.svg index ca32131..b2b348f 100644 --- a/tests/testthat/_snaps/forest/different-sizes.svg +++ b/tests/testthat/_snaps/forest/different-sizes.svg @@ -144,6 +144,7 @@ NA (NA to NA) 1.19 (0.49 to 1.88) 1.63 (0.02 to 3.25) + @@ -158,7 +159,6 @@ - diff --git a/tests/testthat/_snaps/forest/edit-plot-with-theme.svg b/tests/testthat/_snaps/forest/edit-plot-with-theme.svg index b467bd2..1ae85c9 100644 --- a/tests/testthat/_snaps/forest/edit-plot-with-theme.svg +++ b/tests/testthat/_snaps/forest/edit-plot-with-theme.svg @@ -210,6 +210,7 @@ 1.66 (0.29 to 3.02) 2.54 (0.89 to 4.20) 1.11 (0.04 to 2.19) + @@ -267,7 +268,6 @@ This is only a demo - diff --git a/tests/testthat/_snaps/forest/insert-text-vector.svg b/tests/testthat/_snaps/forest/insert-text-vector.svg index 846b7d1..f9dd0f2 100644 --- a/tests/testthat/_snaps/forest/insert-text-vector.svg +++ b/tests/testthat/_snaps/forest/insert-text-vector.svg @@ -210,6 +210,7 @@ 1.66 (0.29 to 3.02) 2.54 (0.89 to 4.20) 1.11 (0.04 to 2.19) + @@ -267,7 +268,6 @@ This is only a demo - diff --git a/tests/testthat/_snaps/forest/multiple-columns-and-multi-parameters.svg b/tests/testthat/_snaps/forest/multiple-columns-and-multi-parameters.svg index 9495bd8..57d2fdb 100644 --- a/tests/testthat/_snaps/forest/multiple-columns-and-multi-parameters.svg +++ b/tests/testthat/_snaps/forest/multiple-columns-and-multi-parameters.svg @@ -216,6 +216,12 @@ + + + + + + @@ -435,7 +441,6 @@ - @@ -446,15 +451,12 @@ 1.0 2.5 OR - - L1 R1 - @@ -465,8 +467,6 @@ 1.5 2 Beta - - L2 diff --git a/tests/testthat/_snaps/forest/multiple-columns.svg b/tests/testthat/_snaps/forest/multiple-columns.svg index 7234a96..68587eb 100644 --- a/tests/testthat/_snaps/forest/multiple-columns.svg +++ b/tests/testthat/_snaps/forest/multiple-columns.svg @@ -216,6 +216,8 @@ + + @@ -440,7 +442,6 @@ - @@ -458,7 +459,6 @@ Treatment Better - diff --git a/tests/testthat/_snaps/forest/multiple-groups.svg b/tests/testthat/_snaps/forest/multiple-groups.svg index 937c17d..9e0eb7e 100644 --- a/tests/testthat/_snaps/forest/multiple-groups.svg +++ b/tests/testthat/_snaps/forest/multiple-groups.svg @@ -58,6 +58,7 @@ + @@ -101,7 +102,6 @@ - diff --git a/tests/testthat/_snaps/forest/simple-forest-plot-with-theme.svg b/tests/testthat/_snaps/forest/simple-forest-plot-with-theme.svg index c0d52c7..db20a6f 100644 --- a/tests/testthat/_snaps/forest/simple-forest-plot-with-theme.svg +++ b/tests/testthat/_snaps/forest/simple-forest-plot-with-theme.svg @@ -210,6 +210,7 @@ 1.66 (0.29 to 3.02) 2.54 (0.89 to 4.20) 1.11 (0.04 to 2.19) + @@ -267,7 +268,6 @@ This is only a demo - diff --git a/tests/testthat/_snaps/forest/simple-forest-plot.svg b/tests/testthat/_snaps/forest/simple-forest-plot.svg index e8f1ea2..4794ee8 100644 --- a/tests/testthat/_snaps/forest/simple-forest-plot.svg +++ b/tests/testthat/_snaps/forest/simple-forest-plot.svg @@ -210,6 +210,7 @@ 1.66 (0.29 to 3.02) 2.54 (0.89 to 4.20) 1.11 (0.04 to 2.19) + @@ -238,7 +239,6 @@ - diff --git a/tests/testthat/_snaps/forest/summary-ci.svg b/tests/testthat/_snaps/forest/summary-ci.svg index 404c313..4126367 100644 --- a/tests/testthat/_snaps/forest/summary-ci.svg +++ b/tests/testthat/_snaps/forest/summary-ci.svg @@ -210,6 +210,7 @@ 2.54 (0.89 to 4.20) 1.11 (0.04 to 2.19) 1.87 (0.13 to 3.61) + @@ -265,7 +266,6 @@ This is the demo data. Please feel free to change anything you want. - diff --git a/tests/testthat/_snaps/forest/x-scale-log10.svg b/tests/testthat/_snaps/forest/x-scale-log10.svg index cdde68b..9793afb 100644 --- a/tests/testthat/_snaps/forest/x-scale-log10.svg +++ b/tests/testthat/_snaps/forest/x-scale-log10.svg @@ -119,6 +119,8 @@ 1.47 (0.45 to 5.00) 1.19 (0.50 to 20.00) 1.63 (0.02 to 9.74) + + @@ -135,7 +137,6 @@ - @@ -149,6 +150,5 @@ 5 15 20 - diff --git a/tests/testthat/_snaps/forest/x-scale-log2.svg b/tests/testthat/_snaps/forest/x-scale-log2.svg index 57c2199..b60118b 100644 --- a/tests/testthat/_snaps/forest/x-scale-log2.svg +++ b/tests/testthat/_snaps/forest/x-scale-log2.svg @@ -119,6 +119,8 @@ 1.47 (0.45 to 2.00) 1.19 (0.25 to 8.00) 1.63 (0.02 to 9.74) + + @@ -133,7 +135,6 @@ - @@ -147,6 +148,5 @@ 2 6 8 - diff --git a/tests/testthat/_snaps/make-boxplot/boxplot-groups.svg b/tests/testthat/_snaps/make-boxplot/boxplot-groups.svg index d075551..a5e8999 100644 --- a/tests/testthat/_snaps/make-boxplot/boxplot-groups.svg +++ b/tests/testthat/_snaps/make-boxplot/boxplot-groups.svg @@ -34,6 +34,7 @@ + @@ -109,7 +110,6 @@ - diff --git a/tests/testthat/_snaps/make-boxplot/boxplot-single.svg b/tests/testthat/_snaps/make-boxplot/boxplot-single.svg index 543d350..16da462 100644 --- a/tests/testthat/_snaps/make-boxplot/boxplot-single.svg +++ b/tests/testthat/_snaps/make-boxplot/boxplot-single.svg @@ -46,6 +46,7 @@ + @@ -130,7 +131,6 @@ -