Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-29 11:46:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1339. You can now search case insensitively for pset, prop and attribute names

Browse Source
This commit is contained in:
Dion Moult
2021-03-08 16:42:47 +11:00
parent e89d540236
commit e62b7e94a4
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcblenderexport/blenderbim/bim/module/search/operator.py
+24 -6
View File
@@ -84,7 +84,12 @@ class SelectAttribute(bpy.types.Operator):
if not obj.BIMObjectProperties.ifc_definition_id: if not obj.BIMObjectProperties.ifc_definition_id:
continue continue
element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id) element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
if does_keyword_exist(pattern, getattr(element, attribute_name, None)): if context.scene.BIMSearchProperties.should_ignorecase:
data = element.get_info()
value = next((v for k, v in data.items() if k.lower() == attribute_name.lower()), None)
else:
value = getattr(element, attribute_name, None)
if does_keyword_exist(pattern, value):
obj.select_set(True) obj.select_set(True)
return {"FINISHED"} return {"FINISHED"}
@@ -104,8 +109,13 @@ 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)
props = psets.get(search_pset_name, {}) if context.scene.BIMSearchProperties.should_ignorecase:
if does_keyword_exist(pattern, props.get(search_prop_name, None)): props = 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))
else:
props = psets.get(search_pset_name, {})
value = props.get(search_prop_name, None)
if does_keyword_exist(pattern, value):
obj.select_set(True) obj.select_set(True)
return {"FINISHED"} return {"FINISHED"}
@@ -123,7 +133,11 @@ class ColourByAttribute(bpy.types.Operator):
if not obj.BIMObjectProperties.ifc_definition_id: if not obj.BIMObjectProperties.ifc_definition_id:
continue continue
element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id) element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
value = getattr(element, attribute_name, None) if context.scene.BIMSearchProperties.should_ignorecase:
data = element.get_info()
value = next((v for k, v in data.items() if k.lower() == attribute_name.lower()), None)
else:
value = getattr(element, attribute_name, None)
if value not in values: if value not in values:
values[value] = next(colours) values[value] = next(colours)
obj.color = values[value] obj.color = values[value]
@@ -147,8 +161,12 @@ 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)
props = psets.get(search_pset_name, {}) if context.scene.BIMSearchProperties.should_ignorecase:
value = str(props.get(search_prop_name, None)) props = 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))
else:
props = psets.get(search_pset_name, {})
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)
obj.color = values[value] obj.color = values[value]