fixing stat_fill_labels and stat_stack_labels

to be compatible with last version of ggplot2

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: JLutils
 Type: Package
 Title: Collection of R functions
-Version: 1.10.1
-Date: 2016-08-24
+Version: 1.11.0
+Date: 2016-11-30
 Author: Joseph Larmarange <joseph@larmarange.net>
 Maintainer: Joseph Larmarange <joseph@larmarange.net>
 Description: A collection of diverse R functions who don't fit (yet?) in another
@@ -11,7 +11,7 @@ License: GPL (>= 3)
 URL: https://github.com/larmarange/JLutils
 Encoding: UTF-8
 Depends:
-    ggplot2,
+    ggplot2 (>= 2.2.0),
     plyr
 Suggests:
     TraMineR,

R/stat_fill_labels.R

@@ -69,10 +69,14 @@ StatFillLabels <- ggproto(
     plyr::ddply(
       data, "x", plyr::mutate,
       prop = count/sum(count),
-      cumprop = cumsum(count)/sum(count),
-      ylabel = (cumsum(count) - count / 2)/sum(count),
+      cumprop = .inv_cumsum(count)/sum(count),
+      ylabel = (.inv_cumsum(count) - count / 2)/sum(count),
       na.rm = TRUE
     )
   },
   default_aes = aes(y = ..ylabel.., label = paste0(round(100 * ..prop.., digits =1), "%"))
 )
+
+.inv_cumsum <- function(x) {
+  sum(x) - cumsum(x) +x
+}

R/stat_stack_labels.R

@@ -57,8 +57,8 @@ StatStackLabels <- ggproto(
     data <- do.call(plyr::rbind.fill, stats)
     plyr::ddply(
       data, "x", plyr::mutate,
-      cumcount = cumsum(count),
-      ylabel = cumsum(count) - count / 2,
+      cumcount = .inv_cumsum(count),
+      ylabel = .inv_cumsum(count) - count / 2,
       na.rm = TRUE
     )
   },