From 36e779e32f96ee07d37826cbffc00e68cf74cc8a Mon Sep 17 00:00:00 2001 From: Benoit DAMAY Date: Sun, 3 Mar 2024 19:23:51 +0100 Subject: [PATCH 1/4] Fix proposition to 3515 --- src/blenderbim/blenderbim/bim/module/material/ui.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/blenderbim/blenderbim/bim/module/material/ui.py b/src/blenderbim/blenderbim/bim/module/material/ui.py index d609c9d201..2e13e1f184 100644 --- a/src/blenderbim/blenderbim/bim/module/material/ui.py +++ b/src/blenderbim/blenderbim/bim/module/material/ui.py @@ -199,11 +199,16 @@ class BIM_PT_object_material(Panel): row.operator("bim.enable_editing_assigned_material", icon="GREASEPENCIL", text="") row.operator("bim.unassign_material", icon="X", text="") + + if ObjectMaterialData.data["material_class"] == "IfcMaterial": self.draw_single_ui() else: self.draw_set_ui() + + + def draw_single_ui(self): if self.props.is_editing: return self.draw_editable_single_ui() @@ -226,6 +231,7 @@ class BIM_PT_object_material(Panel): blenderbim.bim.helper.draw_attributes(self.props.material_set_attributes, self.layout) blenderbim.bim.helper.draw_attributes(self.props.material_set_usage_attributes, self.layout) + if ObjectMaterialData.data["set_item_name"] == "profile" and not self.mprops.profiles: row = self.layout.row(align=True) row.label(text="No Profiles Available") @@ -237,6 +243,9 @@ class BIM_PT_object_material(Panel): prop_with_search(row, self.props, "material", icon="MATERIAL", text="") op = row.operator(f"bim.add_{ObjectMaterialData.data['set_item_name']}", icon="ADD", text="") setattr(op, f"{ObjectMaterialData.data['set_item_name']}_set", ObjectMaterialData.data["set"]["id"]) + row = self.layout.row(align=True) + row.alignment = "CENTER" + row.label(text='Layers listed from origin point') total_items = len(ObjectMaterialData.data["set_items"]) for index, set_item in enumerate(ObjectMaterialData.data["set_items"]): From badee8fdc585d6f4645a57e06edc498c64575609 Mon Sep 17 00:00:00 2001 From: Benoit DAMAY Date: Sun, 3 Mar 2024 19:29:02 +0100 Subject: [PATCH 2/4] Fix proposition to 3515 - extra empty lines removed from previous commit --- src/blenderbim/blenderbim/bim/module/material/ui.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/module/material/ui.py b/src/blenderbim/blenderbim/bim/module/material/ui.py index 2e13e1f184..2f65b2b39a 100644 --- a/src/blenderbim/blenderbim/bim/module/material/ui.py +++ b/src/blenderbim/blenderbim/bim/module/material/ui.py @@ -199,16 +199,11 @@ class BIM_PT_object_material(Panel): row.operator("bim.enable_editing_assigned_material", icon="GREASEPENCIL", text="") row.operator("bim.unassign_material", icon="X", text="") - - if ObjectMaterialData.data["material_class"] == "IfcMaterial": self.draw_single_ui() else: self.draw_set_ui() - - - def draw_single_ui(self): if self.props.is_editing: return self.draw_editable_single_ui() @@ -231,7 +226,6 @@ class BIM_PT_object_material(Panel): blenderbim.bim.helper.draw_attributes(self.props.material_set_attributes, self.layout) blenderbim.bim.helper.draw_attributes(self.props.material_set_usage_attributes, self.layout) - if ObjectMaterialData.data["set_item_name"] == "profile" and not self.mprops.profiles: row = self.layout.row(align=True) row.label(text="No Profiles Available") From d68d4d54a94341c58c7e4093bbc72a77815157f7 Mon Sep 17 00:00:00 2001 From: Benoit DAMAY Date: Mon, 4 Mar 2024 17:10:19 +0100 Subject: [PATCH 3/4] Replaced panel row with operator descriptor --- .../blenderbim/bim/module/material/operator.py | 2 ++ src/blenderbim/blenderbim/bim/module/material/ui.py | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/module/material/operator.py b/src/blenderbim/blenderbim/bim/module/material/operator.py index da600d4a6c..a682a66e20 100644 --- a/src/blenderbim/blenderbim/bim/module/material/operator.py +++ b/src/blenderbim/blenderbim/bim/module/material/operator.py @@ -273,6 +273,7 @@ class RemoveProfile(bpy.types.Operator, tool.Ifc.Operator): class AddLayer(bpy.types.Operator, tool.Ifc.Operator): bl_idname = "bim.add_layer" bl_label = "Add Layer" + bl_description = "The List is Ordered From Origin Point" bl_options = {"REGISTER", "UNDO"} obj: bpy.props.StringProperty() layer_set: bpy.props.IntProperty() @@ -297,6 +298,7 @@ class AddLayer(bpy.types.Operator, tool.Ifc.Operator): class ReorderMaterialSetItem(bpy.types.Operator, tool.Ifc.Operator): bl_idname = "bim.reorder_material_set_item" bl_label = "Reorder Material Set Item" + bl_description = "The List is Ordered From Origin Point" bl_options = {"REGISTER", "UNDO"} obj: bpy.props.StringProperty() old_index: bpy.props.IntProperty() diff --git a/src/blenderbim/blenderbim/bim/module/material/ui.py b/src/blenderbim/blenderbim/bim/module/material/ui.py index 2f65b2b39a..5a945f1f11 100644 --- a/src/blenderbim/blenderbim/bim/module/material/ui.py +++ b/src/blenderbim/blenderbim/bim/module/material/ui.py @@ -230,16 +230,17 @@ class BIM_PT_object_material(Panel): row = self.layout.row(align=True) row.label(text="No Profiles Available") row.operator("bim.add_profile_def", icon="ADD", text="") - else: + else: + #indication to the user From where Layer set is stacked (#3515) Unactivated for now + # row = self.layout.row(align=True) + # row.alignment = "CENTER" + # row.label(text='From Origin Point') row = self.layout.row(align=True) if ObjectMaterialData.data["set_item_name"] == "profile": prop_with_search(row, self.mprops, "profiles", icon="ITALIC", text="") prop_with_search(row, self.props, "material", icon="MATERIAL", text="") op = row.operator(f"bim.add_{ObjectMaterialData.data['set_item_name']}", icon="ADD", text="") setattr(op, f"{ObjectMaterialData.data['set_item_name']}_set", ObjectMaterialData.data["set"]["id"]) - row = self.layout.row(align=True) - row.alignment = "CENTER" - row.label(text='Layers listed from origin point') total_items = len(ObjectMaterialData.data["set_items"]) for index, set_item in enumerate(ObjectMaterialData.data["set_items"]): From e6e71adba73ab474408217ea9a82c4530a837552 Mon Sep 17 00:00:00 2001 From: Benoit DAMAY Date: Tue, 5 Mar 2024 08:53:56 +0100 Subject: [PATCH 4/4] Removing unnecessary comment lines --- src/blenderbim/blenderbim/bim/module/material/ui.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/module/material/ui.py b/src/blenderbim/blenderbim/bim/module/material/ui.py index 5a945f1f11..06a0fc04c3 100644 --- a/src/blenderbim/blenderbim/bim/module/material/ui.py +++ b/src/blenderbim/blenderbim/bim/module/material/ui.py @@ -231,10 +231,6 @@ class BIM_PT_object_material(Panel): row.label(text="No Profiles Available") row.operator("bim.add_profile_def", icon="ADD", text="") else: - #indication to the user From where Layer set is stacked (#3515) Unactivated for now - # row = self.layout.row(align=True) - # row.alignment = "CENTER" - # row.label(text='From Origin Point') row = self.layout.row(align=True) if ObjectMaterialData.data["set_item_name"] == "profile": prop_with_search(row, self.mprops, "profiles", icon="ITALIC", text="")