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

Fix #4195. Forgot to add UI for contains selector.

Browse Source
This commit is contained in:
Dion Moult
2024-01-14 23:20:06 +11:00
parent 02d79f0687
commit 77eae1c8e8
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/prop.py
+2
View File
@@ -489,6 +489,8 @@ class BIMFacet(PropertyGroup):
("<=", "lesser than or equal to", ""), ("<=", "lesser than or equal to", ""),
(">", "greater than", ""), (">", "greater than", ""),
("<", "less than", ""), ("<", "less than", ""),
("*=", "contains", ""),
("!*=", "does not contain", ""),
], ],
) )
src/blenderbim/blenderbim/tool/search.py
+19 -15
View File
@@ -144,7 +144,7 @@ class ImportFilterQueryTransformer(lark.Transformer):
new2.pset = arg["pset"] new2.pset = arg["pset"]
if "comparison" in arg: if "comparison" in arg:
new2.comparison = arg["comparison"] new2.comparison = arg["comparison"]
######################################################################
def facet(self, args): def facet(self, args):
return args[0] return args[0]
@@ -169,8 +169,7 @@ class ImportFilterQueryTransformer(lark.Transformer):
def property(self, args): def property(self, args):
pset, prop, comparison, value = args pset, prop, comparison, value = args
#return {"type": "property", "pset": pset, "name": prop, "value": f"{comparison}{value}"} return {"type": "property", "pset": pset, "name": prop, "comparison": comparison, "value": f"{value}"}
return {"type": "property", "pset": pset, "name": prop, "comparison" : comparison, "value": f"{value}"}
def classification(self, args): def classification(self, args):
comparison, value = args comparison, value = args
@@ -189,19 +188,24 @@ class ImportFilterQueryTransformer(lark.Transformer):
return {"type": "query", "name": keys, "value": f"{comparison}{value}"} return {"type": "query", "name": keys, "value": f"{comparison}{value}"}
def comparison(self, args): def comparison(self, args):
if args[0].data == "equals": if args[0].data == "not":
return "=" comparison = args[1].data
elif args[0].data == "morethanequalto": is_not = "!"
return ">="
elif args[0].data == "lessthanequalto":
return "<="
elif args[0].data == "morethan":
return ">"
elif args[0].data == "lessthan":
return "<"
else: else:
return "!=" comparison = args[0].data
#return "" if args[0].data == "equals" else "!=" is_not = ""
return (
is_not
+ {
"equals": "=",
"morethanequalto": ">=",
"lessthanequalto": "<=",
"morethan": ">",
"lessthan": "<",
"contains": "*=",
}[comparison]
)
def keys(self, args): def keys(self, args):
return self.value(args) return self.value(args)