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

Make sure array does not move the source object

Browse source 
issue:
MatterHackers/MCCentral#6107
array should not move the initial object
This commit is contained in:
LarsBrubaker 2020-10-07 08:03:57 -07:00
parent d21d425fc6
commit f01914f1b1
2 changed files with 62 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

41
MatterControlLib/DesignTools/Operations/ArrayLinearObject3D.cs
View file

@ -38,10 +38,6 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.DesignTools.Operations
{
public abstract class ArrayObject3D : OperationSourceContainerObject3D
{
public abstract int Count { get; set; }
}
public class ArrayLinearObject3D : ArrayObject3D
{
@ -70,29 +66,26 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
{
this.DebugDepth("Rebuild");
using (new CenterAndHeightMaintainer(this))
var newChildren = new List<IObject3D>();
newChildren.Add(SourceContainer);
var arrayItem = SourceContainer.Children.First();
// add in all the array items
for (int i = 0; i < Math.Max(Count, 1); i++)
{
var newChildren = new List<IObject3D>();
newChildren.Add(SourceContainer);
var arrayItem = SourceContainer.Children.First();
// add in all the array items
for (int i = 0; i < Math.Max(Count, 1); i++)
{
var next = arrayItem.Clone();
next.Matrix = arrayItem.Matrix * Matrix4X4.CreateTranslation(Direction.Normal.GetNormal() * Distance * i);
newChildren.Add(next);
}
Children.Modify(list =>
{
list.Clear();
list.AddRange(newChildren);
});
var next = arrayItem.Clone();
next.Matrix = arrayItem.Matrix * Matrix4X4.CreateTranslation(Direction.Normal.GetNormal() * Distance * i);
newChildren.Add(next);
}
Children.Modify(list =>
{
list.Clear();
list.AddRange(newChildren);
});
SourceContainer.Visible = false;
rebuildLock.Dispose();
Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Children));