heatmap: clear plot on reset

loosolab · Jan 12, 2018 · 3a81ef2 · 3a81ef2
1 parent 9f71cb8
commit 3a81ef2
Showing 1 changed file with 28 additions and 15 deletions.
diff --git a/R/heatmap.R b/R/heatmap.R
@@ -208,7 +208,10 @@ heatmap <- function(input, output, session, data, types, plot.method = "static",
     }
   })
 
-  #reset ui
+  # clear plot
+  clearPlot <- shiny::reactiveVal(FALSE)
+
+  # reset ui
   shiny::observeEvent(input$reset, {
     shinyjs::reset("cluster.distance")
     shinyjs::reset("cluster.method")
@@ -223,6 +226,7 @@ heatmap <- function(input, output, session, data, types, plot.method = "static",
     if(!is.null(custom.row.label)) {
       custom_label <<- shiny::callModule(label, "labeller", data = custom.row.label, label = "Select row label", sep = label.sep, disable = shiny::reactive(!input$row.label))
     }
+    clearPlot(TRUE)
   })
 
   columns <- shiny::callModule(columnSelector, "select", type.columns = types, columnTypeLabel = "Column types to choose from")
@@ -252,6 +256,7 @@ heatmap <- function(input, output, session, data, types, plot.method = "static",
   plot <- shiny::eventReactive(input$plot, {
     # enable downloadButton
     shinyjs::enable("download")
+    clearPlot(FALSE)
 
     #new progress indicator
     progress <- shiny::Progress$new()
@@ -296,16 +301,20 @@ heatmap <- function(input, output, session, data, types, plot.method = "static",
     })
 
     output$interactive <- plotly::renderPlotly({
-      #new progress indicator
-      progress <- shiny::Progress$new()
-      on.exit(progress$close())
-      progress$set(0.2, message = "Render plot")
+      if(clearPlot()) {
+        return()
+      } else {
+        #new progress indicator
+        progress <- shiny::Progress$new()
+        on.exit(progress$close())
+        progress$set(0.2, message = "Render plot")
 
-      plot <- plot()$plot
+        plot <- plot()$plot
 
-      progress$set(1)
+        progress$set(1)
 
-      return(plot)
+        return(plot)
+      }
     })
   }else{
     output$heatmap <- shiny::renderUI({
@@ -316,15 +325,19 @@ heatmap <- function(input, output, session, data, types, plot.method = "static",
       width = shiny::reactive(plot()$width * (plot()$ppi / 2.54)),
       height = shiny::reactive(plot()$height * (plot()$ppi / 2.54)),
       {
-        #new progress indicator
-        progress <- shiny::Progress$new()
-        on.exit(progress$close())
-        progress$set(0.2, message = "Render plot")
+        if(clearPlot()) {
+          return()
+        } else {
+          #new progress indicator
+          progress <- shiny::Progress$new()
+          on.exit(progress$close())
+          progress$set(0.2, message = "Render plot")
 
-        plot <- plot()$plot
+          plot <- plot()$plot
 
-        progress$set(1)
-        return(ComplexHeatmap::draw(plot, heatmap_legend_side = "bottom"))
+          progress$set(1)
+          return(ComplexHeatmap::draw(plot, heatmap_legend_side = "bottom"))
+        }
     })
   }