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

Merge pull request #5341 from larsbrubaker/main

Browse source 
Adding holes test and fixing regression
This commit is contained in:
Lars Brubaker 2022-05-27 08:07:29 -07:00 • committed by GitHub
commit 7feeb16e94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 64 additions and 441 deletions
Download patch file Download diff file Expand all files Collapse all files

434
MatterControlLib/DesignTools/Operations/AlignObject3D_3.cs
View file

@ -1,434 +0,0 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PartPreviewWindow.View3D;
using MatterHackers.VectorMath;
using Newtonsoft.Json;
using Aabb = MatterHackers.VectorMath.AxisAlignedBoundingBox;
namespace MatterHackers.MatterControl.DesignTools.Operations
{
public class AlignObject3D_3 : OperationSourceContainerObject3D, IPropertyGridModifier, IBuildsOnThread
{
private CancellationTokenSource cancellationToken;
public AlignObject3D_3()
{
Name = "Align";
}
[ShowAsList]
[DisplayName("Anchor")]
public SelectedChildren SelectedChild { get; set; } = new SelectedChildren();
[SectionStart("X Axis"), DisplayName("Align")]
[EnumDisplay(IconPaths = new string[] { "424.png", "align_left.png", "align_center_x.png", "align_right.png", "align_origin.png" }, InvertIcons = true)]
public Align XAlign { get; set; } = Align.None;
public bool XOptions { get; set; } = false;
[DisplayName("SubAlign")]
[EnumDisplay(IconPaths = new string[] { "424.png", "align_to_right.png", "align_to_center_x.png", "align_to_left.png", "align_origin.png" }, InvertIcons = true)]
public Align XSubAlign { get; set; } = Align.None;
[DisplayName("Offset")]
[Slider(-20, 20, useSnappingGrid: true)]
public DoubleOrExpression XOffset { get; set; } = 0;
[SectionStart("Y Axis"), DisplayName("Align")]
[EnumDisplay(IconPaths = new string[] { "424.png", "align_bottom.png", "align_center_y.png", "align_top.png", "align_origin.png" }, InvertIcons = true)]
public Align YAlign { get; set; } = Align.None;
public bool YOptions { get; set; } = false;
[DisplayName("SubAlign")]
[EnumDisplay(IconPaths = new string[] { "424.png", "align_to_top.png", "align_to_center_y.png", "align_to_bottom.png", "align_origin.png" }, InvertIcons = true)]
public Align YSubAlign { get; set; } = Align.None;
[DisplayName("Offset")]
[Slider(-20, 20, useSnappingGrid: true)]
public DoubleOrExpression YOffset { get; set; } = 0;
[SectionStart("Z Axis"), DisplayName("Align")]
[EnumDisplay(IconPaths = new string[] { "424.png", "align_bottom.png", "align_center_y.png", "align_top.png", "align_origin.png" }, InvertIcons = true)]
public Align ZAlign { get; set; } = Align.None;
public bool ZOptions { get; set; } = false;
[DisplayName("SubAlign")]
[EnumDisplay(IconPaths = new string[] { "424.png", "align_to_top.png", "align_to_center_y.png", "align_to_bottom.png", "align_origin.png" }, InvertIcons = true)]
public Align ZSubAlign { get; set; } = Align.None;
[DisplayName("Offset")]
[Slider(-20, 20, useSnappingGrid: true)]
public DoubleOrExpression ZOffset { get; set; } = 0;
public override bool CanApply => true;
[JsonIgnore]
private Aabb AnchorBounds
{
get
{
var aabb = this.GetAxisAlignedBoundingBox();
if (SelectedChild.Count > 0)
{
if (Children.Where(c => SelectedChild.FirstOrDefault() == c.ID).FirstOrDefault() == null)
{
// none of our children have the selected id so clear the list
SelectedChild.Clear();
}
}
if (SelectedChild.Count == 0)
{
SelectedChild.Add(this.Children.FirstOrDefault().ID);
}
var sourceChild = this.Children.Where(c => c.ID == SelectedChild.FirstOrDefault()).FirstOrDefault();
if (sourceChild != null)
{
aabb = sourceChild.GetAxisAlignedBoundingBox();
}
return aabb;
}
}
[JsonIgnore]
private IObject3D SelectedObject
{
get
{
if (SelectedChild.Count > 0)
{
return this.Children.Where(c => c.ID == SelectedChild.FirstOrDefault()).FirstOrDefault();
}
return this.Children.FirstOrDefault();
}
}
public static Vector3 GetPositionToAlignTo(IObject3D objectToAlignTo, FaceAlign boundingFacesToAlignTo, Vector3 extraOffset)
{
var positionToAlignTo = default(Vector3);
if (IsSet(boundingFacesToAlignTo, FaceAlign.Left, FaceAlign.Right))
{
positionToAlignTo.X = objectToAlignTo.GetAxisAlignedBoundingBox().MinXYZ.X;
}
if (IsSet(boundingFacesToAlignTo, FaceAlign.Right, FaceAlign.Left))
{
positionToAlignTo.X = objectToAlignTo.GetAxisAlignedBoundingBox().MaxXYZ.X;
}
if (IsSet(boundingFacesToAlignTo, FaceAlign.Front, FaceAlign.Back))
{
positionToAlignTo.Y = objectToAlignTo.GetAxisAlignedBoundingBox().MinXYZ.Y;
}
if (IsSet(boundingFacesToAlignTo, FaceAlign.Back, FaceAlign.Front))
{
positionToAlignTo.Y = objectToAlignTo.GetAxisAlignedBoundingBox().MaxXYZ.Y;
}
if (IsSet(boundingFacesToAlignTo, FaceAlign.Bottom, FaceAlign.Top))
{
positionToAlignTo.Z = objectToAlignTo.GetAxisAlignedBoundingBox().MinXYZ.Z;
}
if (IsSet(boundingFacesToAlignTo, FaceAlign.Top, FaceAlign.Bottom))
{
positionToAlignTo.Z = objectToAlignTo.GetAxisAlignedBoundingBox().MaxXYZ.Z;
}
return positionToAlignTo + extraOffset;
}
public override async void OnInvalidate(InvalidateArgs invalidateArgs)
{
if ((invalidateArgs.InvalidateType.HasFlag(InvalidateType.Children)
|| invalidateArgs.InvalidateType.HasFlag(InvalidateType.Matrix)
|| invalidateArgs.InvalidateType.HasFlag(InvalidateType.Mesh))
&& invalidateArgs.Source != this
&& !RebuildLocked)
{
await Rebuild();
}
else if ((invalidateArgs.InvalidateType.HasFlag(InvalidateType.Properties) && invalidateArgs.Source == this))
{
await Rebuild();
}
else if (invalidateArgs.InvalidateType.HasFlag(InvalidateType.Name)
&& !NameOverriden)
{
Name = NameFromChildren();
NameOverriden = false;
base.OnInvalidate(invalidateArgs);
}
else if (SheetObject3D.NeedsRebuild(this, invalidateArgs))
{
await Rebuild();
}
else
{
// and also always pass back the actual type
base.OnInvalidate(invalidateArgs);
}
}
public bool IsBuilding => this.cancellationToken != null;
public void CancelBuild()
{
var threadSafe = this.cancellationToken;
if (threadSafe != null)
{
threadSafe.Cancel();
}
}
public override Task Rebuild()
{
this.DebugDepth("Rebuild");
return ApplicationController.Instance.Tasks.Execute(
"Combine".Localize(),
null,
(reporter, cancellationTokenSource) =>
{
this.cancellationToken = cancellationTokenSource;
using (RebuildLock())
{
RemoveAllButSource();
// reset the position
Children.Modify(list =>
{
foreach (var child in SourceContainer.Children)
{
list.Add(child.Clone());
}
});
SourceContainer.Visible = false;
this.Children.Modify(list =>
{
if (list.Count == 0)
{
return;
}
var anchorBounds = AnchorBounds;
var children = list.Where(c => c.GetType() != typeof(OperationSourceObject3D)
&& c.ID != SelectedChild.FirstOrDefault());
Align MapSubAlign(Align align)
{
switch (align)
{
case Align.Min:
return Align.Max;
case Align.Max:
return Align.Min;
default:
return align;
}
}
// align all the objects to the anchor
foreach (var child in children)
{
if (XAlign != Align.None)
{
AlignAxis(0,
(XOptions && XSubAlign != Align.None) ? MapSubAlign(XSubAlign) : XAlign,
GetSubAlignOffset(anchorBounds, 0, XAlign),
XOffset.Value(this),
child);
}
if (YAlign != Align.None)
{
AlignAxis(1,
(YOptions && YSubAlign != Align.None) ? MapSubAlign(YSubAlign) : YAlign,
GetSubAlignOffset(anchorBounds, 1, YAlign),
YOffset.Value(this),
child);
}
if (ZAlign != Align.None)
{
AlignAxis(2,
(ZOptions && ZSubAlign != Align.None) ? MapSubAlign(ZSubAlign) : ZAlign,
GetSubAlignOffset(anchorBounds, 2, ZAlign),
ZOffset.Value(this),
child);
}
}
});
if (!NameOverriden)
{
Name = NameFromChildren();
NameOverriden = false;
}
var removeItems = Children.Where(c => c.OutputType == PrintOutputTypes.Hole && c.Visible);
if (removeItems.Any())
{
var keepItems = Children.Where(c => c.OutputType != PrintOutputTypes.Hole && c.Visible);
// apply any holes before we return
var resultItems = SubtractObject3D_2.DoSubtract(this,
keepItems,
removeItems,
reporter,
cancellationToken.Token);
RemoveAllButSource();
// add back in the results of the hole removal
Children.Modify(list =>
{
foreach (var child in resultItems)
{
list.Add(child);
child.Visible = true;
}
});
}
}
this.cancellationToken = null;
UiThread.RunOnIdle(() =>
{
this.CancelAllParentBuilding();
Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Matrix));
});
return Task.CompletedTask;
});
}
public void UpdateControls(PublicPropertyChange change)
{
change.SetRowVisible(nameof(XSubAlign), () => XOptions);
change.SetRowVisible(nameof(XOffset), () => XOptions);
change.SetRowVisible(nameof(YSubAlign), () => YOptions);
change.SetRowVisible(nameof(YOffset), () => YOptions);
change.SetRowVisible(nameof(ZSubAlign), () => ZOptions);
change.SetRowVisible(nameof(ZOffset), () => ZOptions);
}
private static bool IsSet(FaceAlign variableToCheck, FaceAlign faceToCheckFor, FaceAlign faceToAssertNot)
{
if ((variableToCheck & faceToCheckFor) != 0)
{
if ((variableToCheck & faceToAssertNot) != 0)
{
throw new Exception("You cannot have both " + faceToCheckFor.ToString() + " and " + faceToAssertNot.ToString() + " set when calling Align. The are mutually exclusive.");
}
return true;
}
return false;
}
private void AlignAxis(int axis, Align align, double alignTo, double offset, IObject3D item)
{
var aabb = item.GetAxisAlignedBoundingBox();
var translate = Vector3.Zero;
switch (align)
{
case Align.Min:
translate[axis] = alignTo - aabb.MinXYZ[axis] + offset;
break;
case Align.Center:
translate[axis] = alignTo - aabb.Center[axis] + offset;
break;
case Align.Max:
translate[axis] = alignTo - aabb.MaxXYZ[axis] + offset;
break;
case Align.Origin:
// find the origin in world space of the item
var itemOrigin = Vector3Ex.Transform(Vector3.Zero, item.WorldMatrix(this));
translate[axis] = alignTo - itemOrigin[axis] + offset;
break;
}
item.Translate(translate);
}
private double GetSubAlignOffset(Aabb anchorBounds, int axis, Align alignTo)
{
switch (alignTo)
{
case Align.None:
return 0;
case Align.Min:
return anchorBounds.MinXYZ[axis];
case Align.Center:
return anchorBounds.Center[axis];
case Align.Max:
return anchorBounds.MaxXYZ[axis];
case Align.Origin:
return Vector3Ex.Transform(Vector3.Zero, SelectedObject.WorldMatrix(this))[axis];
default:
throw new NotImplementedException();
}
}
public string NameFromChildren()
{
return CalculateName(this.Children, ", ");
}
}
}

