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

Use new FindDescendants syntax

Browse source
This commit is contained in:
John Lewin 2018-12-30 08:17:01 -08:00
parent af142f6992
commit 5d109d4980
3 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

50
MatterControlLib/PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -333,7 +333,7 @@ namespace MatterHackers.MeshVisualizer
base.OnClosed(e);
}
public override List<WidgetAndPosition> FindDescendants(string nameToSearchFor, List<WidgetAndPosition> foundChildren, RectangleDouble touchingBounds, SearchType seachType, bool allowInvalidItems = true)
public override List<WidgetAndPosition> FindDescendants(IEnumerable<string> namesToSearchFor, List<WidgetAndPosition> foundChildren, RectangleDouble touchingBounds, SearchType seachType, bool allowInvalidItems = true)
{
foreach (InteractionVolume child in interactionLayer.InteractionVolumes)
{
@ -341,19 +341,24 @@ namespace MatterHackers.MeshVisualizer
bool nameFound = false;
if (seachType == SearchType.Exact)
foreach (var nameToSearchFor in namesToSearchFor)
{
if (object3DName == nameToSearchFor)
if (seachType == SearchType.Exact)
{
nameFound = true;
if (object3DName == nameToSearchFor)
{
nameFound = true;
break;
}
}
}
else
{
if (nameToSearchFor == ""
|| object3DName.Contains(nameToSearchFor))
else
{
nameFound = true;
if (nameToSearchFor == ""
|| object3DName.Contains(nameToSearchFor))
{
nameFound = true;
break;
}
}
}
@ -391,19 +396,24 @@ namespace MatterHackers.MeshVisualizer
bool nameFound = false;
if (seachType == SearchType.Exact)
foreach (var nameToSearchFor in namesToSearchFor)
{
if (object3DName == nameToSearchFor)
if (seachType == SearchType.Exact)
{
nameFound = true;
if (object3DName == nameToSearchFor)
{
nameFound = true;
break;
}
}
}
else
{
if (nameToSearchFor == ""
|| object3DName.Contains(nameToSearchFor))
else
{
nameFound = true;
if (nameToSearchFor == ""
|| object3DName.Contains(nameToSearchFor))
{
nameFound = true;
break;
}
}
}
@ -429,7 +439,7 @@ namespace MatterHackers.MeshVisualizer
}
}
return base.FindDescendants(nameToSearchFor, foundChildren, touchingBounds, seachType, allowInvalidItems);
return base.FindDescendants(namesToSearchFor, foundChildren, touchingBounds, seachType, allowInvalidItems);
}
public static Color GetExtruderColor(int extruderIndex)