Browse code

Merge branch 'trunk' into devel

mikejiang authored on 30/04/2019 23:49:26
Showing 4 changed files

... ...
@@ -1,7 +1,7 @@
1 1
 Package: CytoML
2 2
 Type: Package
3 3
 Title: A GatingML Interface for Cross Platform Cytometry Data Sharing
4
-Version: 1.9.6
4
+Version: 1.9.7
5 5
 Date: 2016-04-15
6 6
 Author: Mike Jiang
7 7
 Maintainer: Mike Jiang <wjiang2@fhcrc.org>
... ...
@@ -11,7 +11,7 @@ License: Artistic-2.0
11 11
 LazyData: TRUE
12 12
 Imports:
13 13
     flowCore (>= 1.43.10),
14
-    flowWorkspace (>= 3.31.12),
14
+    flowWorkspace (>= 3.31.17),
15 15
     openCyto (>= 1.11.3),
16 16
     XML,
17 17
     data.table,
... ...
@@ -113,6 +113,7 @@ importFrom(flowCore,logtGml2)
113 113
 importFrom(flowCore,parameters)
114 114
 importFrom(flowCore,polygonGate)
115 115
 importFrom(flowCore,read.FCS)
116
+importFrom(flowCore,read.FCSheader)
116 117
 importFrom(flowCore,rectangleGate)
117 118
 importFrom(flowCore,spillover)
118 119
 importFrom(flowCore,transformList)
... ...
@@ -304,7 +304,7 @@ setMethod("parseWorkspace",signature("flowJoWorkspace"),function(obj, ...){
304 304
                     ,...)
305 305
 		
306 306
 }
307
-
307
+#' @importFrom flowCore read.FCSheader
308 308
 .parse.pData <- function(obj, keywords, sg, keywords.source, execute, additional.keys, additional.sampleID
309 309
                           , path, keyword.ignore.case, subset, emptyValue = TRUE
310 310
                           , ... #other arguments ignored
... ...
@@ -7,9 +7,9 @@ test_check("CytoML")
7 7
 #devtools::test()
8 8
 
9 9
 # test_file("~/rglab/workspace/CytoML/tests/testthat/flowjo2gs_internalTestSuite.R")
10
-#test_file("~/rglab/workspace/CytoML/tests/testthat/Cytobank2GatingSet-InternalTestSuite.R")
11
-#test_file("~/rglab/workspace/CytoML/tests/testthat/GatingSet2flowJo-InternalTestSuite.R")
12
-#test_file("~/rglab/workspace/CytoML/tests/testthat/diva2gs-InternalTestSuite.R")
10
+# test_file("~/rglab/workspace/CytoML/tests/testthat/Cytobank2GatingSet-InternalTestSuite.R")
11
+# test_file("~/rglab/workspace/CytoML/tests/testthat/GatingSet2flowJo-InternalTestSuite.R")
12
+# test_file("~/rglab/workspace/CytoML/tests/testthat/diva2gs-InternalTestSuite.R")
13 13
 # test_file("~/rglab/workspace/CytoML/tests/testthat/test-cytobank.R")
14 14
 # test_file("~/rglab/workspace/CytoML/tests/testthat/test-diva2gs.R")
15 15
 # test_file("~/rglab/workspace/CytoML/tests/testthat/test-extend.R")