From 3d9781d7c6ddb1a539dcfdc8471ae69bcbf739ea Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 23 Aug 2018 16:44:11 -0700 Subject: [PATCH] Changing close to not take any params changing CloseEventArgs to EventArgs --- AboutPage/UpdateControlView.cs | 2 +- ActionBar/PrinterSelector.cs | 2 +- ActionBar/TemperatureWidgetBase.cs | 2 +- .../WizardPages/AutoProbeFeedback.cs | 2 +- .../WizardPages/FindBedHeight.cs | 2 +- .../GettingThirdPointFor2PointCalibration.cs | 2 +- .../WizardPages/HomePrinterPage.cs | 2 +- .../WizardPages/WaitForTempPage.cs | 2 +- ConfigurationPage/RunningMacroPage.cs | 12 +++++-- ControlElements/StyledMessageBoxWindow.cs | 2 +- CustomWidgets/DockingTabControl.cs | 2 +- .../PrintingWindow/TemperatureStatusWidget.cs | 2 +- EeProm/EePromMarlinWindow.cs | 2 +- EeProm/EePromRepetierWindow.cs | 4 +-- Library/Widgets/ListView/ListView.cs | 2 +- Library/Widgets/PrintLibraryWidget.cs | 2 +- PartPreviewWindow/GCode2DWidget.cs | 2 +- PartPreviewWindow/GCode3DWidget.cs | 2 +- .../GCodeDetails/GCodeDetailsView.cs | 2 +- PartPreviewWindow/MaterialControls.cs | 2 +- PartPreviewWindow/PartPreviewContent.cs | 2 +- PartPreviewWindow/PrinterTabPage.cs | 2 +- PartPreviewWindow/RunningTaskRow.cs | 2 +- PartPreviewWindow/SliceLayerSelector.cs | 4 +-- PartPreviewWindow/StartPage/ExplorerBar.cs | 2 +- PartPreviewWindow/SystemWindowExtension.cs | 2 +- .../View3D/PrinterBar/PauseResumeButton.cs | 2 +- .../View3D/PrinterBar/PrintPopupMenu.cs | 2 +- .../View3D/PrinterBar/PrinterActionsBar.cs | 2 +- .../View3D/PrinterBar/PrinterConnectButton.cs | 2 +- .../View3D/PrinterBar/SliceButton.cs | 2 +- PartPreviewWindow/View3D/View3DWidget.cs | 2 +- PartPreviewWindow/ViewControls3D.cs | 2 +- .../Io/MacroProcessingStream.cs | 35 ++++++++++++++----- .../ControlWidgets/AdjustmentControls.cs | 2 +- .../ControlWidgets/CalibrationControls.cs | 2 +- PrinterControls/ControlWidgets/FanControls.cs | 2 +- .../ControlWidgets/MacroControls.cs | 2 +- .../ControlWidgets/MovementControls.cs | 4 +-- .../ControlWidgets/PowerControls.cs | 2 +- PrinterControls/JogControls.cs | 2 +- PrinterControls/ManualPrinterControls.cs | 2 +- .../SetupStepComPortManual.cs | 2 +- .../PrinterConnections/SetupStepComPortTwo.cs | 2 +- .../TerminalWindow/TextScrollWidget.cs | 2 +- RootSystemWindow.cs | 2 +- SetupWizard/AndroidConnectDevicePage.cs | 2 +- SetupWizard/DialogWindow.cs | 2 +- SetupWizard/SetupWizardTroubleshooting.cs | 2 +- SlicerConfiguration/PresetSelectorWidget.cs | 2 +- SlicerConfiguration/SliceSettingsWidget.cs | 2 +- Submodules/agg-sharp | 2 +- 52 files changed, 89 insertions(+), 64 deletions(-) diff --git a/AboutPage/UpdateControlView.cs b/AboutPage/UpdateControlView.cs index 9cfdb4da5..731925d80 100644 --- a/AboutPage/UpdateControlView.cs +++ b/AboutPage/UpdateControlView.cs @@ -118,7 +118,7 @@ namespace MatterHackers.MatterControl this.UpdateStatusChanged(null, null); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ActionBar/PrinterSelector.cs b/ActionBar/PrinterSelector.cs index d348d42ed..27ce0b475 100644 --- a/ActionBar/PrinterSelector.cs +++ b/ActionBar/PrinterSelector.cs @@ -154,7 +154,7 @@ namespace MatterHackers.MatterControl return imageBuffer; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ActionBar/TemperatureWidgetBase.cs b/ActionBar/TemperatureWidgetBase.cs index fb9f83d2a..643addcb0 100644 --- a/ActionBar/TemperatureWidgetBase.cs +++ b/ActionBar/TemperatureWidgetBase.cs @@ -148,7 +148,7 @@ namespace MatterHackers.MatterControl.ActionBar base.OnLoad(args); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs b/ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs index 32c3722aa..b713eedeb 100644 --- a/ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs +++ b/ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs @@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling } } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs b/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs index f0f66e7d3..a7a92be94 100644 --- a/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs +++ b/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs @@ -106,7 +106,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling base.OnLoad(args); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { this.DialogWindow.KeyDown -= TopWindowKeyDown; base.OnClosed(e); diff --git a/ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs b/ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs index a2a8f1a9c..d51492c88 100644 --- a/ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs +++ b/ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs @@ -49,7 +49,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling this.probePosition = probePosition; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs b/ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs index 584559333..283a8c4e8 100644 --- a/ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs +++ b/ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs @@ -44,7 +44,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling this.autoAdvance = autoAdvance; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs b/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs index c2295ea89..71804e0d0 100644 --- a/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs +++ b/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs @@ -157,7 +157,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling base.OnLoad(args); } - private void WizardWindow_Closed(object sender, ClosedEventArgs e) + private void WizardWindow_Closed(object sender, EventArgs e) { // Make sure when the wizard closes we turn off the bed heating printer.Connection.TurnOffBedAndExtruders(TurnOff.AfterDelay); diff --git a/ConfigurationPage/RunningMacroPage.cs b/ConfigurationPage/RunningMacroPage.cs index d83a0914b..dd90a9582 100644 --- a/ConfigurationPage/RunningMacroPage.cs +++ b/ConfigurationPage/RunningMacroPage.cs @@ -74,6 +74,7 @@ namespace MatterHackers.MatterControl.PrinterControls okButton.Name = "Continue Button"; okButton.Click += (s, e) => { + ContinueToNextPage = true; printer.Connection.MacroContinue(); }; @@ -136,9 +137,9 @@ namespace MatterHackers.MatterControl.PrinterControls public string markdown = ""; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { - if(e.OsEvent) + if (!ContinueToNextPage) { printer.Connection.MacroCancel(); } @@ -152,6 +153,10 @@ namespace MatterHackers.MatterControl.PrinterControls if(runningInterval != null) { runningInterval.Continue = !HasBeenClosed && progressBar.RatioComplete < 1; + if(!runningInterval.Continue) + { + ContinueToNextPage = true; + } } progressBar.Visible = true; long timeSinceStartMs = UiThread.CurrentTimerMs - startTimeMs; @@ -161,6 +166,9 @@ namespace MatterHackers.MatterControl.PrinterControls } double startingTemp; + + public bool ContinueToNextPage { get; set; } = false; + private void LookForTempRequest(object sender, EventArgs e) { var stringEvent = e as StringEventArgs; diff --git a/ControlElements/StyledMessageBoxWindow.cs b/ControlElements/StyledMessageBoxWindow.cs index 93df692d6..6530f397a 100644 --- a/ControlElements/StyledMessageBoxWindow.cs +++ b/ControlElements/StyledMessageBoxWindow.cs @@ -145,7 +145,7 @@ namespace MatterHackers.MatterControl } } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { if (!haveResponded) { diff --git a/CustomWidgets/DockingTabControl.cs b/CustomWidgets/DockingTabControl.cs index e886d8e04..875829b3f 100644 --- a/CustomWidgets/DockingTabControl.cs +++ b/CustomWidgets/DockingTabControl.cs @@ -464,7 +464,7 @@ namespace MatterHackers.MatterControl.CustomWidgets widgetTodockTo.Closed += widgetRelativeTo_Closed; } - private void widgetRelativeTo_Closed(object sender, ClosedEventArgs e) + private void widgetRelativeTo_Closed(object sender, EventArgs e) { // If the owning widget closed, so should we popupWidget.CloseMenu(); diff --git a/CustomWidgets/PrintingWindow/TemperatureStatusWidget.cs b/CustomWidgets/PrintingWindow/TemperatureStatusWidget.cs index 074a242b4..a948232ae 100644 --- a/CustomWidgets/PrintingWindow/TemperatureStatusWidget.cs +++ b/CustomWidgets/PrintingWindow/TemperatureStatusWidget.cs @@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl.CustomWidgets UiThread.RunOnIdle(UpdateTemperatures); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); } diff --git a/EeProm/EePromMarlinWindow.cs b/EeProm/EePromMarlinWindow.cs index 479f62c47..fe22cdabd 100644 --- a/EeProm/EePromMarlinWindow.cs +++ b/EeProm/EePromMarlinWindow.cs @@ -353,7 +353,7 @@ namespace MatterHackers.MatterControl.EeProm return currentTabIndex++; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/EeProm/EePromRepetierWindow.cs b/EeProm/EePromRepetierWindow.cs index d641389b5..a123ea125 100644 --- a/EeProm/EePromRepetierWindow.cs +++ b/EeProm/EePromRepetierWindow.cs @@ -66,7 +66,7 @@ namespace MatterHackers.MatterControl.EeProm }, ref unregisterEvents); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); @@ -240,7 +240,7 @@ namespace MatterHackers.MatterControl.EeProm }); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { if (currentEePromSettings != null) { diff --git a/Library/Widgets/ListView/ListView.cs b/Library/Widgets/ListView/ListView.cs index 5837d1721..aab77847c 100644 --- a/Library/Widgets/ListView/ListView.cs +++ b/Library/Widgets/ListView/ListView.cs @@ -488,7 +488,7 @@ namespace MatterHackers.MatterControl.CustomWidgets ScrollPosition += new Vector2(0, scrollAmount * direction); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { if (this.LibraryContext != null) { diff --git a/Library/Widgets/PrintLibraryWidget.cs b/Library/Widgets/PrintLibraryWidget.cs index c35d32e29..cfc216ea9 100644 --- a/Library/Widgets/PrintLibraryWidget.cs +++ b/Library/Widgets/PrintLibraryWidget.cs @@ -856,7 +856,7 @@ namespace MatterHackers.MatterControl.PrintLibrary libraryView.MenuActions = menuActions; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { if (libraryView?.ActiveContainer != null) { diff --git a/PartPreviewWindow/GCode2DWidget.cs b/PartPreviewWindow/GCode2DWidget.cs index 118683db4..5d985e0b4 100644 --- a/PartPreviewWindow/GCode2DWidget.cs +++ b/PartPreviewWindow/GCode2DWidget.cs @@ -301,7 +301,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); diff --git a/PartPreviewWindow/GCode3DWidget.cs b/PartPreviewWindow/GCode3DWidget.cs index 54a0a69ec..70a3cf3e3 100644 --- a/PartPreviewWindow/GCode3DWidget.cs +++ b/PartPreviewWindow/GCode3DWidget.cs @@ -215,7 +215,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { printer.Bed.RendererOptions.PropertyChanged -= RendererOptions_PropertyChanged; printer.Bed.LoadedGCodeChanged -= Bed_LoadedGCodeChanged; diff --git a/PartPreviewWindow/GCodeDetails/GCodeDetailsView.cs b/PartPreviewWindow/GCodeDetails/GCodeDetailsView.cs index f41366a42..3fe641bd5 100644 --- a/PartPreviewWindow/GCodeDetails/GCodeDetailsView.cs +++ b/PartPreviewWindow/GCodeDetails/GCodeDetailsView.cs @@ -102,7 +102,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow return textWidget; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PartPreviewWindow/MaterialControls.cs b/PartPreviewWindow/MaterialControls.cs index 73fff9cd5..6d53d4bb9 100644 --- a/PartPreviewWindow/MaterialControls.cs +++ b/PartPreviewWindow/MaterialControls.cs @@ -137,7 +137,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { scene.SelectionChanged -= Scene_SelectionChanged; base.OnClosed(e); diff --git a/PartPreviewWindow/PartPreviewContent.cs b/PartPreviewWindow/PartPreviewContent.cs index 3d115944d..a74f7c76d 100644 --- a/PartPreviewWindow/PartPreviewContent.cs +++ b/PartPreviewWindow/PartPreviewContent.cs @@ -334,7 +334,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow return partTab; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PartPreviewWindow/PrinterTabPage.cs b/PartPreviewWindow/PrinterTabPage.cs index 8818aa971..b0d43fe19 100644 --- a/PartPreviewWindow/PrinterTabPage.cs +++ b/PartPreviewWindow/PrinterTabPage.cs @@ -379,7 +379,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(null, null); diff --git a/PartPreviewWindow/RunningTaskRow.cs b/PartPreviewWindow/RunningTaskRow.cs index 46abdc30f..4d244f091 100644 --- a/PartPreviewWindow/RunningTaskRow.cs +++ b/PartPreviewWindow/RunningTaskRow.cs @@ -186,7 +186,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow detailsPanel.Visible = isExpanded; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { base.OnClosed(e); taskDetails.ProgressChanged -= TaskDetails_ProgressChanged; diff --git a/PartPreviewWindow/SliceLayerSelector.cs b/PartPreviewWindow/SliceLayerSelector.cs index fce788055..74fc83c02 100644 --- a/PartPreviewWindow/SliceLayerSelector.cs +++ b/PartPreviewWindow/SliceLayerSelector.cs @@ -114,7 +114,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow set => layerScrollbar.Value = value; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { sceneContext.ActiveLayerChanged -= SetPositionAndValue; layerSlider.MouseEnter -= SetPositionAndValue; @@ -210,7 +210,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { base.OnClosed(e); diff --git a/PartPreviewWindow/StartPage/ExplorerBar.cs b/PartPreviewWindow/StartPage/ExplorerBar.cs index 1f9d82f0f..30bcc3d93 100644 --- a/PartPreviewWindow/StartPage/ExplorerBar.cs +++ b/PartPreviewWindow/StartPage/ExplorerBar.cs @@ -276,7 +276,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab } } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); diff --git a/PartPreviewWindow/SystemWindowExtension.cs b/PartPreviewWindow/SystemWindowExtension.cs index 933e37bf3..f5069df97 100644 --- a/PartPreviewWindow/SystemWindowExtension.cs +++ b/PartPreviewWindow/SystemWindowExtension.cs @@ -185,7 +185,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - void anchor_Closed(object sender, ClosedEventArgs e) + void anchor_Closed(object sender, EventArgs e) { // If the owning widget closed, so should we CloseMenu(); diff --git a/PartPreviewWindow/View3D/PrinterBar/PauseResumeButton.cs b/PartPreviewWindow/View3D/PrinterBar/PauseResumeButton.cs index 0c50733c3..3a327c0a0 100644 --- a/PartPreviewWindow/View3D/PrinterBar/PauseResumeButton.cs +++ b/PartPreviewWindow/View3D/PrinterBar/PauseResumeButton.cs @@ -101,7 +101,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow SetButtonStates(); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs b/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs index a6eec0c0c..49787168b 100644 --- a/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs +++ b/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs @@ -200,7 +200,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow ref unregisterEvents); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs b/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs index c6adee03f..8857cdba7 100644 --- a/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs +++ b/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs @@ -268,7 +268,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow base.AddChild(childToAdd, indexInChildrenList); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs b/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs index 98543ed8f..933bbfeee 100644 --- a/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs +++ b/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs @@ -170,7 +170,7 @@ namespace MatterHackers.MatterControl.ActionBar this.SetVisibleStates(); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PartPreviewWindow/View3D/PrinterBar/SliceButton.cs b/PartPreviewWindow/View3D/PrinterBar/SliceButton.cs index 7dac9a104..f13b039a1 100644 --- a/PartPreviewWindow/View3D/PrinterBar/SliceButton.cs +++ b/PartPreviewWindow/View3D/PrinterBar/SliceButton.cs @@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow await this.SliceBedplate(); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 83d1de044..332b9d586 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -388,7 +388,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow public bool DisplayAllValueData { get; set; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { viewControls3D.TransformStateChanged -= ViewControls3D_TransformStateChanged; Scene.SelectionChanged -= Scene_SelectionChanged; diff --git a/PartPreviewWindow/ViewControls3D.cs b/PartPreviewWindow/ViewControls3D.cs index a126703b1..814d6ecbc 100644 --- a/PartPreviewWindow/ViewControls3D.cs +++ b/PartPreviewWindow/ViewControls3D.cs @@ -638,7 +638,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { sceneContext.Scene.SelectionChanged -= Scene_SelectionChanged; base.OnClosed(e); diff --git a/PrinterCommunication/Io/MacroProcessingStream.cs b/PrinterCommunication/Io/MacroProcessingStream.cs index 2b0e940ff..12d5dae2e 100644 --- a/PrinterCommunication/Io/MacroProcessingStream.cs +++ b/PrinterCommunication/Io/MacroProcessingStream.cs @@ -51,10 +51,12 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io private double startingBedTemp = 0; private List startingExtruderTemps = new List(); private Stopwatch timeHaveBeenWaiting = new Stopwatch(); - private bool waitingForUserInput = false; + private bool WaitingForUserInput { get; set; } = false; private PrinterConfig printer; QueuedCommandsStream queuedCommandsStream; + RunningMacroPage currentPage = null; + public MacroProcessingStream(QueuedCommandsStream queuedCommandsStream, PrinterConfig printer) : base(queuedCommandsStream) { @@ -69,7 +71,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io public void Continue() { - waitingForUserInput = false; + WaitingForUserInput = false; timeHaveBeenWaiting.Reset(); maxTimeToWaitForOk = 0; commandsToRepeat.Clear(); @@ -109,7 +111,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io { string lineToSend = null; - if (waitingForUserInput) + if (WaitingForUserInput) { lineToSend = ""; Thread.Sleep(100); @@ -141,7 +143,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io { lineToSend = base.ReadLine(); - if (lineToSend != null) + if (!string.IsNullOrEmpty(lineToSend)) { if (lineToSend.StartsWith(MacroPrefix) && lineToSend.TrimEnd().EndsWith(")")) { @@ -202,18 +204,28 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io switch (command) { case "choose_material": - waitingForUserInput = true; + WaitingForUserInput = true; macroData.showMaterialSelector = true; macroData.waitOk = true; UiThread.RunOnIdle(() => { - DialogWindow.Show(new RunningMacroPage(printer, macroData, ApplicationController.Instance.Theme)); + // we are continuing normaly + if (currentPage != null) + { + currentPage.ContinueToNextPage = true; + } + DialogWindow.Show(currentPage = new RunningMacroPage(printer, macroData, ApplicationController.Instance.Theme)); }); break; case "close": runningMacro = false; + // we are closing normaly + if (currentPage != null) + { + currentPage.ContinueToNextPage = true; + } UiThread.RunOnIdle(() => DialogWindow.Close(typeof(RunningMacroPage))); break; @@ -231,11 +243,16 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io break; case "show_message": - waitingForUserInput = macroData.waitOk | macroData.expireTime > 0; + WaitingForUserInput = macroData.waitOk | macroData.expireTime > 0; UiThread.RunOnIdle(() => { - DialogWindow.Show(new RunningMacroPage(printer, macroData, ApplicationController.Instance.Theme)); + // we are continuing normaly + if (currentPage != null) + { + currentPage.ContinueToNextPage = true; + } + DialogWindow.Show(currentPage = new RunningMacroPage(printer, macroData, ApplicationController.Instance.Theme)); }); break; @@ -266,7 +283,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io printer.Connection.TargetBedTemperature = startingBedTemp; } } - waitingForUserInput = false; + WaitingForUserInput = false; timeHaveBeenWaiting.Reset(); maxTimeToWaitForOk = 0; UiThread.RunOnIdle(() => DialogWindow.Close(typeof(RunningMacroPage))); diff --git a/PrinterControls/ControlWidgets/AdjustmentControls.cs b/PrinterControls/ControlWidgets/AdjustmentControls.cs index 2bef2a53a..fc59dc1b7 100644 --- a/PrinterControls/ControlWidgets/AdjustmentControls.cs +++ b/PrinterControls/ControlWidgets/AdjustmentControls.cs @@ -215,7 +215,7 @@ namespace MatterHackers.MatterControl.PrinterControls base.OnLoad(args); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PrinterControls/ControlWidgets/CalibrationControls.cs b/PrinterControls/ControlWidgets/CalibrationControls.cs index 0ec729e2d..ec4e32fec 100644 --- a/PrinterControls/ControlWidgets/CalibrationControls.cs +++ b/PrinterControls/ControlWidgets/CalibrationControls.cs @@ -149,7 +149,7 @@ namespace MatterHackers.MatterControl.PrinterControls editButton); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PrinterControls/ControlWidgets/FanControls.cs b/PrinterControls/ControlWidgets/FanControls.cs index 8ab1bedff..71ddeca43 100644 --- a/PrinterControls/ControlWidgets/FanControls.cs +++ b/PrinterControls/ControlWidgets/FanControls.cs @@ -144,7 +144,7 @@ namespace MatterHackers.MatterControl.PrinterControls theme); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PrinterControls/ControlWidgets/MacroControls.cs b/PrinterControls/ControlWidgets/MacroControls.cs index 233561e05..be5be29da 100644 --- a/PrinterControls/ControlWidgets/MacroControls.cs +++ b/PrinterControls/ControlWidgets/MacroControls.cs @@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.PrinterControls }, ref unregisterEvents); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PrinterControls/ControlWidgets/MovementControls.cs b/PrinterControls/ControlWidgets/MovementControls.cs index f690c3cb4..c360188a5 100644 --- a/PrinterControls/ControlWidgets/MovementControls.cs +++ b/PrinterControls/ControlWidgets/MovementControls.cs @@ -88,7 +88,7 @@ namespace MatterHackers.MatterControl.PrinterControls editButton); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); @@ -312,7 +312,7 @@ namespace MatterHackers.MatterControl.PrinterControls zOffsetStreamDisplay.Text = zoffset.ToString("0.##"); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(null, null); base.OnClosed(e); diff --git a/PrinterControls/ControlWidgets/PowerControls.cs b/PrinterControls/ControlWidgets/PowerControls.cs index e5bafe919..5a25c40cc 100644 --- a/PrinterControls/ControlWidgets/PowerControls.cs +++ b/PrinterControls/ControlWidgets/PowerControls.cs @@ -97,7 +97,7 @@ namespace MatterHackers.MatterControl.PrinterControls theme); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PrinterControls/JogControls.cs b/PrinterControls/JogControls.cs index 32048c3f6..6e5d790c6 100644 --- a/PrinterControls/JogControls.cs +++ b/PrinterControls/JogControls.cs @@ -268,7 +268,7 @@ namespace MatterHackers.MatterControl AxisMoveAmount = moveAmount; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PrinterControls/ManualPrinterControls.cs b/PrinterControls/ManualPrinterControls.cs index 939070494..0ec6c5345 100644 --- a/PrinterControls/ManualPrinterControls.cs +++ b/PrinterControls/ManualPrinterControls.cs @@ -152,7 +152,7 @@ namespace MatterHackers.MatterControl base.OnLoad(args); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PrinterControls/PrinterConnections/SetupStepComPortManual.cs b/PrinterControls/PrinterConnections/SetupStepComPortManual.cs index b20161e9c..852fc0ba3 100644 --- a/PrinterControls/PrinterConnections/SetupStepComPortManual.cs +++ b/PrinterControls/PrinterConnections/SetupStepComPortManual.cs @@ -121,7 +121,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections abortCancel = false; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs b/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs index ab3f3e56c..5d5d932bc 100644 --- a/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs +++ b/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs @@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections abortCancel = false; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PrinterControls/TerminalWindow/TextScrollWidget.cs b/PrinterControls/TerminalWindow/TextScrollWidget.cs index f45bd6ebb..525e787ec 100644 --- a/PrinterControls/TerminalWindow/TextScrollWidget.cs +++ b/PrinterControls/TerminalWindow/TextScrollWidget.cs @@ -174,7 +174,7 @@ namespace MatterHackers.MatterControl System.IO.File.WriteAllLines(filePath, allSourceLinesTemp); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/RootSystemWindow.cs b/RootSystemWindow.cs index 40d3ffd2c..a92797275 100644 --- a/RootSystemWindow.cs +++ b/RootSystemWindow.cs @@ -321,7 +321,7 @@ namespace MatterHackers.MatterControl } } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { UserSettings.Instance.Fields.StartCountDurringExit = UserSettings.Instance.Fields.StartCount; diff --git a/SetupWizard/AndroidConnectDevicePage.cs b/SetupWizard/AndroidConnectDevicePage.cs index f3c4f5a36..ab83e92aa 100644 --- a/SetupWizard/AndroidConnectDevicePage.cs +++ b/SetupWizard/AndroidConnectDevicePage.cs @@ -195,7 +195,7 @@ namespace MatterHackers.MatterControl this.Invalidate(); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/SetupWizard/DialogWindow.cs b/SetupWizard/DialogWindow.cs index b2f449f8e..5fcb6fac7 100644 --- a/SetupWizard/DialogWindow.cs +++ b/SetupWizard/DialogWindow.cs @@ -123,7 +123,7 @@ namespace MatterHackers.MatterControl return wizardWindow; } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/SetupWizard/SetupWizardTroubleshooting.cs b/SetupWizard/SetupWizardTroubleshooting.cs index 38bb3eec7..7de4dfb59 100644 --- a/SetupWizard/SetupWizardTroubleshooting.cs +++ b/SetupWizard/SetupWizardTroubleshooting.cs @@ -75,7 +75,7 @@ namespace MatterHackers.MatterControl }); } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { if(checkForPermissionTimer != null) { diff --git a/SlicerConfiguration/PresetSelectorWidget.cs b/SlicerConfiguration/PresetSelectorWidget.cs index b9f8d2f9b..23e3c8336 100644 --- a/SlicerConfiguration/PresetSelectorWidget.cs +++ b/SlicerConfiguration/PresetSelectorWidget.cs @@ -220,7 +220,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { ActiveSliceSettings.MaterialPresetChanged -= ActiveSliceSettings_MaterialPresetChanged; unregisterEvents?.Invoke(this, null); diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index 24a4162b0..dbf2fc99c 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -994,7 +994,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } } - public override void OnClosed(ClosedEventArgs e) + public override void OnClosed(EventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index c2a6940c7..0dc9dbf7b 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit c2a6940c756d17cf1c804f0f6ee085565f885910 +Subproject commit 0dc9dbf7bdbd5e712aa447b0b9d11b4bc662d29e