From 9388ce2917c935eb50c86b96b745fd71d87565ba Mon Sep 17 00:00:00 2001
From: joshua-gould <jgould@broadinstitute.org>
Date: Fri, 1 Apr 2016 11:52:25 -0400
Subject: [PATCH] fixed initial display when "color by"

---
 src/ui/heat_map_color_scheme_chooser.js |  1 +
 src/ui/heat_map_options.js              | 95 +++++++++++++------------
 2 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/src/ui/heat_map_color_scheme_chooser.js b/src/ui/heat_map_color_scheme_chooser.js
index cc2ee69..631628e 100644
--- a/src/ui/heat_map_color_scheme_chooser.js
+++ b/src/ui/heat_map_color_scheme_chooser.js
@@ -259,6 +259,7 @@ morpheus.HeatMapColorSchemeChooser.prototype = {
 		if (this.colorScheme.setCurrentValue) {
 			this.colorScheme.setCurrentValue(this.currentValue);
 		}
+		this.setColorScheme(this.colorScheme);
 	},
 	setColorScheme : function(colorScheme) {
 		this.colorScheme = colorScheme;
diff --git a/src/ui/heat_map_options.js b/src/ui/heat_map_options.js
index b3045ef..ef5a06b 100644
--- a/src/ui/heat_map_options.js
+++ b/src/ui/heat_map_options.js
@@ -1,27 +1,27 @@
 morpheus.HeatMapOptions = function(controller) {
 	var items = [
-		{
-			name : 'color_by',
-			required : true,
-			type : 'select',
-			options : [ '(None)' ].concat(morpheus.MetadataUtil
+			{
+				name : 'color_by',
+				required : true,
+				type : 'select',
+				options : [ '(None)' ].concat(morpheus.MetadataUtil
 						.getMetadataNames(controller.getProject()
 								.getFullDataset().getRowMetadata())),
-			value : controller.heatmap.getColorScheme()
+				value : controller.heatmap.getColorScheme()
 						.getSeparateColorSchemeForRowMetadataField()
-		}, {
-			name : 'color_by_value',
-			required : true,
-			type : 'select',
-			options : []
-		}, {
-			name : 'load_predefined_scheme',
-			required : true,
-			type : 'select',
-			options : [ {
-				name : '',
-				value : ''
 			}, {
+				name : 'color_by_value',
+				required : true,
+				type : 'select',
+				options : []
+			}, {
+				name : 'load_predefined_scheme',
+				required : true,
+				type : 'select',
+				options : [ {
+					name : '',
+					value : ''
+				}, {
 					name : 'relative',
 					value : 'gene'
 				}, {
@@ -40,10 +40,10 @@ morpheus.HeatMapOptions = function(controller) {
 					name : 'fixed (-90, 90)',
 					value : '100scale1'
 				} ]
-		}, {
-			name : 'save_color_scheme',
-			type : 'button'
-		}, {
+			}, {
+				name : 'save_color_scheme',
+				type : 'button'
+			}, {
 				name : 'load_color_scheme',
 				type : 'file'
 			} ];
@@ -78,28 +78,28 @@ morpheus.HeatMapOptions = function(controller) {
 		});
 	}
 	var displayItems = [
-		{
-			name : 'show_grid',
-			required : true,
-			type : 'checkbox',
-			value : controller.heatmap.isDrawGrid()
-		},
-		{
-			name : 'row_size',
-			required : true,
-			type : 'text',
-			col : 'col-xs-4',
-			value : morpheus.Util.nf(controller.heatmap.getRowPositions()
+			{
+				name : 'show_grid',
+				required : true,
+				type : 'checkbox',
+				value : controller.heatmap.isDrawGrid()
+			},
+			{
+				name : 'row_size',
+				required : true,
+				type : 'text',
+				col : 'col-xs-4',
+				value : morpheus.Util.nf(controller.heatmap.getRowPositions()
 						.getSize())
-		},
-		{
-			name : 'column_size',
-			required : true,
-			type : 'text',
-			col : 'col-xs-4',
-			value : morpheus.Util.nf(controller.heatmap
+			},
+			{
+				name : 'column_size',
+				required : true,
+				type : 'text',
+				col : 'col-xs-4',
+				value : morpheus.Util.nf(controller.heatmap
 						.getColumnPositions().getSize())
-		} ];
+			} ];
 	if (controller.rowDendrogram) {
 		displayItems
 				.push({
@@ -286,6 +286,7 @@ morpheus.HeatMapOptions = function(controller) {
 						controller.project.getFullDataset().getRowMetadata()
 								.getByName(separateSchemesField)).keys()));
 	}
+
 	colorSchemeChooser.setColorScheme(controller.heatmap.getColorScheme());
 	if (separateSchemesField != null) {
 		colorSchemeChooser.setCurrentValue($colorByValue.val());
@@ -363,11 +364,11 @@ morpheus.HeatMapOptions = function(controller) {
 							controller.heatmap.repaint();
 
 						}).fail(function() {
-							morpheus.FormBuilder.showInModal({
-								title : 'Error',
-								html : 'Unable to read saved color scheme.'
-							});
-						});
+					morpheus.FormBuilder.showInModal({
+						title : 'Error',
+						html : 'Unable to read saved color scheme.'
+					});
+				});
 
 			}
 		}
-- 
GitLab