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

Fixed a problem with the sync to print.

Browse source 
Refactoring for clarity.
This commit is contained in:
larsbrubaker 2014-12-16 23:02:46 -08:00
parent d4f5db94be
commit 326cc83672
4 changed files with 22 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -44,6 +44,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public class ViewGcodeBasic : PartPreview3DWidget
{
public enum WindowMode { Embeded, StandAlone };
public SolidSlider selectLayerSlider;
SetLayerWidget setLayerWidget;
@ -69,7 +71,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
GuiWidget gcodeDisplayWidget;
EventHandler unregisterEvents;
bool widgetHasCloseButton;
WindowMode windowMode;
public delegate Vector2 GetSizeFunction();
@ -82,12 +84,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
MeshViewerWidget.BedShape bedShape;
int sliderWidth;
public ViewGcodeBasic(PrintItemWrapper printItem, Vector3 viewerVolume, Vector2 bedCenter, MeshViewerWidget.BedShape bedShape, bool addCloseButton)
public ViewGcodeBasic(PrintItemWrapper printItem, Vector3 viewerVolume, Vector2 bedCenter, MeshViewerWidget.BedShape bedShape, WindowMode windowMode)
{
this.viewerVolume = viewerVolume;
this.bedShape = bedShape;
this.bedCenter = bedCenter;
widgetHasCloseButton = addCloseButton;
this.windowMode = windowMode;
this.printItem = printItem;
if (ActiveTheme.Instance.DisplayMode == ActiveTheme.ApplicationDisplayType.Touchscreen)
@ -171,7 +173,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
GuiWidget holdPanelOpen = new GuiWidget(1, generateGCodeButton.Height);
layerSelectionButtonsPanel.AddChild(holdPanelOpen);
if (widgetHasCloseButton)
if (windowMode == WindowMode.StandAlone)
{
Button closeButton = textImageButtonFactory.Generate(LocalizedString.Get("Close"));
layerSelectionButtonsPanel.AddChild(closeButton);
@ -601,7 +603,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
// Put in the sync to print checkbox
if (!widgetHasCloseButton)
if (windowMode == WindowMode.Embeded)
{
syncToPrint = new CheckBox("Sync To Print".Localize(), textColor: ActiveTheme.Instance.PrimaryTextColor);
syncToPrint.Checked = (UserSettings.Instance.get("LayerViewSyncToPrint") == "True");
@ -641,7 +643,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void SetSyncToPrintVisibility()
{
if (!widgetHasCloseButton)
if (windowMode == WindowMode.Embeded)
{
if (syncToPrint.Checked)
{