From 61d68b74cabea189c84a065de0e999ffc41b897f Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Thu, 16 Jan 2025 15:27:00 +0500 Subject: [PATCH] bim.add_filled_opening - remove unused operator --- src/bonsai/bonsai/bim/module/model/__init__.py | 1 - src/bonsai/bonsai/bim/module/model/opening.py | 12 ------------ src/bonsai/bonsai/bim/module/model/product.py | 2 +- src/bonsai/bonsai/tool/model.py | 4 ++++ 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/bonsai/bonsai/bim/module/model/__init__.py b/src/bonsai/bonsai/bim/module/model/__init__.py index 6bf42d99e9..ae009991db 100644 --- a/src/bonsai/bonsai/bim/module/model/__init__.py +++ b/src/bonsai/bonsai/bim/module/model/__init__.py @@ -77,7 +77,6 @@ classes = ( wall.SplitWall, wall.UnjoinWalls, opening.AddBoolean, - opening.AddFilledOpening, opening.AddPotentialHalfSpaceSolid, opening.AddPotentialOpening, opening.EditOpenings, diff --git a/src/bonsai/bonsai/bim/module/model/opening.py b/src/bonsai/bonsai/bim/module/model/opening.py index c1900c7926..573f15c655 100644 --- a/src/bonsai/bonsai/bim/module/model/opening.py +++ b/src/bonsai/bonsai/bim/module/model/opening.py @@ -48,18 +48,6 @@ from gpu_extras.batch import batch_for_shader from typing import Union, Optional, Any, cast, Sequence -class AddFilledOpening(bpy.types.Operator, tool.Ifc.Operator): - bl_idname = "bim.add_filled_opening" - bl_label = "Add Filled Opening" - bl_options = {"REGISTER", "UNDO"} - voided_obj: bpy.props.StringProperty() - filling_obj: bpy.props.StringProperty() - - def _execute(self, context): - FilledOpeningGenerator().generate(bpy.data.objects.get(self.filling_obj), bpy.data.objects.get(self.voided_obj)) - return {"FINISHED"} - - class FilledOpeningGenerator: def generate( self, diff --git a/src/bonsai/bonsai/bim/module/model/product.py b/src/bonsai/bonsai/bim/module/model/product.py index b572376532..d79a04f9b3 100644 --- a/src/bonsai/bonsai/bim/module/model/product.py +++ b/src/bonsai/bonsai/bim/module/model/product.py @@ -419,7 +419,7 @@ class AddConstrTypeInstance(bpy.types.Operator, tool.Ifc.Operator): ): if instance_class in ["IfcWindow", "IfcDoor"]: # TODO For now we are hardcoding windows and doors as a prototype - bpy.ops.bim.add_filled_opening(voided_obj=building_obj.name, filling_obj=obj.name) + tool.Model.add_filled_opening(building_obj, obj) else: if self.container_obj: if props.rl_mode == "BOTTOM": diff --git a/src/bonsai/bonsai/tool/model.py b/src/bonsai/bonsai/tool/model.py index a3585e73e7..e3311cc76d 100644 --- a/src/bonsai/bonsai/tool/model.py +++ b/src/bonsai/bonsai/tool/model.py @@ -2038,3 +2038,7 @@ class Model(bonsai.core.tool.Model): else: geom_dict["edges"].append(el) return geom_dict + + @classmethod + def add_filled_opening(cls, voided_obj: bpy.types.Object, filling_obj: bpy.types.Object) -> None: + FilledOpeningGenerator().generate(filling_obj, voided_obj)