Fix #4072. IDS reports now include filename.

This commit is contained in:
Dion Moult
2023-12-04 17:26:57 +11:00
parent 31e912cf12
commit b9f33e06bd
5 changed files with 39 additions and 19 deletions
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with BlenderBIM Add-on. If not, see <http://www.gnu.org/licenses/>.
import os
import os
import bpy
import time
import tempfile
@@ -46,15 +46,18 @@ class ExecuteIfcTester(bpy.types.Operator, tool.Ifc.Operator):
start = time.time()
output = os.path.join(dirpath, "{}.html".format(props.specs))
filepath = None
if props.should_load_from_memory and tool.Ifc.get():
ifc = tool.Ifc.get()
filepath = tool.Ifc.get_path()
else:
ifc = ifcopenshell.open(props.ifc_file)
filepath = props.ifc_file
specs = ifctester.ids.open(props.specs)
print("Finished loading:", time.time() - start)
start = time.time()
specs.validate(ifc)
specs.validate(ifc, filepath=filepath)
print("Finished validating:", time.time() - start)
start = time.time()
@@ -131,27 +134,27 @@ class SelectRequirement(bpy.types.Operator):
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:
new_entity = props.failed_entities.add()
new_entity.ifc_id = e["id"]
new_entity.element = f'{e["class"]} | {e["name"]}'
new_entity.reason = e["reason"]
if props.flag:
area = next(area for area in context.screen.areas if area.type == "VIEW_3D")
area.spaces[0].shading.color_type = "OBJECT"
area.spaces[0].shading.show_xray = True
failed_ids = [ e["id"] for e in failed_entities ]
failed_ids = [e["id"] for e in failed_entities]
for obj in context.scene.objects:
if obj.BIMObjectProperties.ifc_definition_id in failed_ids:
obj.color = (1,0,0,1)
obj.color = (1, 0, 0, 1)
else:
obj.color = (1,1,1,1)
obj.color = (1, 1, 1, 1)
return {"FINISHED"}
class SelectFailedEntities(bpy.types.Operator):
bl_idname = "bim.select_failed_entities"
bl_label = "Select Failed Entities"
@@ -166,13 +169,13 @@ class SelectFailedEntities(bpy.types.Operator):
failed_entities = report[self.spec_index]["requirements"][self.req_index]["failed_entities"]
props.n_entities = len(failed_entities)
props.has_entities = True if props.n_entities > 0 else False
failed_ids = [ e["id"] for e in failed_entities ]
failed_ids = [e["id"] for e in failed_entities]
for obj in context.scene.objects:
if obj.BIMObjectProperties.ifc_definition_id in failed_ids:
obj.select_set(True)
else:
obj.select_set(False)
obj.select_set(False)
return {"FINISHED"}