From 1652629332db916a892efed8acdb69791e946c96 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Wed, 20 Dec 2023 13:47:50 +0500 Subject: [PATCH] prefix bim.assign/unassign_object to avoid operator override #4099 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Bruno Perdigão <57102715+brunoperdigao@users.noreply.github.com> --- .../blenderbim/bim/module/aggregate/__init__.py | 4 ++-- .../blenderbim/bim/module/aggregate/operator.py | 12 ++++++------ src/blenderbim/blenderbim/bim/module/aggregate/ui.py | 4 ++-- src/blenderbim/blenderbim/bim/module/model/pie.py | 4 ++-- .../blenderbim/bim/module/nest/__init__.py | 4 ++-- .../blenderbim/bim/module/nest/operator.py | 12 ++++++------ src/blenderbim/blenderbim/bim/module/nest/ui.py | 4 ++-- src/blenderbim/test/bim/feature/aggregate.feature | 4 ++-- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/module/aggregate/__init__.py b/src/blenderbim/blenderbim/bim/module/aggregate/__init__.py index fd233658d9..ccaafc92fc 100644 --- a/src/blenderbim/blenderbim/bim/module/aggregate/__init__.py +++ b/src/blenderbim/blenderbim/bim/module/aggregate/__init__.py @@ -22,12 +22,12 @@ from . import ui, prop, operator classes = ( operator.BIM_OT_add_aggregate, operator.BIM_OT_add_part_to_object, - operator.BIM_OT_assign_object, + operator.BIM_OT_aggregate_assign_object, operator.BIM_OT_disable_editing_aggregate, operator.BIM_OT_enable_editing_aggregate, operator.BIM_OT_select_aggregate, operator.BIM_OT_select_parts, - operator.BIM_OT_unassign_object, + operator.BIM_OT_aggregate_unassign_object, prop.BIMObjectAggregateProperties, ui.BIM_PT_aggregate, ) diff --git a/src/blenderbim/blenderbim/bim/module/aggregate/operator.py b/src/blenderbim/blenderbim/bim/module/aggregate/operator.py index 01fc83d472..4d7f0491ef 100644 --- a/src/blenderbim/blenderbim/bim/module/aggregate/operator.py +++ b/src/blenderbim/blenderbim/bim/module/aggregate/operator.py @@ -33,11 +33,11 @@ class Operator: return {"FINISHED"} -class BIM_OT_assign_object(bpy.types.Operator, Operator): +class BIM_OT_aggregate_assign_object(bpy.types.Operator, Operator): """Create aggregation relationship between two ifc elements""" - bl_idname = "bim.assign_object" - bl_label = "Assign Object" + bl_idname = "bim.aggregate_assign_object" + bl_label = "Assign Object To Aggregation" bl_options = {"REGISTER", "UNDO"} relating_object: bpy.props.IntProperty() @@ -67,11 +67,11 @@ class BIM_OT_assign_object(bpy.types.Operator, Operator): self.report({"ERROR"}, f" Cannot aggregate {obj.name} to {relating_obj.name}") -class BIM_OT_unassign_object(bpy.types.Operator, Operator): +class BIM_OT_aggregate_unassign_object(bpy.types.Operator, Operator): """Remove aggregation relationship between two ifc elements""" - bl_idname = "bim.unassign_object" - bl_label = "Unassign Object" + bl_idname = "bim.aggregate_unassign_object" + bl_label = "Unassign Object From Aggregation" bl_options = {"REGISTER", "UNDO"} def _execute(self, context): diff --git a/src/blenderbim/blenderbim/bim/module/aggregate/ui.py b/src/blenderbim/blenderbim/bim/module/aggregate/ui.py index 10d204dc13..74c2db3670 100644 --- a/src/blenderbim/blenderbim/bim/module/aggregate/ui.py +++ b/src/blenderbim/blenderbim/bim/module/aggregate/ui.py @@ -54,7 +54,7 @@ class BIM_PT_aggregate(Panel): row = layout.row(align=True) row.prop(props, "relating_object", text="") if props.relating_object: - op = row.operator("bim.assign_object", icon="CHECKMARK", text="") + op = row.operator("bim.aggregate_assign_object", icon="CHECKMARK", text="") op.relating_object = props.relating_object.BIMObjectProperties.ifc_definition_id row.operator("bim.disable_editing_aggregate", icon="CANCEL", text="") else: @@ -65,7 +65,7 @@ class BIM_PT_aggregate(Panel): op.obj = context.active_object.name row.operator("bim.enable_editing_aggregate", icon="GREASEPENCIL", text="") row.operator("bim.add_aggregate", icon="ADD", text="") - op = row.operator("bim.unassign_object", icon="X", text="") + op = row.operator("bim.aggregate_unassign_object", icon="X", text="") else: row.label(text="No Aggregate", icon="TRIA_UP") row.operator("bim.enable_editing_aggregate", icon="GREASEPENCIL", text="") diff --git a/src/blenderbim/blenderbim/bim/module/model/pie.py b/src/blenderbim/blenderbim/bim/module/model/pie.py index f43af88132..799673bffd 100644 --- a/src/blenderbim/blenderbim/bim/module/model/pie.py +++ b/src/blenderbim/blenderbim/bim/module/model/pie.py @@ -87,8 +87,8 @@ class VIEW3D_MT_PIE_bim(bpy.types.Menu): pie.operator("bim.pie_add_opening") pie.operator("bim.pie_update_container") pie.operator("bim.open_pie_class", text="Assign IFC Class") - pie.operator("bim.assign_object", text ="Assign Aggregation") - pie.operator("bim.unassign_object", text ="Unassign Aggregation") + pie.operator("bim.aggregate_assign_object", text="Assign Aggregation") + pie.operator("bim.aggregate_unassign_object", text="Unassign Aggregation") class VIEW3D_MT_PIE_bim_class(bpy.types.Menu): diff --git a/src/blenderbim/blenderbim/bim/module/nest/__init__.py b/src/blenderbim/blenderbim/bim/module/nest/__init__.py index f10a8e5cd6..1d5c65cc58 100644 --- a/src/blenderbim/blenderbim/bim/module/nest/__init__.py +++ b/src/blenderbim/blenderbim/bim/module/nest/__init__.py @@ -20,12 +20,12 @@ import bpy from . import ui, prop, operator classes = ( - operator.BIM_OT_assign_object, + operator.BIM_OT_nest_assign_object, operator.BIM_OT_disable_editing_nest, operator.BIM_OT_enable_editing_nest, operator.BIM_OT_select_components, operator.BIM_OT_select_nest, - operator.BIM_OT_unassign_object, + operator.BIM_OT_nest_unassign_object, prop.BIMObjectNestProperties, ui.BIM_PT_nest, ) diff --git a/src/blenderbim/blenderbim/bim/module/nest/operator.py b/src/blenderbim/blenderbim/bim/module/nest/operator.py index a500d0262c..e96ac33409 100644 --- a/src/blenderbim/blenderbim/bim/module/nest/operator.py +++ b/src/blenderbim/blenderbim/bim/module/nest/operator.py @@ -33,11 +33,11 @@ class Operator: return {"FINISHED"} -class BIM_OT_assign_object(bpy.types.Operator, Operator): +class BIM_OT_nest_assign_object(bpy.types.Operator, Operator): """Create nest relationship between two ifc elements""" - bl_idname = "bim.assign_object" - bl_label = "Assign Object" + bl_idname = "bim.nest_assign_object" + bl_label = "Assign Object To Nesting" bl_options = {"REGISTER", "UNDO"} relating_object: bpy.props.IntProperty() @@ -67,11 +67,11 @@ class BIM_OT_assign_object(bpy.types.Operator, Operator): self.report({"ERROR"}, f" Cannot nest {obj.name} to {relating_obj.name}") -class BIM_OT_unassign_object(bpy.types.Operator, Operator): +class BIM_OT_nest_unassign_object(bpy.types.Operator, Operator): """Remove nest relationship between two ifc elements""" - bl_idname = "bim.unassign_object" - bl_label = "Unassign Object" + bl_idname = "bim.nest_unassign_object" + bl_label = "Unassign Object From Nesting" bl_options = {"REGISTER", "UNDO"} def _execute(self, context): diff --git a/src/blenderbim/blenderbim/bim/module/nest/ui.py b/src/blenderbim/blenderbim/bim/module/nest/ui.py index 25f5ed7edd..f9878c2d5e 100644 --- a/src/blenderbim/blenderbim/bim/module/nest/ui.py +++ b/src/blenderbim/blenderbim/bim/module/nest/ui.py @@ -54,7 +54,7 @@ class BIM_PT_nest(Panel): row = layout.row(align=True) row.prop(props, "relating_object", text="") if props.relating_object: - op = row.operator("bim.assign_object", icon="CHECKMARK", text="") + op = row.operator("bim.nest_assign_object", icon="CHECKMARK", text="") op.relating_object = props.relating_object.BIMObjectProperties.ifc_definition_id row.operator("bim.disable_editing_nest", icon="CANCEL", text="") else: @@ -64,7 +64,7 @@ class BIM_PT_nest(Panel): op = row.operator("bim.select_nest", icon="RESTRICT_SELECT_OFF", text="") op.obj = context.active_object.name row.operator("bim.enable_editing_nest", icon="GREASEPENCIL", text="") - op = row.operator("bim.unassign_object", icon="X", text="") + op = row.operator("bim.nest_unassign_object", icon="X", text="") else: row.label(text="No Host", icon="TRIA_UP") row.operator("bim.enable_editing_nest", icon="GREASEPENCIL", text="") diff --git a/src/blenderbim/test/bim/feature/aggregate.feature b/src/blenderbim/test/bim/feature/aggregate.feature index 407b02cc17..3f906981b3 100644 --- a/src/blenderbim/test/bim/feature/aggregate.feature +++ b/src/blenderbim/test/bim/feature/aggregate.feature @@ -33,7 +33,7 @@ Scenario: Unassign object And the variable "relating_object" is "tool.Ifc.get().by_type('IfcSite')[0].id()" And I press "bim.assign_object(relating_object={relating_object})" And the object "IfcBuildingStorey/My Storey" is selected - When I press "bim.unassign_object" + When I press "bim.aggregate_unassign_object" Then the object "IfcSite/My Site" is in the collection "IfcSite/My Site" And the object "IfcBuildingStorey/My Storey" is in the collection "IfcBuildingStorey/My Storey" And the collection "IfcBuildingStorey/My Storey" is in the collection "IfcProject/My Project" @@ -54,7 +54,7 @@ Scenario: Unassign object - multiple objects are contained again to their indire And I press "bim.add_aggregate(ifc_class='IfcWall')" And the object "IfcMember/Cube" is selected And additionally the object "IfcCovering/Cube" is selected - When I press "bim.unassign_object" + When I press "bim.aggregate_unassign_object" Then the object "IfcMember/Cube" is in the collection "IfcBuildingStorey/My Storey" And the object "IfcCovering/Cube" is in the collection "IfcBuildingStorey/My Storey"