From 11218c9f8dcd79b7a12e30dc66c5957ae25560bf Mon Sep 17 00:00:00 2001 From: mikejiang Date: Mon, 4 Dec 2023 17:32:11 -0800 Subject: [PATCH 1/2] update transformerList constructor according to the latest scales package --- DESCRIPTION | 2 +- R/GatingSet_Methods.R | 4 ++-- R/parse_transformer.R | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index bdc6ed96..682793a2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -32,7 +32,7 @@ Imports: Rgraphviz, data.table, dplyr, - scales, + scales(>= 1.3.0), matrixStats, RProtoBufLib, flowCore(>= 2.1.1), diff --git a/R/GatingSet_Methods.R b/R/GatingSet_Methods.R index eb65cf33..8e80deef 100644 --- a/R/GatingSet_Methods.R +++ b/R/GatingSet_Methods.R @@ -1099,12 +1099,12 @@ setMethod("transform", transformerList <- function (from, trans) { from <- unique(from) - if(is(trans, "trans"))trans <- list(trans) + if(is(trans, "transform"))trans <- list(trans) if (!is.character(from)) stop("'from' must be character vectors.", call. = FALSE) if (!is.list(trans)) trans <- list(trans) - if (!all(sapply(trans, is, "trans"))) + if (!all(sapply(trans, is, "transform"))) stop("'trans' must be a list of transformer objects (generated by scales::trans_new method)", call. = FALSE) trans <- rep(trans, length(from)) trans <- trans[1:length(from)] diff --git a/R/parse_transformer.R b/R/parse_transformer.R index 42682b5e..dd7dc2b3 100644 --- a/R/parse_transformer.R +++ b/R/parse_transformer.R @@ -3,7 +3,7 @@ #' @return a list that represents the data structure that is ready to be passed to Rcpp API 'set_transformations' #' @noRd parse_transformer <- function(x){ - stopifnot(is(x, "trans")) + stopifnot(is(x, "transform")) transobj <- as.list(environment(x[["transform"]])) transobj[["type"]] <- x[["name"]] if(transobj[["type"]] == "flowJo_biexp") From 0137cfce2b58a80b32b676fcd2c2621ee78e2457 Mon Sep 17 00:00:00 2001 From: mikejiang Date: Mon, 4 Dec 2023 17:37:47 -0800 Subject: [PATCH 2/2] bump --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 1f587673..2bd09c45 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: flowWorkspace Type: Package Title: Infrastructure for representing and interacting with gated and ungated cytometry data sets. -Version: 4.15.0 +Version: 4.15.1 Date: 2011-06-10 Author: Greg Finak, Mike Jiang Maintainer: Greg Finak , Mike Jiang