Merge branch 'trunk' of github.com:RGLab/ggcyto into trunk

RGLab · May 21, 2018 · 5168fd8 · 5168fd8
2 parents 84f55da + 3a8749d
commit 5168fd8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/R/ggcyto.R b/R/ggcyto.R
@@ -245,7 +245,7 @@ as.ggplot <- function(x){
     }
     if(length(trans)>0&&is.null(value))#means fs will be used to compute stats and thus needs to be scaled properly
     {
-      fs <- transform(fs, translist)
+      suppressMessages(fs <- transform(fs, translist))
     }
     for(gate in gates_parsed){
       if(length(trans)>0)

diff --git a/R/ggcyto_flowSet.R b/R/ggcyto_flowSet.R
@@ -91,6 +91,7 @@ ggcyto.flowSet <- function(data, mapping, filter = NULL, max_nrow_to_plot = 5e4,
   p[["GeomStats"]] <- list()
 
   p <- p + ggcyto_par_default()
+  p <-  p + guides(fill=FALSE) #the counts at legend could be reflecting the subsampled data and we want to hide this from user to avoid confusion
 
   p
 }
-Original file line number
+Diff line change
@@ Expand Up @@
       p[["GeomStats"]] <- list()
       p <- p + ggcyto_par_default()
+      p <-  p + guides(fill=FALSE) #the counts at legend could be reflecting the subsampled data and we want to hide this from user to avoid confusion
       p
     }
@@ Expand Down @@