set dataset argument if it is absent to avoid redundant warning messa…

…ges #47
RGLab · Aug 1, 2019 · 32bc6dd · 32bc6dd
1 parent 61851ad
commit 32bc6dd
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/R/ncdfIO.R b/R/ncdfIO.R
@@ -169,6 +169,8 @@ read.ncdfFlowSet <- function(files = NULL
 		}
 	}else
 	  chnls_common <- channels
+  #set dataset argument if it is absent to avoid redundant warning messages  
+  dots[["dataset"]] <- ifelse("dataset" %in% names(dots), dots[["dataset"]], 1)
 
   thisCall <- quote(read.FCSheader(files[1]))
   thisCall <- as.call(c(as.list(thisCall),dots))
@@ -244,11 +246,14 @@ read.ncdfFlowSet <- function(files = NULL
         my.read.FCS <- function(i)
         {
           curFile<-files[i]
-          this_fr <- read.FCS(curFile
-              ,column.pattern = colPattern
-              , alter.names = alter.names
-              , channel_alias = channel_alias
-              ,...)
+          thisCall <- quote(read.FCS(curFile
+                                     ,column.pattern = colPattern
+                                     , alter.names = alter.names
+                                     , channel_alias = channel_alias
+                                     )
+                            )
+          thisCall <- as.call(c(as.list(thisCall),dots))
+          this_fr <- eval(thisCall)
           #we need to reorder columns in order to make them identical across samples
           this_fr[,chnls_common]
         }