From 372bc85bbb492398aa6656caa2556aa0fd3cde8b Mon Sep 17 00:00:00 2001 From: William Hutchison Date: Mon, 20 May 2024 12:46:00 +1000 Subject: [PATCH 1/2] Fix check notes --- R/functions_OLD.R | 3 ++- R/functions_chr_int.R | 4 ++-- R/gate_app.R | 6 ++++++ R/methods.R | 3 +++ man/figures/lifecycle-archived.svg | 1 - man/figures/lifecycle-defunct.svg | 1 - man/figures/lifecycle-deprecated.svg | 1 - man/figures/lifecycle-experimental.svg | 1 - man/figures/lifecycle-maturing.svg | 1 - man/figures/lifecycle-questioning.svg | 1 - man/figures/lifecycle-soft-deprecated.svg | 1 - man/figures/lifecycle-stable.svg | 1 - man/figures/lifecycle-superseded.svg | 1 - man/gate-methods.Rd | 0 man/gate_interactive_chr_int.Rd | 2 -- man/gate_programmatic.Rd | 2 +- man/gate_programmatic_chr_int.Rd | 2 +- 17 files changed, 15 insertions(+), 16 deletions(-) delete mode 100644 man/figures/lifecycle-archived.svg delete mode 100644 man/figures/lifecycle-defunct.svg delete mode 100644 man/figures/lifecycle-deprecated.svg delete mode 100644 man/figures/lifecycle-experimental.svg delete mode 100644 man/figures/lifecycle-maturing.svg delete mode 100644 man/figures/lifecycle-questioning.svg delete mode 100644 man/figures/lifecycle-soft-deprecated.svg delete mode 100644 man/figures/lifecycle-stable.svg delete mode 100644 man/figures/lifecycle-superseded.svg mode change 100755 => 100644 man/gate-methods.Rd diff --git a/R/functions_OLD.R b/R/functions_OLD.R index b3970c6..8bd7ba4 100644 --- a/R/functions_OLD.R +++ b/R/functions_OLD.R @@ -356,7 +356,8 @@ gate_programmatic <- .dim1, .dim2, gate_list, - name = "gate") { + name = "gate", + ...) { # Comply with CRAN NOTES . = NULL diff --git a/R/functions_chr_int.R b/R/functions_chr_int.R index 302cbe0..ccf515f 100644 --- a/R/functions_chr_int.R +++ b/R/functions_chr_int.R @@ -265,7 +265,6 @@ pretty_plot_chr_int = function(.data, #' @param .size A column symbol. Size of points #' @param opacity A number between 0 and 1. The opacity level of the data points #' @param how_many_gates An integer. The number of gates to label -#' @param gate_list A list of gates. It is returned by gate function as attribute \"gate\". If you want to create this list yourself, each element of the list is a data frame with x and y columns. Each row is a coordinate. The order matter. #' @param ... Further parameters passed to the function gatepoints::fhs #' #' @return A tibble with additional columns @@ -379,7 +378,8 @@ gate_programmatic_chr_int <- function(.data, .dim1, .dim2, - gate_list + gate_list, + ... ) { # Comply with CRAN NOTES . = NULL diff --git a/R/gate_app.R b/R/gate_app.R index cfae428..772310a 100644 --- a/R/gate_app.R +++ b/R/gate_app.R @@ -34,6 +34,12 @@ server <- output$plot <- plotly::renderPlotly({ + # Fix CRAN NOTES + .key <- NULL + .selected <- NULL + dimension_x <- NULL + dimension_y <- NULL + # Begin recording selection and brush information select_data <- plotly::event_data("plotly_selected") brush_data <- plotly::event_data("plotly_brushed") diff --git a/R/methods.R b/R/methods.R index 6a03de7..24b03f7 100755 --- a/R/methods.R +++ b/R/methods.R @@ -276,6 +276,9 @@ gate_custom <- message("tidygate says: this feature is in early development and may undergo changes or contain bugs.") + # Fix CRAN NOTES + key <- NULL + # Create tibble with .key column data <- custom_plot |> diff --git a/man/figures/lifecycle-archived.svg b/man/figures/lifecycle-archived.svg deleted file mode 100644 index 48f72a6..0000000 --- a/man/figures/lifecycle-archived.svg +++ /dev/null @@ -1 +0,0 @@ - lifecyclelifecyclearchivedarchived \ No newline at end of file diff --git a/man/figures/lifecycle-defunct.svg b/man/figures/lifecycle-defunct.svg deleted file mode 100644 index 01452e5..0000000 --- a/man/figures/lifecycle-defunct.svg +++ /dev/null @@ -1 +0,0 @@ -lifecyclelifecycledefunctdefunct \ No newline at end of file diff --git a/man/figures/lifecycle-deprecated.svg b/man/figures/lifecycle-deprecated.svg deleted file mode 100644 index 4baaee0..0000000 --- a/man/figures/lifecycle-deprecated.svg +++ /dev/null @@ -1 +0,0 @@ -lifecyclelifecycledeprecateddeprecated \ No newline at end of file diff --git a/man/figures/lifecycle-experimental.svg b/man/figures/lifecycle-experimental.svg deleted file mode 100644 index d1d060e..0000000 --- a/man/figures/lifecycle-experimental.svg +++ /dev/null @@ -1 +0,0 @@ -lifecyclelifecycleexperimentalexperimental \ No newline at end of file diff --git a/man/figures/lifecycle-maturing.svg b/man/figures/lifecycle-maturing.svg deleted file mode 100644 index df71310..0000000 --- a/man/figures/lifecycle-maturing.svg +++ /dev/null @@ -1 +0,0 @@ -lifecyclelifecyclematuringmaturing \ No newline at end of file diff --git a/man/figures/lifecycle-questioning.svg b/man/figures/lifecycle-questioning.svg deleted file mode 100644 index 08ee0c9..0000000 --- a/man/figures/lifecycle-questioning.svg +++ /dev/null @@ -1 +0,0 @@ -lifecyclelifecyclequestioningquestioning \ No newline at end of file diff --git a/man/figures/lifecycle-soft-deprecated.svg b/man/figures/lifecycle-soft-deprecated.svg deleted file mode 100644 index 9f014fd..0000000 --- a/man/figures/lifecycle-soft-deprecated.svg +++ /dev/null @@ -1 +0,0 @@ -lifecyclelifecyclesoft-deprecatedsoft-deprecated \ No newline at end of file diff --git a/man/figures/lifecycle-stable.svg b/man/figures/lifecycle-stable.svg deleted file mode 100644 index e015dc8..0000000 --- a/man/figures/lifecycle-stable.svg +++ /dev/null @@ -1 +0,0 @@ -lifecyclelifecyclestablestable \ No newline at end of file diff --git a/man/figures/lifecycle-superseded.svg b/man/figures/lifecycle-superseded.svg deleted file mode 100644 index 75f24f5..0000000 --- a/man/figures/lifecycle-superseded.svg +++ /dev/null @@ -1 +0,0 @@ - lifecyclelifecyclesupersededsuperseded \ No newline at end of file diff --git a/man/gate-methods.Rd b/man/gate-methods.Rd old mode 100755 new mode 100644 diff --git a/man/gate_interactive_chr_int.Rd b/man/gate_interactive_chr_int.Rd index 23c828e..930f4a4 100644 --- a/man/gate_interactive_chr_int.Rd +++ b/man/gate_interactive_chr_int.Rd @@ -35,8 +35,6 @@ gate_interactive_chr_int( \item{how_many_gates}{An integer. The number of gates to label} \item{...}{Further parameters passed to the function gatepoints::fhs} - -\item{gate_list}{A list of gates. It is returned by gate function as attribute \"gate\". If you want to create this list yourself, each element of the list is a data frame with x and y columns. Each row is a coordinate. The order matter.} } \value{ A tibble with additional columns diff --git a/man/gate_programmatic.Rd b/man/gate_programmatic.Rd index 59999f4..5afaf56 100644 --- a/man/gate_programmatic.Rd +++ b/man/gate_programmatic.Rd @@ -4,7 +4,7 @@ \alias{gate_programmatic} \title{Get points within a user drawn gate} \usage{ -gate_programmatic(.data, .element, .dim1, .dim2, gate_list, name = "gate") +gate_programmatic(.data, .element, .dim1, .dim2, gate_list, name = "gate", ...) } \arguments{ \item{.data}{A tibble} diff --git a/man/gate_programmatic_chr_int.Rd b/man/gate_programmatic_chr_int.Rd index 91537de..f2a808d 100644 --- a/man/gate_programmatic_chr_int.Rd +++ b/man/gate_programmatic_chr_int.Rd @@ -4,7 +4,7 @@ \alias{gate_programmatic_chr_int} \title{Get points within a user drawn gate} \usage{ -gate_programmatic_chr_int(.data, .dim1, .dim2, gate_list) +gate_programmatic_chr_int(.data, .dim1, .dim2, gate_list, ...) } \arguments{ \item{.data}{A tibble} From 5cf2c0f6f75b8b05cb49cbd32d0ab65c924d3418 Mon Sep 17 00:00:00 2001 From: William Hutchison Date: Mon, 20 May 2024 12:47:16 +1000 Subject: [PATCH 2/2] Version up --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index bc1ecd2..14e39cc 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: tidygate Type: Package Title: Add Gate Information to Your Tibble -Version: 0.5.2 +Version: 0.5.3 Authors@R: c(person(given = "Stefano", family = "Mangiola",