* Reorganized agglomerative clustering plot UI

Author: Ruman Gerst

.gitignore

@@ -7,5 +7,4 @@ README.html
 README_files
 figure
 packrat/lib*/
-packrat/src/
 .Rprofile

packrat/.gitignore

@@ -1 +1,3 @@
 packrat.zip
+src/
+lib*/

plotAgglomerativeClusteringPlot.R

@@ -82,25 +82,22 @@ plotAgglomerativeClusteringPlotSettingsUI <- function(id) {
   return(bsCollapse(
     bsCollapsePanel(recommendedDataText("Plot type"),
                     value = "plottype",
-                    selectizeInput(ns("plottype"), "", choices = plotAgglomerativeClusteringPlotUI.plotTypes)
+                    selectizeInput(ns("plottype"), "Plot type", choices = plotAgglomerativeClusteringPlotUI.plotTypes),
+                    conditionalPanel(paste(conditionalPanel.equals(ns("plottype"), "'cor.pearson'"), "||", conditionalPanel.equals(ns("plottype"), "'cor.spearman'")),
+                                     selectizeInput(ns("heatmap.dendrograms"), "Visible dendrograms", choices = plotAgglomerativeClusteringPlotUI.dendrogramPositions),
+                                     selectizeInput(ns("heatmap.density.info"), "Density info", choices = plotAgglomerativeClusteringPlotUI.heatmapDensityInfo),
+                                     selectizeInput(ns("heatmap.trace"), "Trace line", choices = plotAgglomerativeClusteringPlotUI.heatmapTrace),
+                                     colourInput(ns("heatmap.tracecol"), "Trace line color", value = "cyan", allowTransparent = T))
                     ),
     bsCollapsePanel(recommendedDataText("Hierarchical clustering"),
                     value = "hierarchical.clustering",
                     selectizeInput(ns("method.dist"), "Distance method", choices = plotAgglomerativeClusteringPlotUI.dist.methodsSelection),
                     selectizeInput(ns("method.hclust"), "Clustering method", choices = plotAgglomerativeClusteringPlotUI.hclust.methodsSelection)),
-    bsCollapsePanel(optionalDataText("Heatmap"),
-                    value = "heatmap",
-                    selectizeInput(ns("heatmap.dendrograms"), "Visible dendrograms", choices = plotAgglomerativeClusteringPlotUI.dendrogramPositions),
-                    selectizeInput(ns("heatmap.density.info"), "Density info", choices = plotAgglomerativeClusteringPlotUI.heatmapDensityInfo),
-                    selectizeInput(ns("heatmap.trace"), "Trace line", choices = plotAgglomerativeClusteringPlotUI.heatmapTrace),
-                    colourInput(ns("heatmap.tracecol"), "Trace line color", value = "cyan", allowTransparent = T),
-                    hDivider(),
-                    tags$label("Heatmap color"),
-                    gradientEditorUI(ns("heatmap.color"))
-                    ),
-    bsCollapsePanel(optionalDataText("Sample Visualization"), 
+    bsCollapsePanel(optionalDataText("Visualization"), 
                     value = "visualization",
-                    visualsEditorUI(ns("visuals"))),
+                    conditionalPanel(paste(conditionalPanel.equals(ns("plottype"), "'cor.pearson'"), "||", conditionalPanel.equals(ns("plottype"), "'cor.spearman'")), gradientEditorUI(ns("heatmap.color"))),
+                    conditionalPanel(paste(conditionalPanel.equals(ns("plottype"), "'dendrogram.horizontal'"), "||", conditionalPanel.equals(ns("plottype"), "'dendrogram.vertical'")), visualsEditorUI(ns("visuals")))
+                    ),
     bsCollapsePanel(optionalDataText("General settings"), 
                     value = "generalsettings",
                     generalPlotSettingsInput(ns("plot.settings"),