diff --git a/ApplicationView/ApplicationController.cs b/ApplicationView/ApplicationController.cs index 14ca10bb3..f6357c000 100644 --- a/ApplicationView/ApplicationController.cs +++ b/ApplicationView/ApplicationController.cs @@ -1238,7 +1238,11 @@ namespace MatterHackers.MatterControl printer.Bed.LoadGCode( printItem.GetGCodePathAndFileName(), gcodeLoadCancellationTokenSource.Token, - view3DWidget.gcodeViewer.LoadProgress_Changed); + null); + // TODO: use not yet implemented standard processing notification system to report GCode load + //view3DWidget.gcodeViewer.LoadProgress_Changed); + //SetProcessingMessage(string.Format("{0} {1:0}%...", "Loading G-Code".Localize(), progress0To1 * 100)); + } public class CloudSyncEventArgs : EventArgs diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 695778892..717806bb0 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -146,7 +146,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.InteractionLayer.AddChild(meshViewerWidget); // The slice layers view - gcodeViewer = new ViewGcodeBasic(printer, sceneContext, viewControls3D, theme); + gcodeViewer = new ViewGcodeBasic(printer, sceneContext, theme); gcodeViewer.Name = "ViewGcodeBasic"; gcodeViewer.AnchorAll(); gcodeViewer.Visible = false; diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs index 0cd9e13a5..b1d17cd43 100644 --- a/PartPreviewWindow/ViewGcodeBasic.cs +++ b/PartPreviewWindow/ViewGcodeBasic.cs @@ -40,16 +40,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private EventHandler unregisterEvents; private BedConfig sceneContext; - private TextWidget gcodeProcessingStateInfoText; - private PrinterConfig printer; - private ViewControls3D viewControls3D; private ThemeConfig theme; - public ViewGcodeBasic(PrinterConfig printer, BedConfig sceneContext, ViewControls3D viewControls3D, ThemeConfig theme) + public ViewGcodeBasic(PrinterConfig printer, BedConfig sceneContext, ThemeConfig theme) { - this.printer = printer; this.sceneContext = sceneContext; - this.viewControls3D = viewControls3D; this.theme = theme; CreateAndAddChildren(printer); @@ -76,13 +71,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { this.CloseAllChildren(); - this.AddChild(gcodeProcessingStateInfoText = new TextWidget("") - { - HAnchor = HAnchor.Center, - VAnchor = VAnchor.Center, - AutoExpandBoundsToText = true - }); - if (sceneContext.LoadedGCode?.LineCount > 0) { var gcodeResultsPanel = new FlowLayoutWidget(FlowDirection.TopToBottom) @@ -118,17 +106,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - internal void LoadProgress_Changed(double progress0To1, string processingState) - { - SetProcessingMessage(string.Format("{0} {1:0}%...", "Loading G-Code".Localize(), progress0To1 * 100)); - } - - private void SetProcessingMessage(string message) - { - gcodeProcessingStateInfoText.BackgroundColor = (message == "") ? RGBA_Bytes.Transparent : RGBA_Bytes.White; - gcodeProcessingStateInfoText.Text = message; - } - public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null);