Merge branch 'master' into 'develop'

Master

See merge request BICF/Astrocyte/tcga_shiny!11

vizapp/global.R

-data.dir <- Sys.getenv('outputDir')
+data.dir <- paste0(Sys.getenv('outputDir'),"/")
\ No newline at end of file

vizapp/ui.R

@@ -14,7 +14,7 @@ shinyUI(
         conditionalPanel(condition="input.operation=='Survival'",
                          selectInput("cancerType2","Select a cancer type",
                                      choices = substr(list.files(paste0(data.dir,"Expression/"),pattern=".txt"),1,
-                                                      nchar(list.files(paste0(data.dir,"Expression/)",pattern=".txt"))-4)),
+                                                      nchar(list.files(paste0(data.dir,"Expression/"),pattern=".txt"))-4)),
                          textInput("gene2","Please input one gene of interest",placeholder = "Gene name ie BRCA1"),
                          selectInput("operation2","Select automatic or manual cutoff", choices = c("Automatic", "Manual"))