2
MatterControlLib/DesignTools/Operations/GroupObject3D.cs
View file

@ -93,7 +93,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
{
var selections = new SelectedChildren();
foreach(var child in SourceContainer.FirstWithMultipleChildrenDescendantsAndSelf().Children.Where(i => i.OutputType == PrintOutputTypes.Hole && !(i is OperationSourceObject3D) ))
foreach(var child in SourceContainer.FirstWithMultipleChildrenDescendantsAndSelf().Children.Where(i => i.WorldOutputType(SourceContainer) == PrintOutputTypes.Hole && !(i is OperationSourceObject3D) ))
{
selections.Add(child.ID);
}

6
MatterControlLib/DesignTools/Primitives/OperationSourceContainerObject3D.cs
View file

@ -332,15 +332,15 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
public bool ApplyHoles(IProgress<ProgressStatus> reporter,
CancellationToken cancellationToken)
{
var removeItems = Children.Where(c => c.OutputType == PrintOutputTypes.Hole && c.Visible);
var removeItems = Children.Where(c => c.WorldOutputType(SourceContainer) == PrintOutputTypes.Hole && c.Visible);
if (removeItems.Any())
{
var keepItems = Children.Where(c => c.OutputType != PrintOutputTypes.Hole && c.Visible);
var keepItems = Children.Where(c => c.WorldOutputType(SourceContainer) != PrintOutputTypes.Hole && c.Visible);
if (keepItems.Any())
{
// apply any holes before we return
var resultItems = SubtractObject3D_2.DoSubtract(this,
var resultItems = SubtractObject3D_2.DoSubtract(SourceContainer,
keepItems,
removeItems,
reporter,

7
MatterControlLib/PartPreviewWindow/View3D/Actions/CombineObject3D_2.cs
View file

@ -129,10 +129,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
SourceContainer.Visible = true;
RemoveAllButSource();
var holes = SourceContainer.VisibleMeshes().Where(m => m.OutputType == PrintOutputTypes.Hole);
var holes = SourceContainer.VisibleMeshes().Where(m => m.WorldOutputType(SourceContainer) == PrintOutputTypes.Hole);
Mesh resultsMesh = null;
var participants = SourceContainer.VisibleMeshes().Where(m => m.OutputType != PrintOutputTypes.Hole);
var participants = SourceContainer.VisibleMeshes().Where(m => m.WorldOutputType(SourceContainer) != PrintOutputTypes.Hole);
if (participants.Count() == 0)
{
if (holes.Count() == 0)
@ -157,7 +157,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
var holesItem = new Object3D()
{
Mesh = holesMesh
Mesh = holesMesh,
OutputType = PrintOutputTypes.Hole
};
if (resultsMesh != null)

56
Tests/MatterControl.Tests/MatterControl/InteractiveSceneTests.cs
View file

@ -325,6 +325,62 @@ namespace MatterControl.Tests.MatterControl
}
}
[Test, Category("InteractiveScene")]
public async Task HoleTests()
{
StartupMC();
// Subtract has correct number of results with combine
{
var root = new Object3D();
var cubeA1 = await CubeObject3D.Create(20, 20, 20);
var cubeA2 = await CubeObject3D.Create(20, 20, 20);
var cubeB = await CubeObject3D.Create(20, 20, 20);
var offsetCubeB = new TranslateObject3D(cubeB, 0, 10);
var align = new AlignObject3D_2();
align.Children.Add(cubeA1);
align.Children.Add(cubeA2);
align.OutputType = PrintOutputTypes.Hole;
await align.Rebuild();
var combine = new CombineObject3D_2();
combine.Children.Add(align);
combine.Children.Add(offsetCubeB);
root.Children.Add(combine);
await combine.Rebuild();
Assert.AreEqual(1, root.Children.Count());
var rootAabb = root.GetAxisAlignedBoundingBox();
Assert.AreEqual(10, rootAabb.YSize, .001);
}
// Subtract has correct number of results with group
{
var root = new Object3D();
var cubeA1 = await CubeObject3D.Create(20, 20, 20);
var cubeA2 = await CubeObject3D.Create(20, 20, 20);
var cubeB = await CubeObject3D.Create(20, 20, 20);
var offsetCubeB = new TranslateObject3D(cubeB, 0, 10);
var align = new AlignObject3D_2();
align.Children.Add(cubeA1);
align.Children.Add(cubeA2);
align.OutputType = PrintOutputTypes.Hole;
await align.Rebuild();
var combine = new GroupHolesAppliedObject3D();
combine.Children.Add(align);
combine.Children.Add(offsetCubeB);
root.Children.Add(combine);
await combine.Rebuild();
Assert.AreEqual(1, root.Children.Count());
var rootAabb = root.GetAxisAlignedBoundingBox();
Assert.AreEqual(10, rootAabb.YSize, .001);
}
}
[Test, Category("InteractiveScene")]
public async Task AabbCalculatedCorrectlyForPinchedFitObjects()
{