Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-17 14:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2716 issue (#2761)

Browse Source
This commit is contained in:
Massimo Fabbro
2023-02-12 14:09:33 +01:00
committed by GitHub
parent 74de7436b7
commit 145ac1a0f4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/search/operator.py
+7 -3
View File
@@ -517,7 +517,7 @@ class FilterModelElements(Operator):
def add_filters(self, selection: str, query: str) -> str: def add_filters(self, selection: str, query: str) -> str:
for f_index, f in enumerate(query.filters): for f_index, f in enumerate(query.filters):
comparison_operator = f.comparison comparison_operator = f.comparison
if f_index != 0: if f_index != 0:
@@ -527,12 +527,16 @@ class FilterModelElements(Operator):
selection += "[" selection += "["
if f.selector == "IfcPropertySet": if f.selector == "IfcPropertySet":
selection += f'{f.active_option.split(": ")[1]}.{f.active_sub_option.split(": ")[1]} {"!" if f.negation else ""}{comparison_operator} "{f.value}"' selection += f'{f.active_option.split(": ")[1]}.{f.active_sub_option.split(": ")[1]} {"!" if f.negation else ""}{comparison_operator}'
if (f.value == "True" or f.value == "False"):
selection += f' {f.value}'
else:
selection += f' "{f.value}"'
elif f.selector == "Attribute": elif f.selector == "Attribute":
# we're using the prop_search functionality in blender which returns the index of the option. Sometimes the user can override this and enter a value that doesn't exist in the list. In this case there is no index and we need to handle it. @vulevukusej # we're using the prop_search functionality in blender which returns the index of the option. Sometimes the user can override this and enter a value that doesn't exist in the list. In this case there is no index and we need to handle it. @vulevukusej
pattern = re.compile(r'^[0-9]+:') pattern = re.compile(r'^[0-9]+:')
match = pattern.search(f.active_option) match = pattern.search(f.active_option)
selection += f'{f.active_option.split(": ")[1] if match else f.active_option} {"!" if f.negation else ""}{comparison_operator} "{f.value}"' selection += f'{f.active_option.split(": ")[1] if match else f.active_option} {"!" if f.negation else ""}{comparison_operator} "{f.value}"'
selection += "]" selection += "]"