nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revise progress reporting

Browse source
This commit is contained in:
John Lewin 2017-12-13 09:27:43 -08:00
parent 03ef7e5655
commit c8ec38b32f
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
PartPreviewWindow/View3D/Actions/SubtractEditor.cs
View file

@ -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)

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit d8ce930d708689064c150328ebfc01a4857f16a9
Subproject commit 7fcd994dd2e3f904c574c6f20d2c29f4d0b833a4