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

Improve data type error reporting

Browse Source
This commit is contained in:
Dion Moult
2023-11-01 22:23:55 +11:00
parent b6e24559e5
commit 7bf8d58cde
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifctester/ifctester/facet.py
+7 -7
View File
@@ -650,7 +650,7 @@ class Property(Facet):
if data_type.lower() != self.datatype.lower(): if data_type.lower() != self.datatype.lower():
is_pass = False is_pass = False
reason = {"type": "DATATYPE", "actual": data_type} reason = {"type": "DATATYPE", "actual": data_type, "datatype": self.datatype}
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)
@@ -669,7 +669,7 @@ class Property(Facet):
if data_type.lower() != self.datatype.lower(): if data_type.lower() != self.datatype.lower():
is_pass = False is_pass = False
reason = {"type": "DATATYPE", "actual": data_type} reason = {"type": "DATATYPE", "actual": data_type, "datatype": self.datatype}
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)
@@ -689,7 +689,7 @@ class Property(Facet):
data_type = prop_entity.EnumerationValues[0].is_a() data_type = prop_entity.EnumerationValues[0].is_a()
if data_type.lower() != self.datatype.lower(): if data_type.lower() != self.datatype.lower():
is_pass = False is_pass = False
reason = {"type": "DATATYPE", "actual": data_type} reason = {"type": "DATATYPE", "actual": data_type, "datatype": self.datatype}
break break
elif prop_entity.is_a("IfcPropertyListValue"): elif prop_entity.is_a("IfcPropertyListValue"):
if not prop_entity.ListValues: if not prop_entity.ListValues:
@@ -699,7 +699,7 @@ class Property(Facet):
data_type = prop_entity.ListValues[0].is_a() data_type = prop_entity.ListValues[0].is_a()
if data_type.lower() != self.datatype.lower(): if data_type.lower() != self.datatype.lower():
is_pass = False is_pass = False
reason = {"type": "DATATYPE", "actual": data_type} reason = {"type": "DATATYPE", "actual": data_type, "datatype": self.datatype}
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:
@@ -722,7 +722,7 @@ class Property(Facet):
values.append(value.wrappedValue) values.append(value.wrappedValue)
if data_type.lower() != self.datatype.lower(): if data_type.lower() != self.datatype.lower():
is_pass = False is_pass = False
reason = {"type": "DATATYPE", "actual": data_type} reason = {"type": "DATATYPE", "actual": data_type, "datatype": self.datatype}
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:
@@ -762,7 +762,7 @@ class Property(Facet):
values.extend(column_values) values.extend(column_values)
if not values: if not values:
is_pass = False is_pass = False
reason = {"type": "DATATYPE", "actual": data_type} reason = {"type": "DATATYPE", "actual": data_type, "datatype": self.datatype}
break break
props[pset_name][prop_entity.Name] = values props[pset_name][prop_entity.Name] = values
else: else:
@@ -1049,7 +1049,7 @@ class PropertyResult(Result):
elif self.reason["type"] == "NOVALUE": elif self.reason["type"] == "NOVALUE":
return "The property set does not contain the required property" return "The property set does not contain the required property"
elif self.reason["type"] == "DATATYPE": elif self.reason["type"] == "DATATYPE":
return f"The data type \"{str(self.reason['actual'])}\" does not match the requirements" return f"The property's data type \"{str(self.reason['actual'])}\" does not match the required data type of \"{str(self.reason['datatype'])}\""
elif self.reason["type"] == "VALUE": elif self.reason["type"] == "VALUE":
if isinstance(self.reason["actual"], list): if isinstance(self.reason["actual"], list):
if len(self.reason["actual"]) == 1: if len(self.reason["actual"]) == 1: