From 9edde00fcf2c3eb2fa8c36ac2293da553298b5ac Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 17 Oct 2017 12:55:58 -0700 Subject: [PATCH] Clear bed should invalidate GCode render data - Disable 'File Not Found' messages on empty LoadedGCode - Issue MatterHackers/MCCentral#2088 Clear bed should invalidate GCode render data --- ApplicationView/PrinterModels.cs | 4 ++++ PartPreviewWindow/PrinterTabPage.cs | 12 ++++++++++++ PartPreviewWindow/ViewGcodeBasic.cs | 16 ++++++++-------- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/ApplicationView/PrinterModels.cs b/ApplicationView/PrinterModels.cs index 8a6e4c1d5..9719a39d0 100644 --- a/ApplicationView/PrinterModels.cs +++ b/ApplicationView/PrinterModels.cs @@ -103,6 +103,10 @@ namespace MatterHackers.MatterControl string mcxPath = Path.Combine(ApplicationDataStorage.Instance.PlatingDirectory, now + ".mcx"); + // Clear existing + this.LoadedGCode = null; + this.GCodeRenderer = null; + this.printItem = new PrintItemWrapper(new PrintItem(now, mcxPath)); File.WriteAllText(mcxPath, new Object3D().ToJson()); diff --git a/PartPreviewWindow/PrinterTabPage.cs b/PartPreviewWindow/PrinterTabPage.cs index f7483b266..d35d8c117 100644 --- a/PartPreviewWindow/PrinterTabPage.cs +++ b/PartPreviewWindow/PrinterTabPage.cs @@ -261,6 +261,18 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private void BedPlate_LoadedGCodeChanged(object sender, EventArgs e) { + bool gcodeLoaded = sceneContext.LoadedGCode != null; + + layerCountText.Visible = gcodeLoaded; + layerStartText.Visible = gcodeLoaded; + selectLayerSlider.Visible = gcodeLoaded; + layerRenderRatioSlider.Visible = gcodeLoaded; + + if (!gcodeLoaded) + { + return; + } + var layerCount = sceneContext.LoadedGCode.LayerCount; selectLayerSlider.Maximum = layerCount - 1; diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs index 3c267976c..fac26f9d9 100644 --- a/PartPreviewWindow/ViewGcodeBasic.cs +++ b/PartPreviewWindow/ViewGcodeBasic.cs @@ -98,10 +98,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow VAnchor = VAnchor.Stretch }; - if (!File.Exists(sceneContext.GCodePath)) - { - SetProcessingMessage($"{fileNotFoundMessage}\n'{sceneContext.GCodePath}'"); - } + //if (!File.Exists(sceneContext.GCodePath)) + //{ + // SetProcessingMessage($"{fileNotFoundMessage}\n'{sceneContext.GCodePath}'"); + //} mainContainerTopToBottom.AddChild(gcodeDisplayWidget); @@ -109,10 +109,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // *************** AddGCodeFileControls *************** SetProcessingMessage(""); - if (sceneContext.LoadedGCode == null) - { - SetProcessingMessage($"{fileNotFoundMessage}\n'{sceneContext.GCodePath}'"); - } + //if (sceneContext.LoadedGCode == null) + //{ + // SetProcessingMessage($"{fileNotFoundMessage}\n'{sceneContext.GCodePath}'"); + //} if (sceneContext.LoadedGCode?.LineCount > 0) {