Remove user specified sample description for heatmap

rajewsky-lab · May 17, 2018 · 1b23c5f · 1b23c5f
1 parent 8837a9b
commit 1b23c5f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 53 deletions.
diff --git a/server.R b/server.R
@@ -30,7 +30,8 @@
 # change log (reverse chronological) #
 ######################################
 
-# 2018-04-13: added user specified smoothing span for 3D model
+# 2018-04-13: replaced user specified sample description for heatmap by default
+#             added user specified smoothing span for 3D model
 #             added 3D model gene/genotype selection and CPM fitting support / fixed indentation
 # 2018-04-09: removed sample stretches input
 # 2018-04-03: added user specified smoothing span
@@ -199,38 +200,18 @@ function(input, output, session){
          smoothing.span = input$smoothing.span))
 
   # assign genotype input panel output
-  output$genotype.input<-
-
-    # render genotype input panel
-    renderUI(
-
-      # take sample description to use for heatmap
-      input$sample.description %>%
-
-      # generate genotype input panel
-      generate.genotype.input
-
-      # end genotype input panel rendering
-      )
+  output$genotype.input <-
+    renderUI(generate.genotype.input(params$sample.description.input.default))
 
   output$genotype3d.input <-
     renderUI(generate.genotype.input(params$sample.description.input.default,
                                      id = "genotype3d"))
 
   # assign gene type input panel output
-  output$gene.type.input<-
-
-    # render gene type input panel
+  output$gene.type.input <-
     renderUI(
-
-      # take sample description to use for heatmap
-      input$sample.description %>%
-
-      # generate gene type input panel for genotype to use for heatmap
-      generate.gene.type.input(input$genotype)
-
-      # end gene type input panel rendering
-      )
+      generate.gene.type.input(params$sample.description.input.default,
+                               input$genotype))
 
   # assign gene list filtered gene profiles
   gene.profiles.filtered.gene.list<-
@@ -257,10 +238,7 @@ function(input, output, session){
       gene.profiles.filtered.gene.list() %>%
 
       # extract gene profiles for sample description specified by the user
-      filter.data.by.sample.description(input$sample.description)
-
-      # end sample description filtered gene profiles re-calculation
-      )
+      filter.data.by.sample.description(params$sample.description.input.default))
 
   # assign genotype filtered gene profiles
   gene.profiles.filtered.genotype<-

diff --git a/ui.R b/ui.R
@@ -30,7 +30,8 @@
 # change log (reverse chronological) #
 ######################################
 
-# 2018-04-13: added 3D model span input panel
+# 2018-04-13: removed sample description input panel for heatmap
+#             added 3D model span input panel
 #             added 3D model gene name & genotype input panels
 #             added 3D model tab & plot output panel
 # 2018-04-09: removed sample stretches input panel
@@ -309,29 +310,8 @@ fluidPage(
         # define sidebar panel for heatmap tab panel
         sidebarPanel(
 
-          # add sample description input panel
-          selectInput(
-
-            # name sample description input
-            inputId="sample.description"
-
-            # label sample description input panel
-            ,label=params$sample.description.input.label %>%
-
-              # make label 3rd level header
-              h3
-
-            # set choices for sample description input panel
-            ,choices=input.data$sample.descriptions
-
-            # set default selection for sample description input panel
-            ,selected=params$sample.description.input.default
-
-            # end sample description input panel definition
-            )
-
           # add dynamically generated genotype input panel
-          ,uiOutput(
+          uiOutput(
 
             # name genotype input panel output
             outputId="genotype.input"