Merge pull request #31 from gernophil/master

added option to use geom_text instead of geom_label
erblast · Dec 7, 2023 · 0993abb · 0993abb
2 parents 34d419a + 6f1c755
commit 0993abb
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 5 deletions.
diff --git a/R/alluvial_long.R b/R/alluvial_long.R
@@ -33,6 +33,7 @@
 #'  Default:RColorBrewer::brewer.pal(9, 'Greys')[c(3,6,4,7,5)]
 #'@param verbose logical, print plot summary, Default: F
 #'@param stratum_labels logical, Default: TRUE
+#'@param stratum_label_type character, Default: "label"
 #'@param stratum_label_size numeric, Default: 4.5
 #'@param stratum_width double, Default: 1/4
 #'@param auto_rotate_xlabs logical, Default: TRUE
@@ -116,6 +117,7 @@ alluvial_long = function( data
                           , col_vector_value =  RColorBrewer::brewer.pal(9, 'Greys')[c(3,6,4,7,5)]
                           , verbose = F
                           , stratum_labels = T
+                          , stratum_label_type = "label"
                           , stratum_label_size = 4.5
                           , stratum_width = 1/4
                           , auto_rotate_xlabs = T
@@ -435,8 +437,13 @@ alluvial_long = function( data
     labs( x = '', y = 'count', caption = caption)
 
   if(stratum_labels){
-    p = p + geom_label( stat = ggalluvial::StatStratum
-                        , size = stratum_label_size )
+    if(stratum_label_type == "label"){
+        p = p + geom_label( stat = ggalluvial::StatStratum
+                            , size = stratum_label_size )
+    } else if (stratum_label_type == "text"){
+        p = p + geom_text( stat = ggalluvial::StatStratum
+                            , size = stratum_label_size )
+    }
   }
 
 

diff --git a/R/alluvial_wide.R b/R/alluvial_wide.R
@@ -38,6 +38,7 @@ if(getRversion() >= "2.15.1"){
 #'  fill variable stratum, Default: TRUE
 #'@param verbose logical, print plot summary, Default: F
 #'@param stratum_labels logical, Default: TRUE
+#'@param stratum_label_type character, Default: "label"
 #'@param stratum_label_size numeric, Default: 4.5
 #'@param stratum_width double, Default: 1/4
 #'@param auto_rotate_xlabs logical, Default: TRUE
@@ -98,6 +99,7 @@ alluvial_wide = function( data
                             , colorful_fill_variable_stratum = T
                             , verbose = F
                             , stratum_labels = T
+                            , stratum_label_type = "label"
                             , stratum_label_size = 4.5
                             , stratum_width = 1/4
                             , auto_rotate_xlabs = T
@@ -367,8 +369,13 @@ alluvial_wide = function( data
     labs( x = '', y = 'count', caption = caption)
 
   if(stratum_labels){
-    p = p + geom_label( stat = ggalluvial::StatStratum
-                        , size = stratum_label_size )
+    if(stratum_label_type == "label"){
+        p = p + geom_label( stat = ggalluvial::StatStratum
+                            , size = stratum_label_size )
+    } else if (stratum_label_type == "text"){
+        p = p + geom_text( stat = ggalluvial::StatStratum
+                            , size = stratum_label_size )
+    }
   }
 
   # angle x labels------------------------------------

diff --git a/inst/logo/logo.R b/inst/logo/logo.R
@@ -32,6 +32,7 @@ p = alluvial_long(monthly_flights, key = qu, value =  mean_arr_delay, fill = car
      , col_vector_flow = col
      , col_vector_value = c('#666633', '#999966')
      , stratum_labels = F
+     , stratum_label_type = "label"
      , stratum_width = 1/4 ) +
   labs( caption = '') +
   theme_minimal() +

diff --git a/man/alluvial_long.Rd b/man/alluvial_long.Rd
diff --git a/man/alluvial_wide.Rd b/man/alluvial_wide.Rd
diff --git a/tests/testthat/test_alluvial_long.R b/tests/testthat/test_alluvial_long.R
@@ -77,7 +77,7 @@ test_that('alluvial_long'
   # check stratum options
 
   p = alluvial_long( data, key = qu, value = mean_arr_delay, id = tailnum, fill = carrier
-                     , stratum_labels = FALSE, stratum_width = 1/20)
+                     , stratum_labels = FALSE, stratum_label_type = "none", stratum_width = 1/20)
 
   # comes up as false positive try again with next vdiffr version
   #expect_doppelganger('long_strat_width', p)

diff --git a/tests/testthat/test_alluvial_wide.R b/tests/testthat/test_alluvial_wide.R
@@ -94,6 +94,7 @@ test_that('alluvial_wide'
                        , max_variables = max_variables
                        , fill_by = 'first_variable'
                        , stratum_labels = F
+                       , stratum_label_type = "none"
                        , stratum_width = 1/20 )
 
     #vdiffr detects difference when rendered with different OS