From cbb14c92fadff8b1f2114f7279a0b1dc6528b857 Mon Sep 17 00:00:00 2001 From: Schultheis Date: Tue, 30 Jan 2018 12:26:10 +0100 Subject: [PATCH 1/7] added shinycssloaders to dependencies --- DESCRIPTION | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 828acac..ade5e74 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -44,6 +44,7 @@ Imports: shiny, factoextra, heatmaply, shinyBS, - shinythemes + shinythemes, + shinycssloaders RoxygenNote: 6.0.1 biocViews: From 16358a40689a0d8c3adb45111dd66eeaa094846f Mon Sep 17 00:00:00 2001 From: Schultheis Date: Tue, 30 Jan 2018 13:56:01 +0100 Subject: [PATCH 2/7] featureSelector: add loader --- R/featureSelector.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/featureSelector.R b/R/featureSelector.R index bb64b5d..3f1a6bb 100644 --- a/R/featureSelector.R +++ b/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")) ) From 7a53be61fe46ec7ecdf577fe175cae5451411ab1 Mon Sep 17 00:00:00 2001 From: Schultheis Date: Tue, 30 Jan 2018 13:56:12 +0100 Subject: [PATCH 3/7] geneview: add loader --- R/geneView.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/geneView.R b/R/geneView.R index c60c753..bfb8298 100644 --- a/R/geneView.R +++ b/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") } }) From 69e74287bc475091180e01cc52ec9ee2dcebefcf Mon Sep 17 00:00:00 2001 From: Schultheis Date: Tue, 30 Jan 2018 13:56:29 +0100 Subject: [PATCH 4/7] global_cor_heatmap: add loader --- R/global_cor_heatmap.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/global_cor_heatmap.R b/R/global_cor_heatmap.R index 4ffd71b..f1c2baa 100644 --- a/R/global_cor_heatmap.R +++ b/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") }) } From a34d19135e18379751aec23daa55881a2e27b574 Mon Sep 17 00:00:00 2001 From: Schultheis Date: Tue, 30 Jan 2018 13:56:40 +0100 Subject: [PATCH 5/7] heatmap: add loader --- R/heatmap.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/heatmap.R b/R/heatmap.R index df9c9ec..17ac622 100644 --- a/R/heatmap.R +++ b/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( From 3643252055def7fe78a3f6e1640e49267dc74029 Mon Sep 17 00:00:00 2001 From: Schultheis Date: Tue, 30 Jan 2018 13:56:55 +0100 Subject: [PATCH 6/7] scatterPlot: add loader --- R/scatterPlot.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/scatterPlot.R b/R/scatterPlot.R index 9b75e5e..40056a1 100644 --- a/R/scatterPlot.R +++ b/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") }) } From 053d090e2f04b7afa099d4caae3de9b3847a2435 Mon Sep 17 00:00:00 2001 From: Schultheis Date: Tue, 30 Jan 2018 13:57:13 +0100 Subject: [PATCH 7/7] heatmap_example: added missing source --- exec/heatmap_example.R | 1 + 1 file changed, 1 insertion(+) diff --git a/exec/heatmap_example.R b/exec/heatmap_example.R index 771c75e..9f32763 100644 --- a/exec/heatmap_example.R +++ b/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")