mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-16 21:42:19 +00:00
Add bug fixes
This commit is contained in:
@@ -122,15 +122,17 @@ class SelectRequirement(bpy.types.Operator):
|
|||||||
|
|
||||||
def execute(self, context):
|
def execute(self, context):
|
||||||
props = context.scene.IfcTesterProperties
|
props = context.scene.IfcTesterProperties
|
||||||
props.has_entities = True
|
|
||||||
report = json.loads(props.report)
|
report = json.loads(props.report)
|
||||||
props.failed_entities.clear()
|
props.old_index = self.spec_index
|
||||||
failed_entities = report[self.spec_index]['requirements'] [self.req_index]['failed_entities']
|
failed_entities = report[self.spec_index]['requirements'] [self.req_index]['failed_entities']
|
||||||
print(failed_entities)
|
props.n_entities = len(failed_entities)
|
||||||
|
props.has_entities = True if props.n_entities > 0 else False
|
||||||
|
props.failed_entities.clear()
|
||||||
for e in failed_entities:
|
for e in failed_entities:
|
||||||
new_entity = props.failed_entities.add()
|
new_entity = props.failed_entities.add()
|
||||||
new_entity.element = e['element']
|
new_entity.element = e['element']
|
||||||
new_entity.reason = e['reason']
|
new_entity.reason = e['reason']
|
||||||
|
|
||||||
return {"FINISHED"}
|
return {"FINISHED"}
|
||||||
|
|
||||||
class SelectEntity(bpy.types.Operator):
|
class SelectEntity(bpy.types.Operator):
|
||||||
|
|||||||
@@ -53,12 +53,14 @@ class IfcTesterProperties(PropertyGroup):
|
|||||||
|
|
||||||
active_specification_index: IntProperty(name="Active Specification Index")
|
active_specification_index: IntProperty(name="Active Specification Index")
|
||||||
active_requirement_index: IntProperty(name="Active Requirement Index")
|
active_requirement_index: IntProperty(name="Active Requirement Index")
|
||||||
|
old_index: IntProperty(name="", default=0)
|
||||||
active_failed_entity_index: IntProperty(name="Active Failed Entity Index")
|
active_failed_entity_index: IntProperty(name="Active Failed Entity Index")
|
||||||
report: StringProperty(default="", name="JSON report")
|
report: StringProperty(default="", name="JSON report")
|
||||||
specifications: CollectionProperty(name="Specifications", type=Specification)
|
specifications: CollectionProperty(name="Specifications", type=Specification)
|
||||||
failed_entities: CollectionProperty(name="FailedEntities", type=FailedEntities)
|
failed_entities: CollectionProperty(name="FailedEntities", type=FailedEntities)
|
||||||
has_report : BoolProperty(default=False, name="")
|
has_report : BoolProperty(default=False, name="")
|
||||||
has_entities : BoolProperty(default=False, name="")
|
has_entities : BoolProperty(default=False, name="")
|
||||||
|
n_entities : IntProperty(name="", default=0)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -49,9 +49,9 @@ class BIM_PT_tester(Panel):
|
|||||||
row.operator("bim.select_specs", icon="FILE_FOLDER", text="")
|
row.operator("bim.select_specs", icon="FILE_FOLDER", text="")
|
||||||
|
|
||||||
row = self.layout.row()
|
row = self.layout.row()
|
||||||
result = row.operator("bim.execute_ifc_tester")
|
row.operator("bim.execute_ifc_tester")
|
||||||
|
|
||||||
if self.props.has_report:
|
if self.props.has_report and self.props.should_load_from_memory:
|
||||||
self.layout.template_list(
|
self.layout.template_list(
|
||||||
"BIM_UL_tester_specifications",
|
"BIM_UL_tester_specifications",
|
||||||
"",
|
"",
|
||||||
@@ -77,22 +77,23 @@ class BIM_PT_tester(Panel):
|
|||||||
row.label(text = f"Passed: {total_successes}/{total} ({percentage}%)")
|
row.label(text = f"Passed: {total_successes}/{total} ({percentage}%)")
|
||||||
row = self.layout.row()
|
row = self.layout.row()
|
||||||
row.label(text = f"Requirements ({n_requirements}):")
|
row.label(text = f"Requirements ({n_requirements}):")
|
||||||
c=1
|
c=0
|
||||||
box = self.layout.box()
|
box = self.layout.box()
|
||||||
for req in dic_report[i]['requirements']:
|
for req in dic_report[i]['requirements']:
|
||||||
row = box.row(align=True)
|
row = box.row(align=True)
|
||||||
row.label(text=f" {c}. {req['description']}")
|
row.label(text=f" {c+1}. {req['description']}")
|
||||||
if req['status']:
|
if req['status']:
|
||||||
row.label(text="PASS", icon="CHECKMARK")
|
row.label(text="PASS", icon="CHECKMARK")
|
||||||
else:
|
else:
|
||||||
row.label(text="FAIL", icon="CANCEL")
|
row.label(text="FAIL", icon="CANCEL")
|
||||||
op = row.operator("bim.select_requirement", text="", icon="LONGDISPLAY")
|
op = row.operator("bim.select_requirement", text="", icon="LONGDISPLAY")
|
||||||
op.spec_index = i
|
op.spec_index = i
|
||||||
op.req_index = c - 1
|
op.req_index = c
|
||||||
c += 1
|
c += 1
|
||||||
if props.has_entities:
|
|
||||||
|
if props.old_index == i and props.n_entities > 0:
|
||||||
row = self.layout.row()
|
row = self.layout.row()
|
||||||
row.label(text = "Failed entities :")
|
row.label(text = f"Failed entities [{props.n_entities}]:")
|
||||||
self.layout.template_list(
|
self.layout.template_list(
|
||||||
"BIM_UL_tester_failed_entities",
|
"BIM_UL_tester_failed_entities",
|
||||||
"",
|
"",
|
||||||
@@ -103,13 +104,12 @@ class BIM_PT_tester(Panel):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class BIM_UL_tester_specifications(UIList):
|
class BIM_UL_tester_specifications(UIList):
|
||||||
def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
|
def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
|
||||||
props = context.scene.IfcTesterProperties
|
|
||||||
if item:
|
if item:
|
||||||
icon = "WORDWRAP_ON"
|
|
||||||
row = layout.row(align=True)
|
row = layout.row(align=True)
|
||||||
row.label(text=item.name or "Unnamed", icon=icon)
|
row.label(text=item.name, icon="WORDWRAP_ON")
|
||||||
if item.status:
|
if item.status:
|
||||||
row.label(text="PASS")
|
row.label(text="PASS")
|
||||||
else:
|
else:
|
||||||
@@ -117,10 +117,8 @@ class BIM_UL_tester_specifications(UIList):
|
|||||||
|
|
||||||
class BIM_UL_tester_failed_entities(UIList):
|
class BIM_UL_tester_failed_entities(UIList):
|
||||||
def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
|
def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
|
||||||
props = context.scene.IfcTesterProperties
|
|
||||||
ifc_file = tool.Ifc.get()
|
ifc_file = tool.Ifc.get()
|
||||||
if item:
|
if item:
|
||||||
icon = "WORDWRAP_ON"
|
|
||||||
ifc_id = int(item.element[1:item.element.find('=')])
|
ifc_id = int(item.element[1:item.element.find('=')])
|
||||||
entity = ifc_file.by_id(ifc_id)
|
entity = ifc_file.by_id(ifc_id)
|
||||||
row = layout.row(align=True)
|
row = layout.row(align=True)
|
||||||
|
|||||||
Reference in New Issue
Block a user