Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-26 18:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drawing include/exclude filters now use the new facet selector syntax

Browse Source
This commit is contained in:
Dion Moult
2023-08-22 11:31:18 +10:00
parent 6c43c60d04
commit 37dcb92220
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/tool/drawing.py
+4 -4
View File
@@ -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) elements = cls.get_elements_in_camera_view(tool.Ifc.get_object(drawing), bpy.data.objects)
include = pset.get("Include", None) include = pset.get("Include", None)
if include: 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: else:
if tool.Ifc.get_schema() == "IFC2X3": if tool.Ifc.get_schema() == "IFC2X3":
base_elements = set(ifc_file.by_type("IfcElement") + ifc_file.by_type("IfcSpatialStructureElement")) 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) exclude = pset.get("Exclude", None)
if exclude: 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")) elements -= set(ifc_file.by_type("IfcOpeningElement"))
return elements 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")] tool.Ifc.get_object(drawing), [tool.Ifc.get_object(e) for e in ifc_file.by_type("IfcSpace")]
) )
if include: 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) exclude = pset.get("Exclude", None)
if exclude: 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 return elements
@classmethod @classmethod