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

Don't call ExandedChianged twice in TreeView

Browse source 
Let MeshWrapper call GetAxisAl/ignedBoundingBox from base
This commit is contained in:
Lars Brubaker 2018-12-17 16:12:11 -08:00
parent 94e6d461e0
commit 7743a34a87
3 changed files with 1 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MatterControlLib/CustomWidgets/TreeView/TreeNode.cs
View file

@ -91,7 +91,6 @@ namespace MatterHackers.MatterControl.CustomWidgets
expandWidget.Click += (s, e) =>
{
this.Expanded = !this.Expanded;
this.ExpandedChanged?.Invoke(this, null);
expandWidget.Expanded = this.Expanded;
};

28
MatterControlLib/PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs
View file

@ -73,34 +73,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
base.Flatten(undoBuffer);
}
/// <summary>
/// MeshWrapperObject3D overrides GetAabb so that it can only check the geometry that it has created
/// </summary>
/// <param name="matrix"></param>
/// <returns></returns>
public override AxisAlignedBoundingBox GetAxisAlignedBoundingBox(Matrix4X4 matrix)
{
AxisAlignedBoundingBox totalBounds = AxisAlignedBoundingBox.Empty();
// This needs to be Descendants because we need to move past the first visible mesh to our owned objects
foreach (var child in this.Descendants().Where(i => i.OwnerID == this.ID && i.Visible))
{
var childMesh = child.Mesh;
if (childMesh != null)
{
// Add the bounds of each child object
var childBounds = childMesh.GetAxisAlignedBoundingBox(child.WorldMatrix(this) * matrix);
// Check if the child actually has any bounds
if (childBounds.XSize > 0)
{
totalBounds += childBounds;
}
}
}
return totalBounds;
}
public IEnumerable<(IObject3D original, IObject3D meshCopy)> WrappedObjects()
{
return this.Descendants()

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit c0dd75b189ef909264a736e7d9db9eca67a0c333
Subproject commit 7025350cc177646c67ec926ee0ca7a7f914d63be