Browse code

modified imports in igsva()

pablo-rodr-bio2 authored on 19/04/2021 11:20:20
Showing3 changed files

... ...
@@ -15,11 +15,15 @@ Imports: methods, stats, utils, graphics, S4Vectors, IRanges,
15 15
          BiocParallel, SingleCellExperiment, sparseMatrixStats, DelayedArray,
16 16
          DelayedMatrixStats, HDF5Array, BiocSingular
17 17
 <<<<<<< HEAD
18
+<<<<<<< HEAD
18 19
 Suggests: BiocGenerics, RUnit, BiocStyle, knitr, rmarkdown, limma, RColorBrewer,
19 20
           org.Hs.eg.db, genefilter, edgeR, GSVAdata, shiny, shinythemes, ggplot2,
20 21
           data.table, plotly
21 22
 =======
22 23
 Suggests: BiocGenerics, RUnit, BiocStyle, knitr, markdown, limma, RColorBrewer,
24
+=======
25
+Suggests: BiocGenerics, RUnit, BiocStyle, knitr, rmarkdown, limma, RColorBrewer,
26
+>>>>>>> modified imports in igsva()
23 27
           genefilter, edgeR, GSVAdata, shiny, shinythemes, ggplot2, data.table,
24 28
 <<<<<<< HEAD
25 29
           plotly, shinyjs, future, promises, shinybusy
... ...
@@ -8,40 +8,41 @@ igsva <- function() {
8 8
     stop(sprintf("Please install the following packages to use the GSVA WebApp:\n\n  %s\n",
9 9
                  paste(shinydeps[!maskshinydeps], collapse=", ")))
10 10
   
11
-  namespaceImportFrom(self=getNamespace("base"),
12
-                      ns=getNamespace("shiny"))
13
-
14
-  namespaceImportFrom(self=getNamespace("base"),
15
-                      ns=getNamespace("shinythemes"),
16
-                      vars="shinytheme")
17
-
18
-  namespaceImportFrom(self=getNamespace("base"),
19
-                      ns=getNamespace("ggplot2"),
20
-                      vars="ggplot")
21
-
22
-  namespaceImportFrom(self=getNamespace("base"),
23
-                      ns=getNamespace("data.table"))
24
-
25
-  namespaceImportFrom(self=getNamespace("base"),
26
-                      ns=getNamespace("plotly"),
27
-                      vars=c("ggplotly", "event_data", "style"))
28
-
29
-  namespaceImportFrom(self=getNamespace("base"),
30
-                      ns=getNamespace("future"))
31
-
32
-  namespaceImportFrom(self=getNamespace("base"),
33
-                      ns=getNamespace("shinyjs"))
34
-
35
-  namespaceImportFrom(self=getNamespace("base"),
36
-                      ns=getNamespace("shinybusy"))
37
-
38
-  namespaceImportFrom(self=getNamespace("base"),
39
-                      ns=getNamespace("limma"))
11
+  # namespaceImportFrom(self=getNamespace("base"),
12
+  #                     ns=getNamespace("shiny"))
13
+  # 
14
+  # namespaceImportFrom(self=getNamespace("base"),
15
+  #                     ns=getNamespace("shinythemes"),
16
+  #                     vars="shinytheme")
17
+  # 
18
+  # namespaceImportFrom(self=getNamespace("base"),
19
+  #                     ns=getNamespace("ggplot2"),
20
+  #                     vars="ggplot")
21
+  # 
22
+  # namespaceImportFrom(self=getNamespace("base"),
23
+  #                     ns=getNamespace("data.table"))
24
+  # 
25
+  # namespaceImportFrom(self=getNamespace("base"),
26
+  #                     ns=getNamespace("plotly"),
27
+  #                     vars=c("ggplotly", "event_data", "style"))
28
+  # 
29
+  # namespaceImportFrom(self=getNamespace("base"),
30
+  #                     ns=getNamespace("future"))
31
+  # 
32
+  # namespaceImportFrom(self=getNamespace("base"),
33
+  #                     ns=getNamespace("shinyjs"))
34
+  # 
35
+  # namespaceImportFrom(self=getNamespace("base"),
36
+  #                     ns=getNamespace("shinybusy"))
37
+  # 
38
+  # namespaceImportFrom(self=getNamespace("base"),
39
+  #                     ns=getNamespace("limma"))
40 40
 
41 41
   appDir <- system.file("shinyApp", package="GSVA")
42 42
   if (appDir == "")
43 43
     stop("The GSVA Shiny app cannot be found within the package.")
44 44
 
45
-  runWebApp <- get("runApp", mode="function")
46
-  runWebApp(appDir)
45
+  # runWebApp <- get("runApp", mode="function")
46
+  # runWebApp(appDir)
47
+  shiny::runApp(appDir)
47 48
 }
... ...
@@ -41,6 +41,8 @@ function(input, output, session) {
41 41
     rv$gs <- NULL
42 42
     rv$dat.t <- NULL
43 43
     rv$p <- NULL
44
+    rv$p2 <- NULL
45
+    rv$p3 <- NULL
44 46
     rv$errors.gsva = NULL
45 47
     rv$matrix <- isolate(matrix())
46 48
     rv$genesets <- isolate(genesets())