From f47b791669bbd0237e6ed7a85487f49ba9b98571 Mon Sep 17 00:00:00 2001
From: Gregory Diaz <greg.diaz@matterhackers.com>
Date: Mon, 4 May 2015 17:16:06 -0700
Subject: [PATCH] Layout is fine need to rethink logic

---
 PartPreviewWindow/ColorGradientWidget.cs |  4 +-
 PartPreviewWindow/ViewGcodeBasic.cs      | 47 +++++++++++++++++++-----
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/PartPreviewWindow/ColorGradientWidget.cs b/PartPreviewWindow/ColorGradientWidget.cs
index 0d87e1a59..19aae3923 100644
--- a/PartPreviewWindow/ColorGradientWidget.cs
+++ b/PartPreviewWindow/ColorGradientWidget.cs
@@ -64,8 +64,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
                 colorWidget.BackgroundColor = color;
                 colorWidget.Margin = new BorderDouble(2);
 
-                ColorToSpeedWidget test = new ColorToSpeedWidget(colorWidget, speed.ToString());
-                this.AddChild(test);
+                ColorToSpeedWidget colorToSpeedWidget = new ColorToSpeedWidget(colorWidget, speed.ToString());
+                this.AddChild(colorToSpeedWidget);
                 
             }
 
diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs
index 311167637..70c63a94f 100644
--- a/PartPreviewWindow/ViewGcodeBasic.cs
+++ b/PartPreviewWindow/ViewGcodeBasic.cs
@@ -67,6 +67,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 		private CheckBox expandModelOptions;
 		private CheckBox expandDisplayOptions;
 		private CheckBox syncToPrint;
+        private CheckBox showSpeeds;
 
 		private GuiWidget gcodeDisplayWidget;
 
@@ -567,19 +568,22 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 			// put in a show speed checkbox
 			{
-                CheckBox showSpeeds = new CheckBox(LocalizedString.Get("Speeds"), textColor: ActiveTheme.Instance.PrimaryTextColor);
+                showSpeeds = new CheckBox(LocalizedString.Get("Speeds"), textColor: ActiveTheme.Instance.PrimaryTextColor);
 				showSpeeds.Checked = gcodeViewWidget.RenderSpeeds;
+                //showSpeeds.Checked = gradient.Visible;
 				showSpeeds.CheckedStateChanged += (sender, e) =>
 				{
-
-                    if (showSpeeds.Checked)
-                    {
-                        gradient.Visible = true;
-                    }
-                    else
+                    
+                   /* if (!showSpeeds.Checked)
                     {
                         gradient.Visible = false;
                     }
+                    else
+                    {
+                        gradient.Visible = true;
+                    }*/
+                     
+                    gradient.Visible = showSpeeds.Checked;
 
 					gcodeViewWidget.RenderSpeeds = showSpeeds.Checked;
                    
@@ -894,7 +898,16 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 				&& gcodeViewWidget.LoadedGCode != null
 				&& gcodeViewWidget.LoadedGCode.LineCount > 0)
 			{
+
+                CloseIfNotNull(gradient);
+                gradient = new ColorGradientWidget(gcodeViewWidget.LoadedGCode);
+                AddChild(gradient);
+                gradient.Visible = false;
+
+                
+
 				CreateOptionsContent();
+                setGradientVisibility();
 				buttonRightPanel.Visible = true;
 				viewControlsToggle.Visible = true;
 
@@ -922,9 +935,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 				layerRenderRatioSlider.SecondValueChanged += new EventHandler(layerEndRenderRatioSlider_ValueChanged);
 				AddChild(layerRenderRatioSlider);
 
-                CloseIfNotNull(gradient);
-                gradient = new ColorGradientWidget(gcodeViewWidget.LoadedGCode);
-                AddChild(gradient);
+                
+              
 
 				SetSliderSizes();
 
@@ -938,6 +950,21 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			}
 		}
 
+        private void setGradientVisibility()
+        {
+            if (showSpeeds.Checked)
+            {
+                gradient.Visible = true;
+            }
+            else
+            {
+                gradient.Visible = false;
+            }
+
+            
+
+        }
+
 		private void layerStartRenderRatioSlider_ValueChanged(object sender, EventArgs e)
 		{
 			gcodeViewWidget.FeatureToStartOnRatio0To1 = layerRenderRatioSlider.FirstValue;