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

Minor fixes to IfcTester

Browse Source
This commit is contained in:
Dion Moult
2022-11-12 14:07:40 +11:00
parent d9afb0f8a2
commit bdec443410
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifctester/ifctester/facet.py
+8 -7
View File
@@ -348,7 +348,7 @@ class PartOf(Facet):
if "entity" in xml: if "entity" in xml:
super().parse(xml["entity"]) super().parse(xml["entity"])
del xml["entity"] del xml["entity"]
super().parse(xml) return super().parse(xml)
def __call__(self, inst, logger=None): def __call__(self, inst, logger=None):
if self.minOccurs == 0 and self.maxOccurs != 0: if self.minOccurs == 0 and self.maxOccurs != 0:
@@ -527,7 +527,8 @@ class Property(Facet):
break break
unit = ifcopenshell.util.unit.get_property_unit(prop_entity, inst.wrapped_data.file) unit = ifcopenshell.util.unit.get_property_unit(prop_entity, inst.wrapped_data.file)
if unit: if unit and getattr(unit, "Name", None):
# TODO support unnamed derived units
props[pset_name][prop_entity.Name] = ifcopenshell.util.unit.convert( props[pset_name][prop_entity.Name] = ifcopenshell.util.unit.convert(
prop_entity.NominalValue.wrappedValue, prop_entity.NominalValue.wrappedValue,
getattr(unit, "Prefix", None), getattr(unit, "Prefix", None),
@@ -782,7 +783,7 @@ class Restriction:
return self return self
self.base = ids_dict.get("@base", "xs:string")[3:] self.base = ids_dict.get("@base", "xs:string")[3:]
for key, value in ids_dict.items(): for key, value in ids_dict.items():
if key == "@base": if key in ["@base", "annotation"]:
continue continue
if isinstance(value, dict): if isinstance(value, dict):
self.options[key.split(":")[-1]] = value["@value"] self.options[key.split(":")[-1]] = value["@value"]
@@ -826,16 +827,16 @@ class Restriction:
if len(str(other)) < int(value): if len(str(other)) < int(value):
return False return False
elif constraint == "maxExclusive": elif constraint == "maxExclusive":
if float(other) >= value: if float(other) >= float(value):
return False return False
elif constraint == "maxInclusive": elif constraint == "maxInclusive":
if float(other) > value: if float(other) > float(value):
return False return False
elif constraint == "minExclusive": elif constraint == "minExclusive":
if float(other) <= value: if float(other) <= float(value):
return False return False
elif constraint == "minInclusive": elif constraint == "minInclusive":
if float(other) < value: if float(other) < float(value):
return False return False
return True return True