Allow tree.select(BRepElement)

aothms · aothms · commit e0e8281a1e92 · 2021-11-07T19:49:37.000+01:00
diff --git a/src/ifcgeom/IfcGeomTree.h b/src/ifcgeom/IfcGeomTree.h
@@ -224,6 +224,12 @@ namespace IfcGeom {
 				return ts_filtered;
 			}
 
+			std::vector<T> select(const IfcGeom::BRepElement* elem, bool completely_within = false, double extend = -1.e-5) const {
+				auto compound = elem->geometry().as_compound();
+				compound.Move(elem->transformation().data());
+				return select(compound, completely_within, extend);
+			}
+
 			std::vector<T> select(const gp_Pnt& p, double extend=0.0) const {
 				distances_.clear();
 
diff --git a/src/ifcopenshell-python/ifcopenshell/geom/main.py b/src/ifcopenshell-python/ifcopenshell/geom/main.py
@@ -146,7 +146,7 @@ def unwrap(value):
             return value
 
         args = [self, unwrap(value)]
-        if isinstance(value, entity_instance):
+        if isinstance(value, (entity_instance, ifcopenshell_wrapper.BRepElement)):
             args.append(kwargs.get("completely_within", False))
             if "extend" in kwargs:
                 args.append(kwargs["extend"])
diff --git a/src/ifcwrap/IfcGeomWrapper.i b/src/ifcwrap/IfcGeomWrapper.i
@@ -127,6 +127,11 @@
 		return IfcGeom_tree_vector_to_list(ps);
 	}
 
+	aggregate_of_instance::ptr select(const IfcGeom::BRepElement* elem, bool completely_within = false, double extend = -1.e-5) const {
+		std::vector<IfcUtil::IfcBaseEntity*> ps = $self->select(elem, completely_within, extend);
+		return IfcGeom_tree_vector_to_list(ps);
+	}
+
 }
 
 // A visitor

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,11 @@`
`127`	`127`	`return IfcGeom_tree_vector_to_list(ps);`
`128`	`128`	`}`
`129`	`129`
	`130`	`+ aggregate_of_instance::ptr select(const IfcGeom::BRepElement* elem, bool completely_within = false, double extend = -1.e-5) const {`
	`131`	`+ std::vector<IfcUtil::IfcBaseEntity*> ps = $self->select(elem, completely_within, extend);`
	`132`	`+ return IfcGeom_tree_vector_to_list(ps);`
	`133`	`+ }`
	`134`	`+`
`130`	`135`	`}`
`131`	`136`
`132`	`137`	`// A visitor`