elias/OSCADSharpDotnet7
1
0
Fork 0
mirror of https://github.com/eliasstepanik/OSCADSharpDotnet7.git synced 2026-01-25 20:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added optional recursive flag to Children() to allow selection of immediate children instead of all descendants.

Browse Source
This commit is contained in:
Michael Smith 2016-02-21 20:27:56 -08:00
parent 511cb45b6f
commit 96693e062b
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs
View File

@ -122,5 +122,19 @@ namespace OSCADSharp.UnitTests
Assert.AreEqual("Cube", children[4].Name); Assert.AreEqual("Cube", children[4].Name);
Assert.AreEqual("Sphere", children[1].Name); Assert.AreEqual("Sphere", children[1].Name);
} }
[TestMethod]
public void OSCADObject_ChildrenWithRecursiveFalseReturnsOnlyDirectChildren()
{
var firstLevel = new Sphere().Union(new Cube(), new Sphere(), new Cylinder());
firstLevel.Name = "Union";
var secondLevel = new Text3D() { Name = "Text" }.Difference(firstLevel);
var children = secondLevel.Children(false).ToList();
Assert.AreEqual("Text", children[0].Name);
Assert.AreEqual("Union", children[1].Name);
}
} }
} }

12
OSCADSharp/OSCADSharp/OSCADObject.cs
View File

@ -266,13 +266,19 @@ namespace OSCADSharp
/// Internal collection of children for this object /// Internal collection of children for this object
/// </summary> /// </summary>
protected List<OSCADObject> children = new List<OSCADObject>(); protected List<OSCADObject> children = new List<OSCADObject>();
/// <summary> /// <summary>
/// Returns all children of this OSCADObject /// Returns all chidren of this OSCADObject
/// </summary> /// </summary>
/// <param name="recursive">If true, returns all descendants. If false, returns only direct children.</param>
/// <returns></returns> /// <returns></returns>
public IEnumerable<OSCADObject> Children() public IEnumerable<OSCADObject> Children(bool recursive = true)
{ {
if(recursive == false)
{
return new List<OSCADObject>(this.children);
}
// Initial children are reversed here because for objects with multiple children (such as boolean operations) // Initial children are reversed here because for objects with multiple children (such as boolean operations)
// the natural collection order would yield opposite the expected order in a stack (first child would be the last popped) // the natural collection order would yield opposite the expected order in a stack (first child would be the last popped)
Stack<OSCADObject> toTraverse = new Stack<OSCADObject>(this.children.Reverse<OSCADObject>()); Stack<OSCADObject> toTraverse = new Stack<OSCADObject>(this.children.Reverse<OSCADObject>());