diff --git a/PartPreviewWindow/GcodeViewBasic.cs b/PartPreviewWindow/GcodeViewBasic.cs index 8320dd03d..43cc3796b 100644 --- a/PartPreviewWindow/GcodeViewBasic.cs +++ b/PartPreviewWindow/GcodeViewBasic.cs @@ -629,6 +629,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow void sliceItem_Done(object sender, EventArgs e) { + // We can add this while we have it open (when we are done loading). + // So we need to make sure we only have it added once. This will be ok to run when + // not added or when added and will ensure we only have one hook. + printItem.SlicingOutputMessage -= sliceItem_SlicingOutputMessage; + printItem.Done -= sliceItem_Done; + UiThread.RunOnIdle(CreateAndAddChildren); startedSliceFromGenerateButton = false; } diff --git a/PartPreviewWindow/View3DTransfromPart.cs b/PartPreviewWindow/View3DTransfromPart.cs index 9f63c9a9e..c6e91fdf0 100644 --- a/PartPreviewWindow/View3DTransfromPart.cs +++ b/PartPreviewWindow/View3DTransfromPart.cs @@ -69,11 +69,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow : base(hAnchor, vAnchor) { } - - public override void OnMouseMove(MouseEventArgs mouseEvent) - { - base.OnMouseMove(mouseEvent); - } } public class View3DTransformPart : PartPreviewBaseWidget diff --git a/PrintQueue/ExportToFolderProcess.cs b/PrintQueue/ExportToFolderProcess.cs index 835077283..5ff047e95 100644 --- a/PrintQueue/ExportToFolderProcess.cs +++ b/PrintQueue/ExportToFolderProcess.cs @@ -101,6 +101,7 @@ namespace MatterHackers.MatterControl.PrintQueue PrintItemWrapper sliceItem = (PrintItemWrapper)sender; sliceItem.Done -= new EventHandler(sliceItem_Done); + sliceItem.SlicingOutputMessage -= printItemWrapper_SlicingOutputMessage; savedGCodeFileNames.Add(sliceItem.GCodePathAndFileName); itemCountBeingWorkedOn++; diff --git a/PrintQueue/PrintQueueControl.cs b/PrintQueue/PrintQueueControl.cs index a9e43c8c3..3055d2415 100644 --- a/PrintQueue/PrintQueueControl.cs +++ b/PrintQueue/PrintQueueControl.cs @@ -580,28 +580,6 @@ namespace MatterHackers.MatterControl.PrintQueue } } - public override void OnDraw(Graphics2D graphics2D) - { - //activeView.OnDraw(graphics2D); - - base.OnDraw(graphics2D); - } - - public override void OnMouseDown(MouseEventArgs mouseEvent) - { - base.OnMouseDown(mouseEvent); - } - - public override void OnMouseUp(MouseEventArgs mouseEvent) - { - base.OnMouseUp(mouseEvent); - } - - public override void OnMouseMove(MouseEventArgs mouseEvent) - { - base.OnMouseMove(mouseEvent); - } - public void ClearSelected() { if (selectedIndex != -1) diff --git a/PrintQueue/PrintQueueItem.cs b/PrintQueue/PrintQueueItem.cs index 10931edb4..c00ace4b4 100644 --- a/PrintQueue/PrintQueueItem.cs +++ b/PrintQueue/PrintQueueItem.cs @@ -279,6 +279,7 @@ namespace MatterHackers.MatterControl.PrintQueue public override void OnClosed(EventArgs e) { + PrintItemWrapper.SlicingOutputMessage -= PrintItem_SlicingOutputMessage; if (unregisterEvents != null) { unregisterEvents(this, null); diff --git a/PrinterCommunication/PrinterCommunication.cs b/PrinterCommunication/PrinterCommunication.cs index a851b7eeb..bd6329279 100644 --- a/PrinterCommunication/PrinterCommunication.cs +++ b/PrinterCommunication/PrinterCommunication.cs @@ -1614,14 +1614,14 @@ namespace MatterHackers.MatterControl { if (printerCommandQueueIndex == loadedGCode.GCodeCommandQueue.Count) { - printJobDisplayName = null; + CommunicationState = CommunicationStates.FinishedPrint; + printJobDisplayName = null; + // never leave the extruder and the bed hot ReleaseMotors(); TargetExtruderTemperature = 0; - TargetBedTemperature = 0; - - CommunicationState = CommunicationStates.FinishedPrint; + TargetBedTemperature = 0; } else if (!PrinterIsPaused) { diff --git a/StaticData/PrinterSettings/RoBo 3D/RoBo 3D ABS/config.ini b/StaticData/PrinterSettings/RoBo 3D/RoBo 3D ABS/config.ini index d01bda6a7..9674f4be6 100644 --- a/StaticData/PrinterSettings/RoBo 3D/RoBo 3D ABS/config.ini +++ b/StaticData/PrinterSettings/RoBo 3D/RoBo 3D ABS/config.ini @@ -100,7 +100,7 @@ support_material_interface_spacing = 0 support_material_pattern = rectilinear support_material_spacing = 3 support_material_speed = 60 -support_material_threshold = 30 +support_material_threshold = 40 temperature = 215 threads = 2 toolchange_gcode = diff --git a/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Heated Bed/config.ini b/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Heated Bed/config.ini index 796631730..9941c7a26 100644 --- a/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Heated Bed/config.ini +++ b/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Heated Bed/config.ini @@ -100,7 +100,7 @@ support_material_interface_spacing = 0 support_material_pattern = rectilinear support_material_spacing = 3 support_material_speed = 60 -support_material_threshold = 30 +support_material_threshold = 40 temperature = 185 threads = 2 toolchange_gcode = diff --git a/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Unheated Bed/config.ini b/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Unheated Bed/config.ini index bf494cae2..5da89e45d 100644 --- a/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Unheated Bed/config.ini +++ b/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Unheated Bed/config.ini @@ -100,7 +100,7 @@ support_material_interface_spacing = 0 support_material_pattern = rectilinear support_material_spacing = 3 support_material_speed = 60 -support_material_threshold = 30 +support_material_threshold = 40 temperature = 185 threads = 2 toolchange_gcode = diff --git a/ToolsPage/ToolsListControl.cs b/ToolsPage/ToolsListControl.cs index 9a564bcfb..21388d45a 100644 --- a/ToolsPage/ToolsListControl.cs +++ b/ToolsPage/ToolsListControl.cs @@ -514,28 +514,6 @@ namespace MatterHackers.MatterControl.ToolsPage } } - public override void OnDraw(Graphics2D graphics2D) - { - //activeView.OnDraw(graphics2D); - - base.OnDraw(graphics2D); - } - - public override void OnMouseDown(MouseEventArgs mouseEvent) - { - base.OnMouseDown(mouseEvent); - } - - public override void OnMouseUp(MouseEventArgs mouseEvent) - { - base.OnMouseUp(mouseEvent); - } - - public override void OnMouseMove(MouseEventArgs mouseEvent) - { - base.OnMouseMove(mouseEvent); - } - public void ClearSelected() { if (selectedIndex != -1)