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

Fix #1382. You can now search property values agnostic of pset names. Thanks stefkeB!

Browse Source
This commit is contained in:
Dion Moult
2021-06-06 20:55:25 +10:00
parent cfd5742b5b
commit ed316ba691
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/search/operator.py
+14 -4
View File
@@ -111,11 +111,16 @@ class SelectPset(bpy.types.Operator):
continue continue
element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id) element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
psets = ifcopenshell.util.element.get_psets(element) psets = ifcopenshell.util.element.get_psets(element)
if search_pset_name == "":
props = {}
[props.update(p) for p in psets.values()]
else:
props = None
if context.scene.BIMSearchProperties.should_ignorecase: if context.scene.BIMSearchProperties.should_ignorecase:
props = next((v for k, v in psets.items() if k.lower() == search_pset_name.lower()), {}) props = props or next((v for k, v in psets.items() if k.lower() == search_pset_name.lower()), {})
value = str(next((v for k, v in props.items() if k.lower() == search_prop_name.lower()), None)) value = str(next((v for k, v in props.items() if k.lower() == search_prop_name.lower()), None))
else: else:
props = psets.get(search_pset_name, {}) props = props or psets.get(search_pset_name, {})
value = props.get(search_prop_name, None) value = props.get(search_prop_name, None)
if does_keyword_exist(pattern, value): if does_keyword_exist(pattern, value):
obj.select_set(True) obj.select_set(True)
@@ -163,11 +168,16 @@ class ColourByPset(bpy.types.Operator):
continue continue
element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id) element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
psets = ifcopenshell.util.element.get_psets(element) psets = ifcopenshell.util.element.get_psets(element)
if search_pset_name == "":
props = {}
[props.update(p) for p in psets.values()]
else:
props = None
if context.scene.BIMSearchProperties.should_ignorecase: if context.scene.BIMSearchProperties.should_ignorecase:
props = next((v for k, v in psets.items() if k.lower() == search_pset_name.lower()), {}) props = props or next((v for k, v in psets.items() if k.lower() == search_pset_name.lower()), {})
value = str(next((v for k, v in props.items() if k.lower() == search_prop_name.lower()), None)) value = str(next((v for k, v in props.items() if k.lower() == search_prop_name.lower()), None))
else: else:
props = psets.get(search_pset_name, {}) props = props or psets.get(search_pset_name, {})
value = str(props.get(search_prop_name, None)) value = str(props.get(search_prop_name, None))
if value not in values: if value not in values:
values[value] = next(colours) values[value] = next(colours)