fix bug

RGLab · Aug 28, 2018 · fe7c137 · fe7c137
1 parent ba115e0
commit fe7c137
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/R/GatingSet2flowJo.R b/R/GatingSet2flowJo.R
@@ -486,7 +486,7 @@ constructPopNode <- function(gh, pop, trans, matInfo, showHidden = FALSE, env.no
       #get dim from non-boolean children
       nonBool <- sapply(children, function(child){
         thisGate <- getGate(gh, child)
-        !is(thisGate, "booleanFilter")
+        !is.null(env.nodes[["DerivedParameters"]][[child]])||!is(thisGate, "booleanFilter")
       })
       if(sum(nonBool) == 0)
         stop("Can't find any non-boolean children node under ", pop)

diff --git a/tests/testthat/test-flowJo.R b/tests/testthat/test-flowJo.R
@@ -81,7 +81,8 @@ test_that("GatingSet2flowJo: export clustering results as derived parameters ",{
   params <- parameters(getGate(gh, "CD4"))
   Rm("CD4", gs)
   Rm("CD8", gs)
-
+  Rm("DNT", gs)
+  Rm("DPT", gs)
   #run flowClust
 
   fr <- getData(gh, "CD3+")
@@ -96,7 +97,7 @@ test_that("GatingSet2flowJo: export clustering results as derived parameters ",{
   stats.orig <- getPopStats(gs[[1]])
   #output to flowJo
   outFile <- tempfile(fileext = ".wsp")
-  outFile <- "~/test.wsp"
+  # outFile <- "~/test.wsp"
   expect_message(GatingSet2flowJo(gs, outFile), "DerivedParameter")
 
   # #parse it back in
@@ -105,3 +106,4 @@ test_that("GatingSet2flowJo: export clustering results as derived parameters ",{
   # stats.new <- getPopStats(gs1[[1]])
   # expect_equal(stats.orig, stats.new, tol = 5e-3)
 })
+