Merge pull request #7 from HendrikSchultheis/loading

Loading

DESCRIPTION

@@ -44,6 +44,7 @@ Imports: shiny,
     factoextra,
     heatmaply,
     shinyBS,
-    shinythemes
+    shinythemes,
+    shinycssloaders
 RoxygenNote: 6.0.1
 biocViews:

R/featureSelector.R

@@ -14,7 +14,7 @@ featureSelectorUI <- function(id){
       shiny::fluidRow(
         shinydashboard::box(width = 12, collapsible = TRUE,
           shiny::div(id = ns("guide_table"),
-            DT::dataTableOutput(ns("table")),
+            shinycssloaders::withSpinner(DT::dataTableOutput(ns("table"))),
             shiny::br(),
             shiny::uiOutput(ns("row_select"))
           )

R/geneView.R

@@ -329,9 +329,9 @@ geneView <- function(input, output, session, data, metadata, level = NULL, plot.
 
   output$geneView <- shiny::renderUI({
     if(plot.method == "interactive"){
-      plotly::plotlyOutput(session$ns("interactive"))
+      shinycssloaders::withSpinner(plotly::plotlyOutput(session$ns("interactive")), proxy.height = "800px")
     }else if (plot.method == "static"){
-      shiny::plotOutput(session$ns("static"))
+      shinycssloaders::withSpinner(shiny::plotOutput(session$ns("static")), proxy.height = "800px")
     }
   })
 

R/global_cor_heatmap.R

@@ -211,11 +211,11 @@ global_cor_heatmap <- function(input, output, session, data, types, plot.method
   # load dynamic ui
   if(plot.method == "static") {
     output$cor_heatmap <- shiny::renderUI({
-      shiny::plotOutput(outputId = session$ns("static"))
+      shinycssloaders::withSpinner(shiny::plotOutput(outputId = session$ns("static")), proxy.height = "800px")
     })
   }else if(plot.method == "interactive") {
     output$cor_heatmap <- shiny::renderUI({
-      plotly::plotlyOutput(outputId = session$ns("interactive"))
+      shinycssloaders::withSpinner(plotly::plotlyOutput(outputId = session$ns("interactive")), proxy.height = "800px")
     })
   }
 

R/heatmap.R

@@ -297,7 +297,7 @@ heatmap <- function(input, output, session, data, types, plot.method = "static",
   #render choosen plotUI
   if(plot.method == "interactive"){
     output$heatmap <- shiny::renderUI({
-      plotly::plotlyOutput(session$ns("interactive"))
+      shinycssloaders::withSpinner(plotly::plotlyOutput(session$ns("interactive")), proxy.height = "800px")
     })
 
     output$interactive <- plotly::renderPlotly({
@@ -318,7 +318,7 @@ heatmap <- function(input, output, session, data, types, plot.method = "static",
     })
   }else{
     output$heatmap <- shiny::renderUI({
-      shiny::plotOutput(session$ns("static"))
+      shinycssloaders::withSpinner(shiny::plotOutput(session$ns("static")), proxy.height = "800px")
     })
 
     output$static <- shiny::renderPlot(

R/scatterPlot.R

@@ -224,11 +224,11 @@ scatterPlot <- function(input, output, session, data, types, features = NULL, ma
   # select container dependend on plot.method
   if(plot.method == "static") {
     output$scatter <- shiny::renderUI({
-      shiny::plotOutput(outputId = session$ns("static"))
+      shinycssloaders::withSpinner(shiny::plotOutput(outputId = session$ns("static")), proxy.height = "800px")
     })
   }else if(plot.method == "interactive") {
     output$scatter <- shiny::renderUI({
-      plotly::plotlyOutput(outputId = session$ns("interactive"))
+      shinycssloaders::withSpinner(plotly::plotlyOutput(outputId = session$ns("interactive")), proxy.height = "800px")
     })
   }
 

exec/heatmap_example.R

@@ -7,6 +7,7 @@ source("../R/columnSelector.R")
 source("../R/transformation.R")
 source("../R/heatmap.R")
 source("../R/label.R")
+source("../R/limit.R")
 
 ####Test Data
 data <- data.table::as.data.table(mtcars, keep.rowname = "id")