Version 0.95.19

dcousin3 · Oct 27, 2024 · e982611 · e982611
1 parent 18b40b2
commit e982611
Show file tree

Hide file tree

Showing 222 changed files with 5,472 additions and 150 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: superb
 Type: Package
 Title: Summary Plots with Adjusted Error Bars
-Version: 0.95.18
-Date: 2024-10-15
+Version: 0.95.19
+Date: 2024-10-30
 Authors@R: c(
              person("Denis", "Cousineau", email = "denis.cousineau@uottawa.ca",
                     role = c("aut", "cre")),
@@ -45,7 +45,7 @@ Depends:
 Imports: 
     foreign,
     plyr (>= 1.8.4),
-    ggplot2 (>= 3.1.0),
+    ggplot2 (>= 3.5.0),
     MASS,
     rrapply,
     lsr (>= 0.5),
@@ -70,6 +70,7 @@ Suggests:
     png,
     reshape2,
     rmarkdown,
+    RColorBrewer,
     sadists,
     scales,
     testthat,

diff --git a/NAMESPACE b/NAMESPACE
@@ -78,6 +78,11 @@ export(superbData)
 export(superbPlot)
 export(superbPlot.bar)
 export(superbPlot.boxplot)
+export(superbPlot.circularline)
+export(superbPlot.circularlineBand)
+export(superbPlot.circularpoint)
+export(superbPlot.circularpointjitter)
+export(superbPlot.circularpointlinejitter)
 export(superbPlot.corset)
 export(superbPlot.halfwidthline)
 export(superbPlot.line)
@@ -86,6 +91,7 @@ export(superbPlot.point)
 export(superbPlot.pointindividualline)
 export(superbPlot.pointjitter)
 export(superbPlot.pointjitterviolin)
+export(superbPlot.pointlinejitter)
 export(superbPlot.raincloud)
 export(superbShiny)
 export(superbToWide)

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# superb 0.95.19 (October 30th, 2024)
+
+* Remove deprecated arguments in ggplot2 >=3.5.0
+* Added circular layouts for radar plots with error bars
+* Cleaned a bit the documentation
+
 # superb 0.95.18 (October 15th, 2024)
 
 * Corrected a bug with ``geom_superberrorbar()``

diff --git a/R/functionsPlotting_advanced.R b/R/functionsPlotting_advanced.R
@@ -185,7 +185,7 @@ superbPlot.raincloud <- function(
 
     # depending on the scale of the x-axis.
     if (!xAsFactor) 
-        summarydata[[xfactor]] = as.numeric(summarydata[[xfactor]])
+        summarydata[[xfactor]] = unfactor(summarydata[[xfactor]])
 
     # rename column "DV" as "center"
     rawdata$center <- rawdata$DV
@@ -341,7 +341,7 @@ superbPlot.halfwidthline <- function(
 
     # depending on the scale of the x-axis.
     if (!xAsFactor) 
-        summarydata[[xfactor]] = as.numeric(summarydata[[xfactor]])
+        summarydata[[xfactor]] = unfactor(summarydata[[xfactor]])
 
     # let's do the plot!
     plot <- ggplot(

diff --git a/R/functionsPlotting_base.R b/R/functionsPlotting_base.R
@@ -73,7 +73,8 @@ superbPlot.bar <- function(
 
     # depending on the scale of the x-axis.
     if (!xAsFactor) 
-        summarydata[[xfactor]] = as.numeric(summarydata[[xfactor]])
+        summarydata[[xfactor]] <- unfactor(summarydata[[xfactor]])
+        #summarydata[[xfactor]] = as.numeric(summarydata[[xfactor]])
 
     # let's do the plot!
     plot <- ggplot(
@@ -182,7 +183,7 @@ superbPlot.line <- function(
 
     # depending on the scale of the x-axis.
     if (!xAsFactor) 
-        summarydata[[xfactor]] = as.numeric(summarydata[[xfactor]])
+        summarydata[[xfactor]] = unfactor(summarydata[[xfactor]])
 
     # let's do the plot!
     plot <- ggplot(
@@ -194,21 +195,18 @@ superbPlot.line <- function(
     # the points ...
     do.call(geom_point, modifyList(
         list(size = 3, position = position_dodge(width = .15), 
-            #mapping = aes_string(group = groupingfactor) ),
             mapping = aes(group = !!mysym(groupingfactor) ) ),
         pointParams
     )) +
     # ... and the lines connecting the points
     do.call(geom_line, modifyList(
         list(position = position_dodge(width = .15), 
-            #mapping = aes_string(group = ifelse(is.null(groupingfactor),1,groupingfactor) ) ),
             mapping = aes(group = !!mysym(ifelse(is.null(groupingfactor),1,groupingfactor)) ) ),
         lineParams
     )) +
     # the error bars
     do.call(geom_superberrorbar, modifyList(
         list(width = 0.1, linewidth = 0.75, position = position_dodge(.15),
-            #mapping = aes_string(group = groupingfactor) ),
             mapping = aes(group = !!mysym(groupingfactor)) ),
         errorbarParams
     )) + 
@@ -288,7 +286,7 @@ superbPlot.point <- function(
 
     # depending on the scale of the x-axis.
     if (!xAsFactor) 
-        summarydata[[xfactor]] = as.numeric(summarydata[[xfactor]])
+        summarydata[[xfactor]] = unfactor(summarydata[[xfactor]])
 
     # let's do the plot!
     plot <- ggplot(

diff --git a/R/functionsPlotting_boxplot.R b/R/functionsPlotting_boxplot.R
@@ -115,7 +115,7 @@ superbPlot.boxplot <- function(
 
     # depending on the scale of the x-axis.
     if (!xAsFactor) 
-        summarydata[[xfactor]] = as.numeric(summarydata[[xfactor]])
+        summarydata[[xfactor]] = unfactor(summarydata[[xfactor]])
 
 # the x-axis var must be a factor
 	rawdata[[xfactor]]     <- as.factor(rawdata[[xfactor]])