From d3590c2325ac9442eabb85a65e0ed3d4a6b885db Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Thu, 21 May 2020 19:26:28 +1000 Subject: [PATCH] You can now specify relationships to IFC Diff in Blender --- src/ifcblenderexport/blenderbim/bim/operator.py | 3 ++- src/ifcblenderexport/blenderbim/bim/prop.py | 1 + src/ifcblenderexport/blenderbim/bim/ui.py | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ifcblenderexport/blenderbim/bim/operator.py b/src/ifcblenderexport/blenderbim/bim/operator.py index 68806c4c4b..21df99bc0c 100644 --- a/src/ifcblenderexport/blenderbim/bim/operator.py +++ b/src/ifcblenderexport/blenderbim/bim/operator.py @@ -1147,7 +1147,8 @@ class ExecuteIfcDiff(bpy.types.Operator): ifc_diff = ifcdiff.IfcDiff( bpy.context.scene.BIMProperties.diff_old_file, bpy.context.scene.BIMProperties.diff_new_file, - self.filepath + self.filepath, + bpy.context.scene.BIMProperties.diff_relationships.split() ) ifc_diff.diff() ifc_diff.export() diff --git a/src/ifcblenderexport/blenderbim/bim/prop.py b/src/ifcblenderexport/blenderbim/bim/prop.py index 84f3173ee7..4e2e4c8868 100644 --- a/src/ifcblenderexport/blenderbim/bim/prop.py +++ b/src/ifcblenderexport/blenderbim/bim/prop.py @@ -921,6 +921,7 @@ class BIMProperties(PropertyGroup): diff_json_file: StringProperty(default='', name="Diff JSON File") diff_old_file: StringProperty(default='', name="Diff Old IFC File") diff_new_file: StringProperty(default='', name="Diff New IFC File") + diff_relationships: StringProperty(default='', name="Diff Relationships") aggregate_class: EnumProperty(items=getIfcClasses, name="Aggregate Class") aggregate_name: StringProperty(name="Aggregate Name") classification: EnumProperty(items=getClassifications, name="Classification", update=refreshReferences) diff --git a/src/ifcblenderexport/blenderbim/bim/ui.py b/src/ifcblenderexport/blenderbim/bim/ui.py index 85daa6e290..0b4cdae268 100644 --- a/src/ifcblenderexport/blenderbim/bim/ui.py +++ b/src/ifcblenderexport/blenderbim/bim/ui.py @@ -1132,6 +1132,9 @@ class BIM_PT_diff(Panel): row.prop(bim_properties, "diff_new_file") row.operator("bim.select_diff_new_file", icon="FILE_FOLDER", text="") + row = layout.row(align=True) + row.prop(bim_properties, "diff_relationships") + row = layout.row() row.operator('bim.execute_ifc_diff')