From 0093fa345b50a4152029a43fc0e2cf2a53e48edd Mon Sep 17 00:00:00 2001 From: Dillon Hammill Date: Wed, 6 Nov 2024 09:55:08 +1100 Subject: [PATCH 1/2] ODC-185 bypass quadrant selection when pop = "*". --- R/gating-methods.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/gating-methods.R b/R/gating-methods.R index a6f3a4d..bfd84c2 100644 --- a/R/gating-methods.R +++ b/R/gating-methods.R @@ -381,8 +381,8 @@ roxygen_parameter <- function() { } } - # For gate_quad methods, need to filter down to just the gates that were asked for - if(names(x) %in% c("quadGate.seq", "gate_quad_sequential", "quadGate.tmix", "gate_quad_tmix")){ + # For gate_quad methods, need to filter down to just the gates that were asked for if pop != "*" + if(!all(popName %in% "*") & names(x) %in% c("quadGate.seq", "gate_quad_sequential", "quadGate.tmix", "gate_quad_tmix")){ pops <- gtPop@name pops <- gsub("([\\+-])([^/$])", "\\1&\\2", pops) pops <- strsplit(pops, "&")[[1]] From 3978cd0fbf2153452949c8986e109df1dbc76af1 Mon Sep 17 00:00:00 2001 From: Dillon Hammill <125331387+djhammill@users.noreply.github.com> Date: Fri, 8 Nov 2024 10:06:12 +1100 Subject: [PATCH 2/2] Update R/gating-methods.R For safety reasons. Co-authored-by: Andrew McDavid --- R/gating-methods.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/gating-methods.R b/R/gating-methods.R index bfd84c2..c9eeaf3 100644 --- a/R/gating-methods.R +++ b/R/gating-methods.R @@ -382,7 +382,7 @@ roxygen_parameter <- function() { } # For gate_quad methods, need to filter down to just the gates that were asked for if pop != "*" - if(!all(popName %in% "*") & names(x) %in% c("quadGate.seq", "gate_quad_sequential", "quadGate.tmix", "gate_quad_tmix")){ + if(!all(popName %in% "*") && names(x) %in% c("quadGate.seq", "gate_quad_sequential", "quadGate.tmix", "gate_quad_tmix")){ pops <- gtPop@name pops <- gsub("([\\+-])([^/$])", "\\1&\\2", pops) pops <- strsplit(pops, "&")[[1]]