From 37dcb9222048664666233692c7e148e92b022d87 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Tue, 22 Aug 2023 11:31:18 +1000 Subject: [PATCH] Drawing include/exclude filters now use the new facet selector syntax --- src/blenderbim/blenderbim/tool/drawing.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/blenderbim/blenderbim/tool/drawing.py b/src/blenderbim/blenderbim/tool/drawing.py index 903794d4fa..008e1667a8 100644 --- a/src/blenderbim/blenderbim/tool/drawing.py +++ b/src/blenderbim/blenderbim/tool/drawing.py @@ -1504,7 +1504,7 @@ class Drawing(blenderbim.core.tool.Drawing): elements = cls.get_elements_in_camera_view(tool.Ifc.get_object(drawing), bpy.data.objects) include = pset.get("Include", None) if include: - elements = set(ifcopenshell.util.selector.Selector.parse(ifc_file, include, elements=elements)) + elements = set(ifcopenshell.util.selector.filter_elements(ifc_file, include, elements=elements)) else: if tool.Ifc.get_schema() == "IFC2X3": base_elements = set(ifc_file.by_type("IfcElement") + ifc_file.by_type("IfcSpatialStructureElement")) @@ -1516,7 +1516,7 @@ class Drawing(blenderbim.core.tool.Drawing): exclude = pset.get("Exclude", None) if exclude: - elements -= set(ifcopenshell.util.selector.Selector.parse(ifc_file, exclude, elements=elements)) + elements -= set(ifcopenshell.util.selector.filter_elements(ifc_file, exclude, elements=elements)) elements -= set(ifc_file.by_type("IfcOpeningElement")) return elements @@ -1529,10 +1529,10 @@ class Drawing(blenderbim.core.tool.Drawing): tool.Ifc.get_object(drawing), [tool.Ifc.get_object(e) for e in ifc_file.by_type("IfcSpace")] ) if include: - elements = set(ifcopenshell.util.selector.Selector.parse(ifc_file, include, elements=elements)) + elements = set(ifcopenshell.util.selector.filter_elements(ifc_file, include, elements=elements)) exclude = pset.get("Exclude", None) if exclude: - elements -= set(ifcopenshell.util.selector.Selector.parse(ifc_file, exclude, elements=elements)) + elements -= set(ifcopenshell.util.selector.filter_elements(ifc_file, exclude, elements=elements)) return elements @classmethod