@@ -11,7 +11,7 @@ License: Artistic-2.0

 LazyData: TRUE

 Imports:

     flowCore (>= 1.43.10),

-    flowWorkspace (>= 3.31.12),

+    flowWorkspace (>= 3.31.17),

     openCyto (>= 1.11.3),

     XML,

     data.table,

@@ -113,6 +113,7 @@ importFrom(flowCore,logtGml2)

 importFrom(flowCore,parameters)

 importFrom(flowCore,polygonGate)

 importFrom(flowCore,read.FCS)

+importFrom(flowCore,read.FCSheader)

 importFrom(flowCore,rectangleGate)

 importFrom(flowCore,spillover)

 importFrom(flowCore,transformList)

@@ -304,7 +304,7 @@ setMethod("parseWorkspace",signature("flowJoWorkspace"),function(obj, ...){

                     ,...)

 }

-

+#' @importFrom flowCore read.FCSheader

 .parse.pData <- function(obj, keywords, sg, keywords.source, execute, additional.keys, additional.sampleID

                           , path, keyword.ignore.case, subset, emptyValue = TRUE

                           , ... #other arguments ignored

@@ -7,9 +7,9 @@ test_check("CytoML")

 #devtools::test()

 # test_file("~/rglab/workspace/CytoML/tests/testthat/flowjo2gs_internalTestSuite.R")

-#test_file("~/rglab/workspace/CytoML/tests/testthat/Cytobank2GatingSet-InternalTestSuite.R")

-#test_file("~/rglab/workspace/CytoML/tests/testthat/GatingSet2flowJo-InternalTestSuite.R")

-#test_file("~/rglab/workspace/CytoML/tests/testthat/diva2gs-InternalTestSuite.R")

+# test_file("~/rglab/workspace/CytoML/tests/testthat/Cytobank2GatingSet-InternalTestSuite.R")

+# test_file("~/rglab/workspace/CytoML/tests/testthat/GatingSet2flowJo-InternalTestSuite.R")

+# test_file("~/rglab/workspace/CytoML/tests/testthat/diva2gs-InternalTestSuite.R")

 # test_file("~/rglab/workspace/CytoML/tests/testthat/test-cytobank.R")

 # test_file("~/rglab/workspace/CytoML/tests/testthat/test-diva2gs.R")

 # test_file("~/rglab/workspace/CytoML/tests/testthat/test-extend.R")