diff --git a/AboutPage/ContactForm.cs b/AboutPage/ContactForm.cs index 5403cdcf5..cf2d30965 100644 --- a/AboutPage/ContactForm.cs +++ b/AboutPage/ContactForm.cs @@ -341,7 +341,7 @@ namespace MatterHackers.MatterControl.ContactForm contactFormWidget.Closed += (sender, e) => { Close(); }; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/AboutPage/UpdateControlView.cs b/AboutPage/UpdateControlView.cs index 14df780b2..282b59c7d 100644 --- a/AboutPage/UpdateControlView.cs +++ b/AboutPage/UpdateControlView.cs @@ -90,7 +90,7 @@ namespace MatterHackers.MatterControl UpdateStatusChanged(null, null); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ActionBar/ActionBarPlus.cs b/ActionBar/ActionBarPlus.cs index 98b7f4130..9b07d1717 100644 --- a/ActionBar/ActionBarPlus.cs +++ b/ActionBar/ActionBarPlus.cs @@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl this.Invalidate(); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/ActionBar/PrintActionRow.cs b/ActionBar/PrintActionRow.cs index 8ccac357b..4527ef435 100644 --- a/ActionBar/PrintActionRow.cs +++ b/ActionBar/PrintActionRow.cs @@ -99,7 +99,7 @@ namespace MatterHackers.MatterControl.ActionBar private EventHandler unregisterEvents; - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/ActionBar/PrintStatusRow.cs b/ActionBar/PrintStatusRow.cs index ec6ed94f8..f99e540ca 100644 --- a/ActionBar/PrintStatusRow.cs +++ b/ActionBar/PrintStatusRow.cs @@ -97,7 +97,7 @@ namespace MatterHackers.MatterControl.ActionBar } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (activePrintPreviewImage.ItemWrapper != null) { @@ -481,7 +481,7 @@ namespace MatterHackers.MatterControl.ActionBar } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ActionBar/PrinterConnectAndSelectControl.cs b/ActionBar/PrinterConnectAndSelectControl.cs index 0d3d5896c..a549de302 100644 --- a/ActionBar/PrinterConnectAndSelectControl.cs +++ b/ActionBar/PrinterConnectAndSelectControl.cs @@ -76,7 +76,7 @@ namespace MatterHackers.MatterControl.ActionBar AddChildElements(); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ActionBar/PrinterSelector.cs b/ActionBar/PrinterSelector.cs index cd1567b9c..64d972287 100644 --- a/ActionBar/PrinterSelector.cs +++ b/ActionBar/PrinterSelector.cs @@ -142,7 +142,7 @@ namespace MatterHackers.MatterControl } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ActionBar/TemperatureWidgetBed.cs b/ActionBar/TemperatureWidgetBed.cs index a95bf5070..923546275 100644 --- a/ActionBar/TemperatureWidgetBed.cs +++ b/ActionBar/TemperatureWidgetBed.cs @@ -28,6 +28,7 @@ either expressed or implied, of the FreeBSD Project. */ using System; +using MatterHackers.Agg.UI; using MatterHackers.Localizations; using MatterHackers.MatterControl.PrinterCommunication; using MatterHackers.MatterControl.SlicerConfiguration; @@ -93,7 +94,7 @@ namespace MatterHackers.MatterControl.ActionBar } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ActionBar/TemperatureWidgetExtruder.cs b/ActionBar/TemperatureWidgetExtruder.cs index 8da0eb2bf..02e5d0864 100644 --- a/ActionBar/TemperatureWidgetExtruder.cs +++ b/ActionBar/TemperatureWidgetExtruder.cs @@ -31,6 +31,7 @@ using MatterHackers.Localizations; using MatterHackers.MatterControl.PrinterCommunication; using MatterHackers.MatterControl.SlicerConfiguration; using System; +using MatterHackers.Agg.UI; namespace MatterHackers.MatterControl.ActionBar { @@ -92,7 +93,7 @@ namespace MatterHackers.MatterControl.ActionBar } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ApplicationView/AdvancedControlsPanel.cs b/ApplicationView/AdvancedControlsPanel.cs index 987dfe20b..54057f726 100644 --- a/ApplicationView/AdvancedControlsPanel.cs +++ b/ApplicationView/AdvancedControlsPanel.cs @@ -83,7 +83,7 @@ namespace MatterHackers.MatterControl PopOutManager.SaveIfClosed = true; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ApplicationView/CompactSlidePanel.cs b/ApplicationView/CompactSlidePanel.cs index a14b59049..af561f55f 100644 --- a/ApplicationView/CompactSlidePanel.cs +++ b/ApplicationView/CompactSlidePanel.cs @@ -134,7 +134,7 @@ namespace MatterHackers.MatterControl } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ApplicationView/FirstPanelTabView.cs b/ApplicationView/FirstPanelTabView.cs index dffdbadf2..f5de3f996 100644 --- a/ApplicationView/FirstPanelTabView.cs +++ b/ApplicationView/FirstPanelTabView.cs @@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl firstPanelCurrentTab = SelectedTabIndex; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/ApplicationView/MenuRow/ApplicationMenuRow.cs b/ApplicationView/MenuRow/ApplicationMenuRow.cs index a61d905ba..d662c3ea1 100644 --- a/ApplicationView/MenuRow/ApplicationMenuRow.cs +++ b/ApplicationView/MenuRow/ApplicationMenuRow.cs @@ -115,7 +115,7 @@ namespace MatterHackers.MatterControl }, ref unregisterEvents); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ApplicationView/MenuRow/MenuOptionAction.cs b/ApplicationView/MenuRow/MenuOptionAction.cs index 421375553..35fbc3734 100644 --- a/ApplicationView/MenuRow/MenuOptionAction.cs +++ b/ApplicationView/MenuRow/MenuOptionAction.cs @@ -29,7 +29,7 @@ namespace MatterHackers.MatterControl base.OnLoad(args); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ApplicationView/TouchscreenTabView.cs b/ApplicationView/TouchscreenTabView.cs index 91f8c26c8..54c11e327 100644 --- a/ApplicationView/TouchscreenTabView.cs +++ b/ApplicationView/TouchscreenTabView.cs @@ -249,7 +249,7 @@ namespace MatterHackers.MatterControl private EventHandler unregisterEvents; - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); } diff --git a/ApplicationView/WidescreenPanel.cs b/ApplicationView/WidescreenPanel.cs index 866153d0f..f4187cf66 100644 --- a/ApplicationView/WidescreenPanel.cs +++ b/ApplicationView/WidescreenPanel.cs @@ -82,7 +82,7 @@ namespace MatterHackers.MatterControl base.OnBoundsChanged(e); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); @@ -193,7 +193,7 @@ namespace MatterHackers.MatterControl leftBorderLine.Width = 15; leftBorderLine.BeforeDraw += (widget, graphics2D) => { - RectangleDouble bounds = widget.LocalBounds; + RectangleDouble bounds = ((GuiWidget)widget).LocalBounds; bounds.Left += 3; bounds.Right -= 8; graphics2D.graphics2D.FillRectangle(bounds, new RGBA_Bytes(160, 160, 160)); diff --git a/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs b/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs index f81eee16b..01911f306 100644 --- a/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs +++ b/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs @@ -136,7 +136,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage return buttonRow; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ConfigurationPage/CloudSettings/CloudSettingsView.cs b/ConfigurationPage/CloudSettings/CloudSettingsView.cs index 9407cec3a..3a9fb1a27 100644 --- a/ConfigurationPage/CloudSettings/CloudSettingsView.cs +++ b/ConfigurationPage/CloudSettings/CloudSettingsView.cs @@ -164,7 +164,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage return notificationSettingsContainer; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/ConfigurationPage/PrintLeveling/PrintLevelPages.cs b/ConfigurationPage/PrintLeveling/PrintLevelPages.cs index 71e14b84f..5329c86b8 100644 --- a/ConfigurationPage/PrintLeveling/PrintLevelPages.cs +++ b/ConfigurationPage/PrintLeveling/PrintLevelPages.cs @@ -122,7 +122,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling private EventHandler unregisterEvents; - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); @@ -222,7 +222,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling private EventHandler unregisterEvents; - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/ConfigurationPage/PrinterConfigurationPage.cs b/ConfigurationPage/PrinterConfigurationPage.cs index dd07790dc..bfae7670e 100644 --- a/ConfigurationPage/PrinterConfigurationPage.cs +++ b/ConfigurationPage/PrinterConfigurationPage.cs @@ -219,7 +219,7 @@ namespace MatterHackers.MatterControl return topLine; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs b/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs index caa66f72c..0bce6a130 100644 --- a/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs +++ b/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs @@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage SetEnabledStates(); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/ConfigurationPage/RunningMacroPage.cs b/ConfigurationPage/RunningMacroPage.cs index 5e8dfb068..2bfd6fa21 100644 --- a/ConfigurationPage/RunningMacroPage.cs +++ b/ConfigurationPage/RunningMacroPage.cs @@ -53,10 +53,10 @@ namespace MatterHackers.MatterControl.PrinterControls double startingBedTemp = 0; public RunningMacroPage(string message, bool showOkButton, bool showMaterialSelector, double expectedSeconds, double expectedTemperature, ImageBuffer imageBuffer) - : base("Cancel", "Macro Feedback") + : base("Cancel", message) { - TextWidget syncingText = new TextWidget(message, textColor: ActiveTheme.Instance.PrimaryTextColor); - contentRow.AddChild(syncingText); + //TextWidget syncingText = new TextWidget(message, textColor: ActiveTheme.Instance.PrimaryTextColor); + //contentRow.AddChild(syncingText); int extruderCount = ActiveSliceSettings.Instance.GetValue(SettingsKey.extruder_count); for (int i = 0; i < extruderCount; i++) @@ -116,7 +116,7 @@ namespace MatterHackers.MatterControl.PrinterControls { FillColor = ActiveTheme.Instance.PrimaryAccentColor, BorderColor = ActiveTheme.Instance.PrimaryTextColor, - //HAnchor = HAnchor.ParentCenter, + BackgroundColor = RGBA_Bytes.White, Margin = new BorderDouble(3, 0, 0, 10), }; progressBarText = new TextWidget("", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor) @@ -143,6 +143,8 @@ namespace MatterHackers.MatterControl.PrinterControls private void CancelScript() { + PrinterConnectionAndCommunication.Instance.MacroCancel(); + for (int i = 0; i < startingExtruderTemps.Count; i++) { PrinterConnectionAndCommunication.Instance.SetTargetExtruderTemperature(i, startingExtruderTemps[i]); @@ -152,8 +154,6 @@ namespace MatterHackers.MatterControl.PrinterControls { PrinterConnectionAndCommunication.Instance.TargetBedTemperature = startingBedTemp; } - - PrinterConnectionAndCommunication.Instance.MacroCancel(); } private EventHandler unregisterEvents; @@ -163,8 +163,12 @@ namespace MatterHackers.MatterControl.PrinterControls WizardWindow.Show("Macro", "Running Macro", new RunningMacroPage(message, showOkButton, showMaterialSelector, expectedSeconds, expectedTemperature, image)); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { + if(e.OsEvent) + { + CancelScript(); + } unregisterEvents?.Invoke(this, null); base.OnClosed(e); @@ -198,11 +202,13 @@ namespace MatterHackers.MatterControl.PrinterControls private void ShowTempChangeProgress() { - double totalDelta = PrinterConnectionAndCommunication.Instance.GetTargetExtruderTemperature(0) - startingTemp; - double currentDelta = PrinterConnectionAndCommunication.Instance.GetActualExtruderTemperature(0) - startingTemp; + double targetTemp = PrinterConnectionAndCommunication.Instance.GetTargetExtruderTemperature(0); + double actualTemp = PrinterConnectionAndCommunication.Instance.GetActualExtruderTemperature(0); + double totalDelta = targetTemp - startingTemp; + double currentDelta = actualTemp - startingTemp; double ratioDone = totalDelta != 0 ? (currentDelta / totalDelta) : 1; progressBar.RatioComplete = Math.Min(Math.Max(0, ratioDone), 1); - //progressBarText.Text = $"Time Remaining: {seconds / 60:#0}:{seconds % 60:00}"; + progressBarText.Text = $"Temperature: {actualTemp:0} / {targetTemp:0}"; if (!HasBeenClosed && ratioDone < 1) { UiThread.RunOnIdle(ShowTempChangeProgress, 1); diff --git a/ControlElements/AttentionGetter.cs b/ControlElements/AttentionGetter.cs index 3121dc4ad..437910376 100644 --- a/ControlElements/AttentionGetter.cs +++ b/ControlElements/AttentionGetter.cs @@ -150,9 +150,9 @@ namespace MatterHackers.MatterControl return 2.0f * t * (1.0f - t) + 0.5; } - private void ConnectToWidget(GuiWidget drawingWidget, DrawEventArgs e) + private void ConnectToWidget(object drawingWidget, DrawEventArgs e) { - GuiWidget parent = drawingWidget; + GuiWidget parent = drawingWidget as GuiWidget; while (parent.BackgroundColor.Alpha0To255 == 0) { parent = parent.Parent; diff --git a/ControlElements/PopOutManager.cs b/ControlElements/PopOutManager.cs index 11be99952..202661178 100644 --- a/ControlElements/PopOutManager.cs +++ b/ControlElements/PopOutManager.cs @@ -223,7 +223,7 @@ namespace MatterHackers.MatterControl } } - private void ShowOnNextMatterControlDraw(GuiWidget drawingWidget, DrawEventArgs e) + private void ShowOnNextMatterControlDraw(Object drawingWidget, DrawEventArgs e) { if (widgetWithPopContent.Children.Count > 0) { @@ -240,7 +240,7 @@ namespace MatterHackers.MatterControl ApplicationController.Instance.MainView.AfterDraw -= ShowOnNextMatterControlDraw; } - private void SystemWindow_Closing(object sender, WidgetClosingEnventArgs closingEvent) + private void SystemWindow_Closing(object sender, ClosingEventArgs closingEvent) { if (systemWindowWithPopContent != null) { diff --git a/CustomWidgets/DropDownMenuWidget.cs b/CustomWidgets/DropDownMenuWidget.cs index e45f4deb0..f7ef2ff6b 100644 --- a/CustomWidgets/DropDownMenuWidget.cs +++ b/CustomWidgets/DropDownMenuWidget.cs @@ -100,7 +100,7 @@ namespace MatterHackers.Agg.UI HoverArrowColor = TextColor; } - protected override void DropListItems_Closed(object sender, EventArgs e) + protected override void DropListItems_Closed(object sender, ClosedEventArgs e) { BackgroundColor = NormalColor; base.DropListItems_Closed(sender, e); diff --git a/CustomWidgets/ExportPrintItemWindow.cs b/CustomWidgets/ExportPrintItemWindow.cs index efeaab1bb..1fc5602fc 100644 --- a/CustomWidgets/ExportPrintItemWindow.cs +++ b/CustomWidgets/ExportPrintItemWindow.cs @@ -376,7 +376,7 @@ namespace MatterHackers.MatterControl } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { printItemWrapper.SlicingDone -= sliceItem_Done; if (unregisterEvents != null) diff --git a/CustomWidgets/LibrarySelector/LibrarySelectorRowItem.cs b/CustomWidgets/LibrarySelector/LibrarySelectorRowItem.cs index 3d32c0773..2be3d2ce1 100644 --- a/CustomWidgets/LibrarySelector/LibrarySelectorRowItem.cs +++ b/CustomWidgets/LibrarySelector/LibrarySelectorRowItem.cs @@ -184,7 +184,7 @@ namespace MatterHackers.MatterControl.CustomWidgets.LibrarySelector } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs b/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs index 9fbceac2a..2ec680c25 100644 --- a/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs +++ b/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs @@ -222,7 +222,7 @@ namespace MatterHackers.MatterControl.CustomWidgets.LibrarySelector this.SelectedItems.Clear(); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { currentLibraryProvider.DataReloaded -= LibraryDataReloaded; diff --git a/CustomWidgets/PartThumbnailWidget.cs b/CustomWidgets/PartThumbnailWidget.cs index b38af98ac..60fecb886 100644 --- a/CustomWidgets/PartThumbnailWidget.cs +++ b/CustomWidgets/PartThumbnailWidget.cs @@ -198,7 +198,7 @@ namespace MatterHackers.MatterControl return GetImageFileName(item.FileHashCode.ToString()); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/CustomWidgets/PrintProgressBarWidget.cs b/CustomWidgets/PrintProgressBarWidget.cs index 89b57a148..115e1474e 100644 --- a/CustomWidgets/PrintProgressBarWidget.cs +++ b/CustomWidgets/PrintProgressBarWidget.cs @@ -139,7 +139,7 @@ namespace MatterHackers.MatterControl UiThread.RunOnIdle(OnIdle); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/CustomWidgets/PrintingWindow.cs b/CustomWidgets/PrintingWindow.cs index f7c778919..7acfedb04 100644 --- a/CustomWidgets/PrintingWindow.cs +++ b/CustomWidgets/PrintingWindow.cs @@ -716,7 +716,7 @@ namespace MatterHackers.MatterControl.CustomWidgets } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); diff --git a/CustomWidgets/WizardControl.cs b/CustomWidgets/WizardControl.cs index 8d80e8d99..e6307a7af 100644 --- a/CustomWidgets/WizardControl.cs +++ b/CustomWidgets/WizardControl.cs @@ -150,7 +150,7 @@ namespace MatterHackers.MatterControl } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { ApplicationController.Instance.ReloadAll(); base.OnClosed(e); diff --git a/EeProm/EePromMarlinWindow.cs b/EeProm/EePromMarlinWindow.cs index 5196a6f56..c2f71255d 100644 --- a/EeProm/EePromMarlinWindow.cs +++ b/EeProm/EePromMarlinWindow.cs @@ -393,7 +393,7 @@ namespace MatterHackers.MatterControl.EeProm UiThread.RunOnIdle(Close); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); diff --git a/EeProm/EePromRepetierWindow.cs b/EeProm/EePromRepetierWindow.cs index 17cbbb998..915d1a0dd 100644 --- a/EeProm/EePromRepetierWindow.cs +++ b/EeProm/EePromRepetierWindow.cs @@ -221,7 +221,7 @@ namespace MatterHackers.MatterControl.EeProm buttonBar.AddChild(spacer); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/History/PrintHistoryDataView.cs b/History/PrintHistoryDataView.cs index df7664a80..70b8c1ef7 100644 --- a/History/PrintHistoryDataView.cs +++ b/History/PrintHistoryDataView.cs @@ -155,7 +155,7 @@ namespace MatterHackers.MatterControl.PrintHistory private EventHandler unregisterEvents; - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/History/PrintHistoryListItem.cs b/History/PrintHistoryListItem.cs index 75b7eeaec..687f3e6f1 100644 --- a/History/PrintHistoryListItem.cs +++ b/History/PrintHistoryListItem.cs @@ -387,7 +387,7 @@ namespace MatterHackers.MatterControl.PrintHistory if (partPreviewWindow == null) { partPreviewWindow = new PartPreviewMainWindow(itemWrapper, autoRotate); - partPreviewWindow.Closed += new EventHandler(PartPreviewWindow_Closed); + partPreviewWindow.Closed += PartPreviewWindow_Closed; } else { @@ -395,7 +395,7 @@ namespace MatterHackers.MatterControl.PrintHistory } } - private void PartPreviewWindow_Closed(object sender, EventArgs e) + private void PartPreviewWindow_Closed(object sender, ClosedEventArgs e) { this.partPreviewWindow = null; } @@ -410,7 +410,7 @@ namespace MatterHackers.MatterControl.PrintHistory rightButtonOverlay.SlideIn(); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/Library/LibraryDataView.cs b/Library/LibraryDataView.cs index 19db32c72..e5c5c32dd 100644 --- a/Library/LibraryDataView.cs +++ b/Library/LibraryDataView.cs @@ -223,7 +223,7 @@ namespace MatterHackers.MatterControl.PrintLibrary this.SelectedItems.Clear(); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (currentLibraryProvider != null) { diff --git a/Library/LibraryRowItem.cs b/Library/LibraryRowItem.cs index b8fffd04b..b52bb2f26 100644 --- a/Library/LibraryRowItem.cs +++ b/Library/LibraryRowItem.cs @@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl.PrintLibrary public abstract bool Protected { get; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/Library/LibraryRowItemPart.cs b/Library/LibraryRowItemPart.cs index bf720bd0c..aa60d1460 100644 --- a/Library/LibraryRowItemPart.cs +++ b/Library/LibraryRowItemPart.cs @@ -247,7 +247,7 @@ namespace MatterHackers.MatterControl.PrintLibrary printItemWrapper = await this.GetPrintItemWrapperAsync(); } viewingWindow = new PartPreviewMainWindow(printItemWrapper, View3DWidget.AutoRotate.Enabled, openMode); - viewingWindow.Closed += new EventHandler(PartPreviewMainWindow_Closed); + viewingWindow.Closed += PartPreviewMainWindow_Closed; } else { @@ -326,7 +326,7 @@ namespace MatterHackers.MatterControl.PrintLibrary libraryDataView.CurrentLibraryProvider.RemoveItem(ItemIndex); } - private void ExportQueueItemWindow_Closed(object sender, EventArgs e) + private void ExportQueueItemWindow_Closed(object sender, ClosedEventArgs e) { exportingWindow = null; } @@ -403,7 +403,7 @@ namespace MatterHackers.MatterControl.PrintLibrary if (exportingWindow == null) { exportingWindow = new ExportPrintItemWindow(await this.GetPrintItemWrapperAsync()); - exportingWindow.Closed += new EventHandler(ExportQueueItemWindow_Closed); + exportingWindow.Closed += ExportQueueItemWindow_Closed; exportingWindow.ShowAsSystemWindow(); } else @@ -417,7 +417,7 @@ namespace MatterHackers.MatterControl.PrintLibrary if (exportingWindow == null) { exportingWindow = new ExportPrintItemWindow(printItem); - exportingWindow.Closed += new EventHandler(ExportQueueItemWindow_Closed); + exportingWindow.Closed += ExportQueueItemWindow_Closed; exportingWindow.ShowAsSystemWindow(); } else @@ -445,7 +445,7 @@ namespace MatterHackers.MatterControl.PrintLibrary } } - private void PartPreviewMainWindow_Closed(object sender, EventArgs e) + private void PartPreviewMainWindow_Closed(object sender, ClosedEventArgs e) { viewingWindow = null; } diff --git a/Library/PrintLibraryWidget.cs b/Library/PrintLibraryWidget.cs index 408132f97..e5b643030 100644 --- a/Library/PrintLibraryWidget.cs +++ b/Library/PrintLibraryWidget.cs @@ -504,7 +504,7 @@ namespace MatterHackers.MatterControl.PrintLibrary private EventHandler unregisterEvents; - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (this.libraryDataView != null && this.libraryDataView.CurrentLibraryProvider != null) diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs index 8a56b1094..ecb9b29a3 100644 --- a/MatterControlApplication.cs +++ b/MatterControlApplication.cs @@ -563,7 +563,7 @@ namespace MatterHackers.MatterControl }); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { UserSettings.Instance.Fields.StartCountDurringExit = UserSettings.Instance.Fields.StartCount; diff --git a/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs b/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs index 7ee45e223..53e216f21 100644 --- a/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs +++ b/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs @@ -134,7 +134,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/PartPreviewWindow/PartPreviewContent.cs b/PartPreviewWindow/PartPreviewContent.cs index 56719737f..3e2b71adc 100644 --- a/PartPreviewWindow/PartPreviewContent.cs +++ b/PartPreviewWindow/PartPreviewContent.cs @@ -161,7 +161,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow viewGcodeBasic.Focus(); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PartPreviewWindow/PartPreviewMainWindow.cs b/PartPreviewWindow/PartPreviewMainWindow.cs index 720d10da7..63c3a2d0a 100644 --- a/PartPreviewWindow/PartPreviewMainWindow.cs +++ b/PartPreviewWindow/PartPreviewMainWindow.cs @@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.Invalidate(); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/PartPreviewWindow/View3D/Gui3D/HeightValueDisplay.cs b/PartPreviewWindow/View3D/Gui3D/HeightValueDisplay.cs index 86be5cd6f..68abb555f 100644 --- a/PartPreviewWindow/View3D/Gui3D/HeightValueDisplay.cs +++ b/PartPreviewWindow/View3D/Gui3D/HeightValueDisplay.cs @@ -51,12 +51,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow VAnchor = VAnchor.FitToChildren; HAnchor = HAnchor.FitToChildren; - MeshViewerToDrawWith.AfterDraw += new DrawEventHandler(MeshViewerToDrawWith_Draw); + MeshViewerToDrawWith.AfterDraw += MeshViewerToDrawWith_Draw; } private MeshViewerWidget MeshViewerToDrawWith { get { return view3DWidget.meshViewerWidget; } } - private void MeshViewerToDrawWith_Draw(GuiWidget drawingWidget, DrawEventArgs drawEvent) + private void MeshViewerToDrawWith_Draw(object drawingWidget, DrawEventArgs drawEvent) { if (Visible) { diff --git a/PartPreviewWindow/View3D/Gui3D/SnapingIndicator.cs b/PartPreviewWindow/View3D/Gui3D/SnapingIndicator.cs index 182ee213e..35e25f9a0 100644 --- a/PartPreviewWindow/View3D/Gui3D/SnapingIndicator.cs +++ b/PartPreviewWindow/View3D/Gui3D/SnapingIndicator.cs @@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { this.view3DWidget = view3DWidget; this.DrawOnTop = true; - MeshViewerToDrawWith.AfterDraw += new DrawEventHandler(MeshViewerToDrawWith_Draw); + MeshViewerToDrawWith.AfterDraw += MeshViewerToDrawWith_Draw; } public override void SetPosition() @@ -115,7 +115,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - private void MeshViewerToDrawWith_Draw(GuiWidget drawingWidget, DrawEventArgs drawEvent) + private void MeshViewerToDrawWith_Draw(object drawingWidget, DrawEventArgs drawEvent) { if (MeshViewerToDrawWith.SelectedMeshGroup != null && view3DWidget.meshViewerWidget.SnapGridDistance > 0 diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 039c1db19..523e36182 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -803,7 +803,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow public WindowMode windowType { get; set; } private bool DoAddFileAfterCreatingEditData { get; set; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { @@ -2199,7 +2199,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow providerLocator = printItemWrapper.SourceLibraryProviderLocator; } saveAsWindow = new SaveAsWindow(MergeAndSavePartsToNewMeshFile, providerLocator, true, true); - saveAsWindow.Closed += new EventHandler(SaveAsWindow_Closed); + saveAsWindow.Closed += SaveAsWindow_Closed; } else { @@ -2297,7 +2297,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow return true; } - private void SaveAsWindow_Closed(object sender, EventArgs e) + private void SaveAsWindow_Closed(object sender, ClosedEventArgs e) { this.saveAsWindow = null; } diff --git a/PartPreviewWindow/ViewControls3D.cs b/PartPreviewWindow/ViewControls3D.cs index f32811788..f7510e197 100644 --- a/PartPreviewWindow/ViewControls3D.cs +++ b/PartPreviewWindow/ViewControls3D.cs @@ -203,7 +203,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private EventHandler unregisterEvents; - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs index dfd89a227..1dedd1d43 100644 --- a/PartPreviewWindow/ViewGcodeBasic.cs +++ b/PartPreviewWindow/ViewGcodeBasic.cs @@ -1155,7 +1155,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { UnHookWidgetThatHasKeyDownHooked(); diff --git a/PartPreviewWindow/ViewGcodeWidget.cs b/PartPreviewWindow/ViewGcodeWidget.cs index ca156d185..d075b72b0 100644 --- a/PartPreviewWindow/ViewGcodeWidget.cs +++ b/PartPreviewWindow/ViewGcodeWidget.cs @@ -600,7 +600,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow GCodeFileLoaded.LoadInBackground(backgroundWorker, gcodePathAndFileName); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (gCodeRenderer != null) { diff --git a/PrinterCommunication/Io/BabyStepsStream.cs b/PrinterCommunication/Io/BabyStepsStream.cs index b4e67ff6d..d794ad026 100644 --- a/PrinterCommunication/Io/BabyStepsStream.cs +++ b/PrinterCommunication/Io/BabyStepsStream.cs @@ -88,5 +88,10 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io { offsetStream.Offset = new Vector3(0, 0, ActiveSliceSettings.Instance.GetValue(SettingsKey.baby_step_z_offset)); } + + public void CancelMoves() + { + maxLengthStream.Cancel(); + } } } \ No newline at end of file diff --git a/PrinterCommunication/Io/MaxLengthStream.cs b/PrinterCommunication/Io/MaxLengthStream.cs index 0daca475b..c1cb00b83 100644 --- a/PrinterCommunication/Io/MaxLengthStream.cs +++ b/PrinterCommunication/Io/MaxLengthStream.cs @@ -54,9 +54,6 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io { string lineFromChild = base.ReadLine(); - // disable this for a test - //return lineFromChild; - if (lineFromChild != null && LineIsMovement(lineFromChild)) { @@ -82,13 +79,19 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io nextPoint.feedRate = currentDestination.feedRate; for (int i = 0; i < numSegmentsToSend; i++) { - movesToSend.Add(nextPoint); + lock (movesToSend) + { + movesToSend.Add(nextPoint); + } nextPoint += deltaForSegment; } // send the first one PrinterMove positionToSend = movesToSend[0]; - movesToSend.RemoveAt(0); + lock (movesToSend) + { + movesToSend.RemoveAt(0); + } string altredLineToSend = CreateMovementLine(positionToSend, lastDestination); lastDestination = positionToSend; @@ -103,7 +106,10 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io else { PrinterMove positionToSend = movesToSend[0]; - movesToSend.RemoveAt(0); + lock (movesToSend) + { + movesToSend.RemoveAt(0); + } string lineToSend = CreateMovementLine(positionToSend, lastDestination); @@ -113,6 +119,14 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io } } + public void Cancel() + { + lock (movesToSend) + { + movesToSend.Clear(); + } + } + public override void SetPrinterPosition(PrinterMove position) { lastDestination = position; diff --git a/PrinterCommunication/Io/QueuedCommandsStream.cs b/PrinterCommunication/Io/QueuedCommandsStream.cs index 9a6c9da85..34a5331d0 100644 --- a/PrinterCommunication/Io/QueuedCommandsStream.cs +++ b/PrinterCommunication/Io/QueuedCommandsStream.cs @@ -223,8 +223,6 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io return imageBuffer; } - - return null; } diff --git a/PrinterCommunication/Io/WaitForTempStream.cs b/PrinterCommunication/Io/WaitForTempStream.cs index 7feefc400..566c3daf3 100644 --- a/PrinterCommunication/Io/WaitForTempStream.cs +++ b/PrinterCommunication/Io/WaitForTempStream.cs @@ -27,10 +27,10 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using MatterHackers.GCodeVisualizer; -using MatterHackers.VectorMath; +using System; using System.Diagnostics; using System.Threading; +using MatterHackers.GCodeVisualizer; namespace MatterHackers.MatterControl.PrinterCommunication.Io { @@ -48,6 +48,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io public WaitForTempStream(GCodeStream internalStream) : base(internalStream) { + state = State.passthrough; } private enum State @@ -56,6 +57,11 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io public bool HeatingBed { get { return state == State.waitingForBedTemp; } } public bool HeatingExtruder { get { return state == State.waitingForExtruderTemp; } } + public void Cancel() + { + state = State.passthrough; + } + public override string ReadLine() { switch (state) @@ -187,4 +193,4 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io return null; } } -} +} \ No newline at end of file diff --git a/PrinterCommunication/PrinterConnectionAndCommunication.cs b/PrinterCommunication/PrinterConnectionAndCommunication.cs index 721b567ab..35cbc44aa 100644 --- a/PrinterCommunication/PrinterConnectionAndCommunication.cs +++ b/PrinterCommunication/PrinterConnectionAndCommunication.cs @@ -2908,6 +2908,8 @@ namespace MatterHackers.MatterControl.PrinterCommunication public void MacroCancel() { + babyStepsStream6?.CancelMoves(); + waitForTempStream5?.Cancel(); queuedCommandStream2?.Cancel(); } diff --git a/PrinterControls/ControlWidgets/AdjustmentControls.cs b/PrinterControls/ControlWidgets/AdjustmentControls.cs index ace9a1fbd..b18e512fb 100644 --- a/PrinterControls/ControlWidgets/AdjustmentControls.cs +++ b/PrinterControls/ControlWidgets/AdjustmentControls.cs @@ -223,7 +223,7 @@ namespace MatterHackers.MatterControl.PrinterControls }, ref unregisterEvents); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PrinterControls/ControlWidgets/FanControls.cs b/PrinterControls/ControlWidgets/FanControls.cs index 66dbde191..df2eed45f 100644 --- a/PrinterControls/ControlWidgets/FanControls.cs +++ b/PrinterControls/ControlWidgets/FanControls.cs @@ -95,7 +95,7 @@ namespace MatterHackers.MatterControl.PrinterControls this.HAnchor = HAnchor.ParentLeftRight; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/PrinterControls/ControlWidgets/MovementControls.cs b/PrinterControls/ControlWidgets/MovementControls.cs index 57e5c7a79..c726c6ae2 100644 --- a/PrinterControls/ControlWidgets/MovementControls.cs +++ b/PrinterControls/ControlWidgets/MovementControls.cs @@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl.PrinterControls return movementSpeeds["e0"]; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); @@ -395,7 +395,7 @@ namespace MatterHackers.MatterControl.PrinterControls zOffsetStreamDisplay.Text = zoffset.ToString("0.##"); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(null, null); base.OnClosed(e); diff --git a/PrinterControls/ControlWidgets/PowerControls.cs b/PrinterControls/ControlWidgets/PowerControls.cs index 577ab005d..6f58aedf1 100644 --- a/PrinterControls/ControlWidgets/PowerControls.cs +++ b/PrinterControls/ControlWidgets/PowerControls.cs @@ -102,7 +102,7 @@ namespace MatterHackers.MatterControl.PrinterControls this.textImageButtonFactory.pressedTextColor = ActiveTheme.Instance.PrimaryTextColor; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/PrinterControls/ManualPrinterControls.cs b/PrinterControls/ManualPrinterControls.cs index c00c2205c..7c6e1eeb0 100644 --- a/PrinterControls/ManualPrinterControls.cs +++ b/PrinterControls/ManualPrinterControls.cs @@ -105,7 +105,7 @@ namespace MatterHackers.MatterControl pluginsQueuedToAdd = false; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PrinterControls/PrinterConnections/SetupStepComPortManual.cs b/PrinterControls/PrinterConnections/SetupStepComPortManual.cs index db8ac4893..ae456f985 100644 --- a/PrinterControls/PrinterConnections/SetupStepComPortManual.cs +++ b/PrinterControls/PrinterConnections/SetupStepComPortManual.cs @@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections PrinterConnectionAndCommunication.Instance.CommunicationStateChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs b/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs index 3426cfc27..34d97f2f2 100644 --- a/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs +++ b/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs @@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/PrinterControls/TemperatureIndicator.cs b/PrinterControls/TemperatureIndicator.cs index 01b4de958..bae2b0536 100644 --- a/PrinterControls/TemperatureIndicator.cs +++ b/PrinterControls/TemperatureIndicator.cs @@ -447,7 +447,7 @@ namespace MatterHackers.MatterControl tempOffButton.Click += onOffButtonClicked; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents.Invoke(this, null); base.OnClosed(e); @@ -544,7 +544,7 @@ namespace MatterHackers.MatterControl tempOffButton.Click += onOffButtonClicked; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/PrinterControls/TerminalWindow/TerminalWidget.cs b/PrinterControls/TerminalWindow/TerminalWidget.cs index dd5ef7a63..35625ffd1 100644 --- a/PrinterControls/TerminalWindow/TerminalWidget.cs +++ b/PrinterControls/TerminalWindow/TerminalWidget.cs @@ -144,8 +144,8 @@ namespace MatterHackers.MatterControl manualCommandTextEdit.Margin = new BorderDouble(right: 3); manualCommandTextEdit.HAnchor = HAnchor.ParentLeftRight; manualCommandTextEdit.VAnchor = VAnchor.ParentBottom; - manualCommandTextEdit.ActualTextEditWidget.EnterPressed += new KeyEventHandler(manualCommandTextEdit_EnterPressed); - manualCommandTextEdit.ActualTextEditWidget.KeyDown += new KeyEventHandler(manualCommandTextEdit_KeyDown); + manualCommandTextEdit.ActualTextEditWidget.EnterPressed += manualCommandTextEdit_EnterPressed; + manualCommandTextEdit.ActualTextEditWidget.KeyDown += manualCommandTextEdit_KeyDown; manualEntryLayout.AddChild(manualCommandTextEdit); } diff --git a/PrinterControls/TerminalWindow/TerminalWindow.cs b/PrinterControls/TerminalWindow/TerminalWindow.cs index e60606f50..9bb5de2f2 100644 --- a/PrinterControls/TerminalWindow/TerminalWindow.cs +++ b/PrinterControls/TerminalWindow/TerminalWindow.cs @@ -120,7 +120,7 @@ namespace MatterHackers.MatterControl UserSettings.Instance.set(TerminalWindowPositionKey, string.Format("{0},{1}", DesktopPosition.x, DesktopPosition.y)); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { SaveOnClosing(); UserSettings.Instance.Fields.SetBool(TerminalWindowLeftOpen, terminalWasOpenOnAppClose); diff --git a/PrinterControls/TerminalWindow/TextScrollWidget.cs b/PrinterControls/TerminalWindow/TextScrollWidget.cs index 3034eddf0..3c4ae0708 100644 --- a/PrinterControls/TerminalWindow/TextScrollWidget.cs +++ b/PrinterControls/TerminalWindow/TextScrollWidget.cs @@ -175,7 +175,7 @@ namespace MatterHackers.MatterControl System.IO.File.WriteAllLines(filePath, allSourceLinesTemp); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/PrinterControls/XYZJogControls.cs b/PrinterControls/XYZJogControls.cs index 02ef16bcc..a7e5628fa 100644 --- a/PrinterControls/XYZJogControls.cs +++ b/PrinterControls/XYZJogControls.cs @@ -310,7 +310,7 @@ namespace MatterHackers.MatterControl // this.HAnchor |= HAnchor.ParentLeftRight; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/Queue/OptionsMenu/QueueOptionsMenu.cs b/Queue/OptionsMenu/QueueOptionsMenu.cs index e420fe392..e9b9d325c 100644 --- a/Queue/OptionsMenu/QueueOptionsMenu.cs +++ b/Queue/OptionsMenu/QueueOptionsMenu.cs @@ -207,7 +207,7 @@ namespace MatterHackers.MatterControl.PrintQueue return true; } - private void ExportToFolderFeedbackWindow_Closed(object sender, EventArgs e) + private void ExportToFolderFeedbackWindow_Closed(object sender, ClosedEventArgs e) { this.exportingWindow = null; } @@ -232,7 +232,7 @@ namespace MatterHackers.MatterControl.PrintQueue if (exportingWindow == null) { exportingWindow = new ExportToFolderFeedbackWindow(parts.Count, parts[0].Name, ActiveTheme.Instance.PrimaryBackgroundColor); - exportingWindow.Closed += new EventHandler(ExportToFolderFeedbackWindow_Closed); + exportingWindow.Closed += ExportToFolderFeedbackWindow_Closed; exportingWindow.ShowAsSystemWindow(); } else diff --git a/Queue/QueueDataView.cs b/Queue/QueueDataView.cs index 7bbe5f2a3..9fd9ce2ae 100644 --- a/Queue/QueueDataView.cs +++ b/Queue/QueueDataView.cs @@ -257,7 +257,7 @@ namespace MatterHackers.MatterControl.PrintQueue throw new NotImplementedException(); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/Queue/QueueDataWidget.cs b/Queue/QueueDataWidget.cs index e0fd03b96..dc053cf22 100644 --- a/Queue/QueueDataWidget.cs +++ b/Queue/QueueDataWidget.cs @@ -352,7 +352,7 @@ namespace MatterHackers.MatterControl.PrintQueue } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/Queue/QueueRowItem.cs b/Queue/QueueRowItem.cs index 7a9545c42..b08ad1449 100644 --- a/Queue/QueueRowItem.cs +++ b/Queue/QueueRowItem.cs @@ -269,7 +269,7 @@ namespace MatterHackers.MatterControl.PrintQueue PrintItemWrapper.SlicingOutputMessage += PrintItem_SlicingOutputMessage; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { PrintItemWrapper.SlicingOutputMessage -= PrintItem_SlicingOutputMessage; if (unregisterEvents != null) @@ -345,7 +345,7 @@ namespace MatterHackers.MatterControl.PrintQueue viewingWindow = new PartPreviewMainWindow(this.PrintItemWrapper, View3DWidget.AutoRotate.Enabled, openMode); viewingWindow.Name = "Queue Item " + PrintItemWrapper.Name + " Part Preview"; this.viewWindowIsOpen = true; - viewingWindow.Closed += new EventHandler(PartPreviewWindow_Closed); + viewingWindow.Closed += PartPreviewWindow_Closed; } else { @@ -396,7 +396,7 @@ namespace MatterHackers.MatterControl.PrintQueue } } - private void ExportQueueItemWindow_Closed(object sender, EventArgs e) + private void ExportQueueItemWindow_Closed(object sender, ClosedEventArgs e) { this.exportingWindowIsOpen = false; } @@ -476,7 +476,7 @@ namespace MatterHackers.MatterControl.PrintQueue { exportingWindow = new ExportPrintItemWindow(this.PrintItemWrapper); this.exportingWindowIsOpen = true; - exportingWindow.Closed += new EventHandler(ExportQueueItemWindow_Closed); + exportingWindow.Closed += ExportQueueItemWindow_Closed; exportingWindow.ShowAsSystemWindow(); } else @@ -488,7 +488,7 @@ namespace MatterHackers.MatterControl.PrintQueue } } - private void PartPreviewWindow_Closed(object sender, EventArgs e) + private void PartPreviewWindow_Closed(object sender, ClosedEventArgs e) { this.viewWindowIsOpen = false; } diff --git a/SetupWizard/AndroidConnectDevicePage.cs b/SetupWizard/AndroidConnectDevicePage.cs index 4bf8c9217..f1e407f1f 100644 --- a/SetupWizard/AndroidConnectDevicePage.cs +++ b/SetupWizard/AndroidConnectDevicePage.cs @@ -195,7 +195,7 @@ namespace MatterHackers.MatterControl this.Invalidate(); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/SetupWizard/AndroidSetupOptionsPage.cs b/SetupWizard/AndroidSetupOptionsPage.cs index 9aff48523..e07c0b907 100644 --- a/SetupWizard/AndroidSetupOptionsPage.cs +++ b/SetupWizard/AndroidSetupOptionsPage.cs @@ -130,7 +130,7 @@ namespace MatterHackers.MatterControl this.Invalidate(); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); @@ -271,7 +271,7 @@ namespace MatterHackers.MatterControl this.Close(); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/SetupWizard/EditPrinterSettingsPage.cs b/SetupWizard/EditPrinterSettingsPage.cs index f2a889e41..424bd7453 100644 --- a/SetupWizard/EditPrinterSettingsPage.cs +++ b/SetupWizard/EditPrinterSettingsPage.cs @@ -93,7 +93,7 @@ namespace MatterHackers.MatterControl } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/SetupWizard/SetupWizardTroubleshooting.cs b/SetupWizard/SetupWizardTroubleshooting.cs index 1f6728ddf..8cdb109e2 100644 --- a/SetupWizard/SetupWizardTroubleshooting.cs +++ b/SetupWizard/SetupWizardTroubleshooting.cs @@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl } } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if(checkForPermissionTimer != null) { diff --git a/SetupWizard/WizardWindow.cs b/SetupWizard/WizardWindow.cs index 8d155f227..6917ad25d 100644 --- a/SetupWizard/WizardWindow.cs +++ b/SetupWizard/WizardWindow.cs @@ -113,7 +113,7 @@ namespace MatterHackers.MatterControl return wizardWindow; } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); diff --git a/SlicerConfiguration/SettingsControlSelectors.cs b/SlicerConfiguration/SettingsControlSelectors.cs index 55b557316..7b731c2a2 100644 --- a/SlicerConfiguration/SettingsControlSelectors.cs +++ b/SlicerConfiguration/SettingsControlSelectors.cs @@ -350,7 +350,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration private EventHandler unregisterEvents; - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { if (unregisterEvents != null) { diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index 6efcdb2ff..bee8ec860 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -319,7 +319,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration private EventHandler unregisterEvents; - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); @@ -678,7 +678,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration }, ref unregisterEvents); } - public override void OnClosed(EventArgs e) + public override void OnClosed(ClosedEventArgs e) { unregisterEvents?.Invoke(this, null); base.OnClosed(e); @@ -1687,7 +1687,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration totalContent.Closed += (s, e) => { - localUnregisterEvents?.Invoke(s, e); + localUnregisterEvents?.Invoke(s, null); }; return totalContent; diff --git a/StaticData/Images/Macros/TrimFilament.jpg b/StaticData/Images/Macros/TrimFilament.jpg new file mode 100644 index 000000000..b1b4d8076 Binary files /dev/null and b/StaticData/Images/Macros/TrimFilament.jpg differ diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index a08198aa9..f9832ef37 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -5893,3 +5893,33 @@ Translated:feedrate_ratio English:extrusion_ratio Translated:extrusion_ratio +English:Choose the material that you are loading. +Translated:Choose the material that you are loading. + +English:Trim the end of the filament to ensure a good load. +Translated:Trim the end of the filament to ensure a good load. + +English:Choose the material that you are loading. You are doing some stuff that takes a long description. +Translated:Choose the material that you are loading. You are doing some stuff that takes a long description. + +English:Confirm the material you are unloading. +Translated:Confirm the material you are unloading. + +English:Waiting for extruder to heat to 205, before unloading. +Translated:Waiting for extruder to heat to 205, before unloading. + +English:Unloading filament... +Translated:Unloading filament... + +English:Put filament into extruder and click Continue. +Translated:Put filament into extruder and click Continue. + +English:Loading filament... +Translated:Loading filament... + +English:Waiting for extruder to heat to 205. +Translated:Waiting for extruder to heat to 205. + +English:Click 'Continue' when filament is running cleanly. +Translated:Click 'Continue' when filament is running cleanly. + diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 2662bb283..6e42ee795 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 2662bb28359665783d511e5d79fab63dfe7f3968 +Subproject commit 6e42ee7956cbd03c727077e0968454033e105976 diff --git a/Tests/MatterControl.Tests/MatterControl/PerformanceTests.cs b/Tests/MatterControl.Tests/MatterControl/PerformanceTests.cs index fae883324..2a25a0507 100644 --- a/Tests/MatterControl.Tests/MatterControl/PerformanceTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/PerformanceTests.cs @@ -34,6 +34,7 @@ using MatterHackers.MatterControl.Tests.Automation; using System.Diagnostics; using System.Threading; using System.Threading.Tasks; +using System; namespace MatterHackers.MatterControl { @@ -50,7 +51,7 @@ namespace MatterHackers.MatterControl Stopwatch totalDrawTime = Stopwatch.StartNew(); int drawCount = 0; - DrawEventHandler beforeDraw = (sender, e) => + EventHandler beforeDraw = (sender, e) => { if (firstDraw) { @@ -82,7 +83,7 @@ namespace MatterHackers.MatterControl container.BeforeDraw += beforeDraw; - DrawEventHandler afterDraw = null; + EventHandler afterDraw = null; afterDraw = (sender, e) => { totalDrawTime.Stop(); @@ -106,7 +107,7 @@ namespace MatterHackers.MatterControl { AutomationRunner clickPreview; - DrawEventHandler beforeDraw = null; + EventHandler beforeDraw = null; beforeDraw = (sender, e) => { clickPreview = new AutomationRunner(); @@ -129,7 +130,7 @@ namespace MatterHackers.MatterControl { //To run test invoke method in the queue data widget AutomationRunner testRunner; - DrawEventHandler beforeDraw = null; + EventHandler beforeDraw = null; beforeDraw = (sender, e) => { testRunner = new AutomationRunner(); @@ -147,7 +148,7 @@ namespace MatterHackers.MatterControl public static void AddLocalLibraryItemToQueue(GuiWidget container, double secondsBetweenClicks = .1) { AutomationRunner testRunner; - DrawEventHandler beforeDraw = null; + EventHandler beforeDraw = null; beforeDraw = (sender, e) => { testRunner = new AutomationRunner(); @@ -170,7 +171,7 @@ namespace MatterHackers.MatterControl public static void RenameLibraryItem(GuiWidget container, double secondsBetweenClicks = .1) { AutomationRunner testRunner; - DrawEventHandler beforeDraw = null; + EventHandler beforeDraw = null; beforeDraw = (sender, e) => { testRunner = new AutomationRunner(); @@ -197,7 +198,7 @@ namespace MatterHackers.MatterControl public static void CreateAndRenameLocalLibraryFolder(GuiWidget container, double secondsBetweenClicks = .1) { AutomationRunner testRunner; - DrawEventHandler beforeDraw = null; + EventHandler beforeDraw = null; beforeDraw = (sender, e) => { testRunner = new AutomationRunner();