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

Writing tests for Combine and Subtract

Browse source
This commit is contained in:
Lars Brubaker 2018-12-20 14:22:19 -08:00
parent 28bf9c44d3
commit e0a9ab1526
5 changed files with 155 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

24
MatterControlLib/PartPreviewWindow/View3D/Actions/CombineObject3D.cs
View file

@ -72,7 +72,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
private void Rebuild(UndoBuffer undoBuffer)
{
var rebuildLock = RebuildLock();
ResetMeshWrapperMeshes(Object3DPropertyFlags.All, CancellationToken.None);
// spin up a task to remove holes from the objects in the group
ApplicationController.Instance.Tasks.Execute(
@ -83,14 +82,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
var progressStatus = new ProgressStatus();
reporter.Report(progressStatus);
var participants = this.Descendants().Where(o => o.OwnerID == this.ID).ToList();
try
{
if (participants.Count() > 1)
{
Combine(participants, cancellationToken, reporter);
}
Combine(cancellationToken, reporter);
}
catch
{
@ -106,13 +100,21 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
});
}
public static void Combine(List<IObject3D> participants)
public void Combine()
{
Combine(participants, CancellationToken.None, null);
Combine(CancellationToken.None, null);
}
public static void Combine(List<IObject3D> participants, CancellationToken cancellationToken, IProgress<ProgressStatus> reporter)
public void Combine(CancellationToken cancellationToken, IProgress<ProgressStatus> reporter)
{
ResetMeshWrapperMeshes(Object3DPropertyFlags.All, cancellationToken);
var participants = this.Descendants().Where(o => o.OwnerID == this.ID).ToList();
if (participants.Count() < 2)
{
return;
}
var first = participants.First();
var totalOperations = participants.Count() - 1;
@ -140,7 +142,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
percentCompleted += amountPerOperation;
progressStatus.Progress0To1 = percentCompleted;
reporter.Report(progressStatus);
reporter?.Report(progressStatus);
}
}
}