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

Make subtract and subtract and replace us ID rather than Name

Browse source
This commit is contained in:
LarsBrubaker 2019-05-18 06:55:57 -07:00
parent c345be9b76
commit 6278622f46
4 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D_2.cs
View file

@ -65,7 +65,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
var paintObjects = parentOfPaintTargets.Children
.Where((i) => SelectedChildren
.Contains(i.Name))
.Contains(i.ID))
.SelectMany(c => c.VisibleMeshes())
.ToList();
@ -76,12 +76,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
var keepObjects = parentOfPaintTargets.Children
.Where((i) => !SelectedChildren
.Contains(i.Name))
.Contains(i.ID))
.ToList();
foreach (var keepItem in keepObjects)
{
var isPaintChild = this.Children.Where(i => i.Name == keepItem.Name).FirstOrDefault() != null;
var isPaintChild = this.Children.Where(i => i.ID == keepItem.ID).FirstOrDefault() != null;
foreach (var item in keepItem.VisibleMeshes())
{
if (isPaintChild)
@ -175,13 +175,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
var paintObjects = parentOfPaintTargets.Children
.Where((i) => SelectedChildren
.Contains(i.Name))
.Contains(i.ID))
.SelectMany(c => c.VisibleMeshes())
.ToList();
var keepItems = parentOfPaintTargets.Children
.Where((i) => !SelectedChildren
.Contains(i.Name));
.Contains(i.ID));
var keepVisibleItems = keepItems.SelectMany(c => c.VisibleMeshes()).ToList();

12
MatterControlLib/PartPreviewWindow/View3D/Actions/SubtractObject3D_2.cs
View file

@ -64,7 +64,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
var removeObjects = parentOfSubtractTargets.Children
.Where((i) => SelectedChildren
.Contains(i.Name))
.Contains(i.ID))
.SelectMany(c => c.VisibleMeshes())
.ToList();
@ -75,12 +75,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
var keepObjects = parentOfSubtractTargets.Children
.Where((i) => !SelectedChildren
.Contains(i.Name))
.Contains(i.ID))
.ToList();
foreach (var keepItem in keepObjects)
{
var isSubtractChild = this.Children.Where(i => i.Name == keepItem.Name).FirstOrDefault() != null;
var isSubtractChild = this.Children.Where(i => i.ID == keepItem.ID).FirstOrDefault() != null;
foreach (var keepVisibleItem in keepItem.VisibleMeshes())
{
if (isSubtractChild)
@ -181,13 +181,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
var removeVisibleItems = parentOfSubtractTargets.Children
.Where((i) => SelectedChildren
.Contains(i.Name))
.Contains(i.ID))
.SelectMany(c => c.VisibleMeshes())
.ToList();
var keepItems = parentOfSubtractTargets.Children
.Where((i) => !SelectedChildren
.Contains(i.Name));
.Contains(i.ID));
var keepVisibleItems = keepItems.SelectMany(c => c.VisibleMeshes()).ToList();
@ -267,7 +267,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
var parentOfSubtractTargets = item.DescendantsAndSelfMultipleChildrenFirstOrSelf();
var allVisibleNames = parentOfSubtractTargets.Children.Select(i => i.Name);
var allVisibleNames = parentOfSubtractTargets.Children.Select(i => i.ID);
// remove any names from SelectedChildren that are not a child we can select
foreach (var name in selectableChildContainer.SelectedChildren.ToArray())
{