Merge branch 'dev'

BDAccess/app.R

@@ -1,17 +1,15 @@
 library(shiny)
 library(rhandsontable)
-library(tidyverse)
-library(reshape2)
-library(Matrix)
-library(CitFuns)
-library(BDCIT)
 library(openCyto)
 library(flowCore)
 library(flowWorkspace)
 library(CytoML)
 library(ggcyto)
-
-filter<-dplyr::filter
+library(reshape2)
+library(Matrix)
+library(CitFuns)
+library(BDCIT)
+library(tidyverse)
 
 print(getwd())
 source("../sqlFunctions.R", encoding = "UTF-8")
@@ -1027,8 +1025,8 @@ server <- function(input, output) {
             
             for (id in names){
                 print(id)
-                iso<-sampleNames(gs)[grepl(id, sampleNames(gs)) & grepl("iso",sampleNames(gs))]
-                ab<-sampleNames(gs)[grepl(id, sampleNames(gs)) & grepl("ab",sampleNames(gs))]
+                iso<-sampleNames(gs)[grepl(id, sampleNames(gs)) & grepl("iso|Iso|ISO",sampleNames(gs))]
+                ab<-sampleNames(gs)[grepl(id, sampleNames(gs)) & grepl("ab|Ab|AB",sampleNames(gs))]
                 
                 g1<-ggcyto_arrange(autoplot(gs[[ab]], nodes_parent, bins=128), nrow=1)
                 g2<-ggcyto_arrange(autoplot(gs[[iso]], nodes_cd8, bins=64), nrow=1)