Skip to content

update transformerList constructor according to the latest scales package change #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikejiang merged 3 commits into from
Jan 13, 2024
+5 −5
Merged

update transformerList constructor according to the latest scales package change #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11218c9
update transformerList constructor according to the latest scales pac…
Dec 5, 2023
edcd9f5
Merge branch 'devel' into hotfix/update-according-to-latest-scales-pa…
Dec 5, 2023
0137cfc
bump
Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <greg@ozette.com>, Mike Jiang <mike@ozette.com>
Expand Down Expand Up @@ -32,7 +32,7 @@ Imports:
Rgraphviz,
data.table,
dplyr,
scales,
scales(>= 1.3.0),
matrixStats,
RProtoBufLib,
flowCore(>= 2.1.1),
Expand Down
4 changes: 2 additions & 2 deletions R/GatingSet_Methods.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion R/parse_transformer.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down