From c8ec38b32f1ba0e1d626414b174d80da4c7fbb65 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 13 Dec 2017 09:27:43 -0800 Subject: [PATCH] Revise progress reporting --- PartPreviewWindow/View3D/Actions/SubtractEditor.cs | 9 ++++++--- Submodules/agg-sharp | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/PartPreviewWindow/View3D/Actions/SubtractEditor.cs b/PartPreviewWindow/View3D/Actions/SubtractEditor.cs index f23e74067..e181e7f42 100644 --- a/PartPreviewWindow/View3D/Actions/SubtractEditor.cs +++ b/PartPreviewWindow/View3D/Actions/SubtractEditor.cs @@ -186,10 +186,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D progressStatus.Status = "Do CSG"; reporter.Report(progressStatus); - transformedKeep = PolygonMesh.Csg.CsgOperations.Subtract(transformedKeep, transformedRemove, (csgStatus) => + transformedKeep = PolygonMesh.Csg.CsgOperations.Subtract(transformedKeep, transformedRemove, (status, progress0To1) => { - progressStatus.Status = csgStatus.Status; - progressStatus.Progress0To1 = percentCompleted + amountPerOperation * csgStatus.Progress0To1; + // Abort if flagged + cancelationToken.ThrowIfCancellationRequested(); + + progressStatus.Status = status; + progressStatus.Progress0To1 = percentCompleted + amountPerOperation * progress0To1; reporter.Report(progressStatus); }, cancelationToken); if(cancelationToken.IsCancellationRequested) diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index d8ce930d7..7fcd994dd 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit d8ce930d708689064c150328ebfc01a4857f16a9 +Subproject commit 7fcd994dd2e3f904c574c6f20d2c29f4d0b833a4