Merge pull request #3 from teunbrand/master

Compatibility with ggplot2 3.6.0

Author: EricMarcon

R/Accumulation.R

@@ -237,9 +237,9 @@ autoplot.AccumCurve <-
 function(object, ..., main = NULL, 
          xlab = "Sample Size", ylab = NULL, 
          ShadeColor = "grey75", alpha = 0.3, BorderColor = "red",
-         col = ggplot2::GeomLine$default_aes$colour,
-         lty = ggplot2::GeomLine$default_aes$linetype,
-         lwd = ggplot2::GeomLine$default_aes$size)
+         col = "black",
+         lty = 1,
+         lwd = 0.5)
 {  
   thePlot <- ggplot2::ggplot(as.data.frame.list(object), ggplot2::aes(x=.data$x, y=.data$y))
   if (!(is.null(object$high) | is.null(object$low))) {

R/CommunityProfile.R

@@ -131,9 +131,9 @@ autoplot.CommunityProfile <-
   function(object, ..., main = NULL, 
            xlab = "Order of Diversity", ylab = "Diversity", 
            ShadeColor = "grey75", alpha = 0.3, BorderColor = "red",
-           col = ggplot2::GeomLine$default_aes$colour,
-           lty = ggplot2::GeomLine$default_aes$linetype,
-           lwd = ggplot2::GeomLine$default_aes$size)
+           col = "black",
+           lty = 1,
+           lwd = 0.5)
 {  
   thePlot <- ggplot2::ggplot(as.data.frame.list(object), ggplot2::aes(x=.data$x, y=.data$y))
   if (!(is.null(object$high) | is.null(object$low))) {

R/DivPart.R

@@ -93,8 +93,8 @@ function (x, ...)
 
 
 autoplot.DivPart <- 
-function (object, col = ggplot2::GeomRect$default_aes$fill, 
-          border = ggplot2::GeomRect$default_aes$colour, ...) 
+function (object, col = "grey35", 
+          border = NA, ...) 
 {
   thePlot <- ggplot2::ggplot() +
     ggplot2::geom_rect(ggplot2::aes(xmin=.data$xmin, ymin=.data$ymin, xmax=.data$xmax, ymax=.data$ymax), 

R/DivProfile.R

@@ -219,9 +219,9 @@ function (x, ..., main = NULL, xlab = "Order of Diversity", ylab = NULL, Which =
 autoplot.DivProfile <- 
 function (object, ..., main = NULL, xlab = "Order of Diversity", ylab = NULL, Which = "All", 
           ShadeColor = "grey75", alpha = 0.3, BorderColor = "red", labels = NULL, font.label = list(size=11, face="plain"),
-          col = ggplot2::GeomLine$default_aes$colour,
-          lty = ggplot2::GeomLine$default_aes$linetype,
-          lwd = ggplot2::GeomLine$default_aes$size)
+          col = "black",
+          lty = 1,
+          lwd = 0.5)
 {
   if (Which == "All" | (Which == "Alpha" & is.null(main))) main <- "Total Alpha Diversity"
   if (Which == "All" | (Which == "Alpha" & is.null(ylab))) ylab <- expression(paste(alpha, " diversity"))

R/MCdiversity.R

@@ -20,8 +20,8 @@ function (x, ...)
 
 
 autoplot.MCdiversity <- 
-function (object, col = ggplot2::GeomCol$default_aes$fill,
-          border = ggplot2::GeomCol$default_aes$colour, ...) 
+function (object, col = "grey35",
+          border = NA, ...) 
 {
   theData <- data.frame(x=c(names(object$Communities), "", "Metacommunity"), y=c(object$Communities, 0, object$Total))
   # Factors to keep the order of bars (avoid sort by name)

R/MCentropy.R

@@ -19,8 +19,8 @@ function (x, ...)
 
 
 autoplot.MCentropy <- 
-function (object, col = ggplot2::GeomCol$default_aes$fill,
-          border = ggplot2::GeomCol$default_aes$colour, ...) 
+function (object, col = "grey35",
+          border = NA, ...) 
 {
   theData <- data.frame(x=c(names(object$Communities), "", "Metacommunity"), y=c(object$Communities, 0, object$Total))
   # Factors to keep the order of bars (avoid sort by name)

R/PhyloValue.R

@@ -33,9 +33,9 @@ function (x, xlab = expression(italic("T")), ylab = NULL, main = NULL, ...)
 
 autoplot.PhyloValue <- 
 function (object, xlab = expression(italic("T")), ylab = NULL, main = NULL, 
-          col = ggplot2::GeomLine$default_aes$colour,
-          lty = ggplot2::GeomLine$default_aes$linetype,
-          lwd = ggplot2::GeomLine$default_aes$size,
+          col = "black",
+          lty = 1,
+          lwd = 0.5,
           ...) 
 {
   Entity <- ""

R/SpeciesDistribution.R

@@ -371,9 +371,9 @@ function(x, ..., Distribution = NULL,
 autoplot.SpeciesDistribution <-
 function(object, ..., Distribution = NULL, 
          ylog = TRUE, main = NULL, xlab = "Rank", ylab = NULL, 
-         pch = ggplot2::GeomPoint$default_aes$shape,
-         col = ggplot2::GeomPoint$default_aes$colour,
-         cex = ggplot2::GeomPoint$default_aes$size) 
+         pch = 19,
+         col = "black",
+         cex = 1.5) 
 {
   # Eliminate zeros and sort
   Ns <- sort(object[object > 0], decreasing = TRUE)

man/Accumulation.Rd

@@ -27,9 +27,9 @@ DivAC(Ns, q = 0, n.seq = seq_len(sum(Ns)), PCorrection="Chao2015", Unveiling="ge
 \method{autoplot}{AccumCurve}(object, ..., main = NULL, 
          xlab = "Sample Size", ylab = NULL, 
          ShadeColor = "grey75", alpha = 0.3, BorderColor = "red",
-         col = ggplot2::GeomLine$default_aes$colour,
-         lty = ggplot2::GeomLine$default_aes$linetype,
-         lwd = ggplot2::GeomLine$default_aes$size)
+         col = "black",
+         lty = 1,
+         lwd = 0.5)
 }
 \arguments{
   \item{x}{

man/CommunityProfile.Rd

@@ -23,9 +23,9 @@ is.CommunityProfile(x)
 \method{autoplot}{CommunityProfile}(object, \dots, main = NULL, 
           xlab = "Order of Diversity", ylab = "Diversity",
           ShadeColor = "grey75", alpha = 0.3, BorderColor = "red",
-          col = ggplot2::GeomLine$default_aes$colour,
-          lty = ggplot2::GeomLine$default_aes$linetype,
-          lwd = ggplot2::GeomLine$default_aes$size)
+          col = "black",
+          lty = 1,
+          lwd = 0.5)
 CEnvelope(Profile, LineWidth = 2, ShadeColor = "grey75", BorderColor = "red", \dots)
 }
 \arguments{