Fixed ggplot issue and bracket in comments

Author: CollinErickson

DESCRIPTION

@@ -11,6 +11,8 @@ Description: Provides functions for making contour plots.
   process is fit to the data and used to create the contour plot.
 License: GPL-3
 RoxygenNote: 7.3.1
+Imports:
+    rlang
 Suggests: 
     knitr,
     rmarkdown,

NAMESPACE

@@ -35,5 +35,6 @@ importFrom(graphics,screen)
 importFrom(graphics,split.screen)
 importFrom(graphics,text)
 importFrom(graphics,title)
+importFrom(rlang,.data)
 importFrom(stats,predict)
 importFrom(utils,capture.output)

R/cf_grid_screen.R

@@ -21,7 +21,7 @@
 #' @param nlevels  if levels is not specified, the range of z, values is divided into approximately this many levels.
 #' @param color.palette  A color palette function to be used to assign colors
 #' in the plot. Defaults to cm.colors.strong. Other options include rainbow,
-#' heat.colors, terrain.colors, topo.colors, and function(x) {gray((1:x)/x)}.
+#' heat.colors, terrain.colors, topo.colors, and function(x) \{gray((1:x)/x)\}.
 #' @param col  an explicit set of colors to be used in the plot. This argument overrides any palette function specification. There should be one less color than levels
 #' @param plot.title  statements which add titles to the main plot.
 #' @param plot.axes  statements which draw axes (and a box) on the main plot. This overrides the default axes.
@@ -64,7 +64,7 @@
 #' r <- sqrt(outer(x^2, y^2, "+"))
 #' cf_grid(cos(r^2)*exp(-r/(2*pi)))
 #' cf_grid(r, color.palette=heat.colors, bar=TRUE)
-#' cf_grid(r, color.palette=function(x) {gray((1:x)/x)}, bar=TRUE)
+#' cf_grid(r, color.palette=function(x) \{gray((1:x)/x)\}, bar=TRUE)
 #' @references
 #' [1] filled.contour R function, copied function but removed part for sidebar
 #' @references

R/cf_highdim.R

@@ -29,7 +29,7 @@
 #' consecutive levels are painted with the same color.
 #' @param color.palette  A color palette function to be used to assign colors
 #' in the plot. Defaults to cm.colors.strong. Other options include rainbow,
-#' heat.colors, terrain.colors, topo.colors, and function(x) {gray((1:x)/x)}.
+#' heat.colors, terrain.colors, topo.colors, and function(x) \{gray((1:x)/x)\}.
 #' @param col  an explicit set of colors to be used in the plot.
 #' This argument overrides any palette function specification.
 #' There should be one less color than levels.

R/gcf_grid.R

@@ -22,7 +22,7 @@
 #' divided into approximately this many levels.
 #' @param color.palette  a color palette function to be used to assign colors
 #' in the plot. Defaults to cm.colors. Other options include rainbow,
-#' heat.colors, terrain.colors, topo.colors, and function(x) {gray((1:x)/x)}.
+#' heat.colors, terrain.colors, topo.colors, and function(x) \{gray((1:x)/x)\}.
 #' @param col  an explicit set of colors to be used in the plot. This argument
 #' overrides any palette function specification. There should be one less
 #' color than levels
@@ -48,6 +48,7 @@
 #' 
 #' @return ggplot2 object
 #' @export
+#' @importFrom rlang .data
 #'
 #' @examples
 #' x <- y <- seq(-4*pi, 4*pi, len = 27)
@@ -105,20 +106,23 @@ gcf_grid <-  function (x = seq(0, 1, length.out = nrow(z)),
     # scale_fill_gradientn(colours=c("cyan","white","magenta"))
     ggplot2::scale_fill_gradientn(colours=col)
   if (!lines_only) {
-    p <- p + ggplot2::geom_raster(ggplot2::aes_string(x="Var1", y="Var2", fill = "tz"),
-                         t2, interpolate=interpolate)
+    p <- p + ggplot2::geom_raster(ggplot2::aes(x=.data$Var1, y=.data$Var2,
+                                               fill = .data$tz),
+                                  t2, interpolate=interpolate)
   }
 
   # Add contour lines
   if (with_lines) {
-    p <- p + ggplot2::geom_contour(ggplot2::aes_string(x="Var1", y="Var2", z = "tz"),
+    p <- p + ggplot2::geom_contour(ggplot2::aes(x=.data$Var1, y=.data$Var2, 
+                                                z = .data$tz),
                                    bins=bins,
                                    color="black",
                                    t2)
   }
   if (lines_only) { # Only color lines if only lines
-    p <- p + ggplot2::geom_contour(ggplot2::aes_string(x="Var1", y="Var2", z = "tz",
-                                                       color="..level.."),
+    p <- p + ggplot2::geom_contour(ggplot2::aes(x=.data$Var1, y=.data$Var2,
+                                                z = .data$tz,
+                                                color=.data$..level..),
                                    bins=bins,
                                    t2)
   }
@@ -174,7 +178,7 @@ gcf_grid <-  function (x = seq(0, 1, length.out = nrow(z)),
     # points(pts, pch=19)
     pts <- as.data.frame(pts)
     colnames(pts) <- c("V1", "V2")
-    p <- p + ggplot2::geom_point(ggplot2::aes_string("V1","V2"), data=pts)
+    p <- p + ggplot2::geom_point(ggplot2::aes(.data$V1, .data$V2), data=pts)
   }
 
   if (!is.null(afterplotfunc)) {

cran-comments.md

@@ -1,4 +1,5 @@
-I added new functions and new functionality.
+I received an email that I need to fix the note on CRAN by 8/27/24.
+Apologies for slightly missing that deadline.
 
 ## Test environments
 * local Windows 7 install, R 3.6.0