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

add bounds restriction

Browse Source
This commit is contained in:
ArturTomczak
2021-06-12 21:10:09 +02:00
parent 459149e418
commit 7e02eb923d
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/ids.py
+21 -8
View File
@@ -129,7 +129,7 @@ class property(facet):
""" """
parameters = ["name", "propertyset", "value"] parameters = ["name", "propertyset", "value"]
message = "a property '%(name)s' in '%(propertyset)s' with a value '%(value)s'" message = "a property '%(name)s' in '%(propertyset)s' with a value %(value)s"
def __call__(self, inst, logger): def __call__(self, inst, logger):
props = ifcopenshell.util.element.get_psets(inst) props = ifcopenshell.util.element.get_psets(inst)
@@ -139,7 +139,7 @@ class property(facet):
di = { di = {
"name": self.name, "name": self.name,
"propertyset": self.propertyset, "propertyset": self.propertyset,
"value": val, "value": "'%s'" % val,
} }
if val is not None: if val is not None:
@@ -236,7 +236,17 @@ class restriction:
if n[0:3] == "xs:": if n[0:3] == "xs:":
if n[3:] == "enumeration": if n[3:] == "enumeration":
self.type = "enumeration" self.type = "enumeration"
[self.options.append(x["@value"]) for x in node[n]] for x in node[n]:
self.options.append(x["@value"])
elif n[8:] == "clusive":
self.type = "bounds"
if n[3:6] == 'min':
self.options.insert(0,'>')
else:
self.options.insert(0,'<')
if n[6:9] == 'Inc':
self.options[0] += '='
self.options[0] += node[n]['@value']
#TODO implement other restrictions #TODO implement other restrictions
# elif n.nodeType == n.ELEMENT_NODE and (n.tagName.endswith("Inclusive") or n.tagName.endswith("Exclusive")): # elif n.nodeType == n.ELEMENT_NODE and (n.tagName.endswith("Inclusive") or n.tagName.endswith("Exclusive")):
# self.type = "bounds" # self.type = "bounds"
@@ -252,14 +262,17 @@ class restriction:
#TODO add totalDigits #TODO add totalDigits
#TODO add whiteSpace #TODO add whiteSpace
else: else:
logger.error({'guid':inst.GlobalId, 'result':'ERROR', 'sentence':'Restriction not implemented'}) logger.error({'result':'ERROR', 'sentence':'Restriction not implemented'})
def __eq__(self, other): def __eq__(self, other):
if self.type == "enumeration": if self.type == "enumeration":
return other in self.options return other in self.options
elif self.type == "bounds": elif self.type == "bounds":
self.options.sort() result = True
return False #TODO for op in self.options:
if not(eval(str(other)+op)):
result = False
return result
elif self.type == "length": elif self.type == "length":
return False #TODO return False #TODO
elif self.type == "pattern": elif self.type == "pattern":
@@ -271,10 +284,10 @@ class restriction:
def __repr__(self): def __repr__(self):
if self.type == "enumeration": if self.type == "enumeration":
return "' or '".join(self.options) return "'%s'" % "' or '".join(self.options)
elif self.type == "bounds": elif self.type == "bounds":
self.options.sort() self.options.sort()
return "of type '%s', having a value between %s and %s" % (self.restriction_on, str(self.options[0]), str(self.options[1])) return "of type '%s', having a value %s" % (self.restriction_on, ' and '.join(self.options))
elif self.type == "length": elif self.type == "length":
return "of type '%s' with a length of %s" % (self.restriction_on, str(self.options[0])) return "of type '%s' with a length of %s" % (self.restriction_on, str(self.options[0]))
elif self.type == "pattern": elif self.type == "pattern":