nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Put in the speeds legend

Browse source 
Removed unused icons
This commit is contained in:
Lars Brubaker 2015-05-22 15:07:48 -07:00
parent 4d4841adf3
commit 61dab45d0b
9 changed files with 107 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

71
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -67,11 +67,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private CheckBox expandModelOptions;
private CheckBox expandDisplayOptions;
private CheckBox syncToPrint;
private CheckBox showSpeeds;
private CheckBox showSpeeds;
private GuiWidget gcodeDisplayWidget;
private ColorGradientWidget gradient;
private ColorGradientWidget gradientWidget;
private EventHandler unregisterEvents;
private WindowMode windowMode;
@ -568,25 +568,23 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// put in a show speed 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.Checked = gradient.Visible;
showSpeeds.CheckedStateChanged += (sender, e) =>
{
/* if (!showSpeeds.Checked)
{
gradient.Visible = false;
}
else
{
gradient.Visible = true;
}*/
gradient.Visible = showSpeeds.Checked;
/* if (!showSpeeds.Checked)
{
gradient.Visible = false;
}
else
{
gradient.Visible = true;
}*/
gradientWidget.Visible = showSpeeds.Checked;
gcodeViewWidget.RenderSpeeds = showSpeeds.Checked;
};
layerInfoContainer.AddChild(showSpeeds);
@ -899,16 +897,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
&& gcodeViewWidget.LoadedGCode != null
&& gcodeViewWidget.LoadedGCode.LineCount > 0)
{
CloseIfNotNull(gradient);
gradient = new ColorGradientWidget(gcodeViewWidget.LoadedGCode);
AddChild(gradient);
gradient.Visible = false;
CloseIfNotNull(gradientWidget);
gradientWidget = new ColorGradientWidget(gcodeViewWidget.LoadedGCode);
AddChild(gradientWidget);
gradientWidget.Visible = false;
CreateOptionsContent();
setGradientVisibility();
setGradientVisibility();
buttonRightPanel.Visible = true;
viewControlsToggle.Visible = true;
@ -936,9 +931,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
layerRenderRatioSlider.SecondValueChanged += new EventHandler(layerEndRenderRatioSlider_ValueChanged);
AddChild(layerRenderRatioSlider);
SetSliderSizes();
// let's change the active layer so that it is set to the first layer with data
@ -951,20 +943,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
private void setGradientVisibility()
{
if (showSpeeds.Checked)
{
gradient.Visible = true;
}
else
{
gradient.Visible = false;
}
}
private void setGradientVisibility()
{
if (showSpeeds.Checked)
{
gradientWidget.Visible = true;
}
else
{
gradientWidget.Visible = false;
}
}
private void layerStartRenderRatioSlider_ValueChanged(object sender, EventArgs e)
{