diff --git a/src/ifcblenderexport/blenderbim/bim/module/model/door.py b/src/ifcblenderexport/blenderbim/bim/module/model/door.py index e8ff0bd46d..585031a342 100644 --- a/src/ifcblenderexport/blenderbim/bim/module/model/door.py +++ b/src/ifcblenderexport/blenderbim/bim/module/model/door.py @@ -3,8 +3,8 @@ import math import ifcopenshell from bpy.types import Operator from bpy.props import FloatProperty -from bpy_extras.object_utils import AddObjectHelper, object_data_add from mathutils import Vector +from blenderbim.bim.ifc import IfcStore def add_object(self, context): @@ -79,7 +79,11 @@ def add_object(self, context): faces = [[0, 1, 2, 3, 4, 5]] mesh = bpy.data.meshes.new(name="Dumb Door Profile") mesh.from_pydata(verts, edges, faces) - obj = object_data_add(context, mesh, operator=self) + obj = bpy.data.objects.new("Door Profile", mesh) + + context.view_layer.active_layer_collection.collection.objects.link(obj) + bpy.context.view_layer.objects.active = obj + obj.select_set(True) bpy.ops.object.convert(target="CURVE") # Door lining sweep @@ -93,7 +97,11 @@ def add_object(self, context): faces = [] mesh = bpy.data.meshes.new(name="Dumb Door") mesh.from_pydata(verts, edges, faces) - obj2 = object_data_add(context, mesh, operator=self) + obj2 = bpy.data.objects.new("Door", mesh) + + context.view_layer.active_layer_collection.collection.objects.link(obj2) + bpy.context.view_layer.objects.active = obj2 + obj2.select_set(True) bpy.ops.object.convert(target="CURVE") obj2.data.dimensions = "2D" @@ -116,10 +124,14 @@ def add_object(self, context): faces = [[0, 1, 2, 3]] mesh = bpy.data.meshes.new(name="Dumb Door Panel") mesh.from_pydata(verts, edges, faces) - obj3 = object_data_add(context, mesh, operator=self) + obj3 = bpy.data.objects.new("Door Panel", mesh) modifier = obj3.modifiers.new("Panel Height", "SOLIDIFY") modifier.offset = 1 modifier.thickness = self.overall_height - 0.045 + + context.view_layer.active_layer_collection.collection.objects.link(obj3) + bpy.context.view_layer.objects.active = obj3 + obj3.select_set(True) bpy.ops.object.convert(target="MESH") ctx = bpy.context.copy() @@ -138,11 +150,16 @@ def add_object(self, context): faces = [[0, 1, 2, 3]] mesh = bpy.data.meshes.new(name="Dumb Door Opening") mesh.from_pydata(verts, edges, faces) - obj4 = object_data_add(context, mesh, operator=self) + obj4 = bpy.data.objects.new("Door Opening", mesh) modifier = obj4.modifiers.new("Panel Height", "SOLIDIFY") modifier.offset = -1 modifier.thickness = self.overall_height + 0.1 + + context.view_layer.active_layer_collection.collection.objects.link(obj4) + bpy.context.view_layer.objects.active = obj4 + obj4.select_set(True) bpy.ops.object.convert(target="MESH") + obj4.display_type = "WIRE" obj4.parent = obj2 obj4.matrix_parent_inverse = obj2.matrix_world.inverted() @@ -150,6 +167,9 @@ def add_object(self, context): obj4.name = "Door Opening" obj2.name = "Door" + + if IfcStore.get_file(): + bpy.ops.bim.assign_class(obj=obj2.name, ifc_class="IfcDoor") #obj2.data.name = "Model/Body/MODEL_VIEW/" + guid #obj2.data.use_fake_user = True @@ -165,10 +185,9 @@ def add_object(self, context): #rep.target_view = "PLAN_VIEW" -class BIM_OT_add_object(Operator, AddObjectHelper): +class BIM_OT_add_object(Operator): bl_idname = "mesh.add_door" bl_label = "Dumb Door" - bl_options = {"REGISTER", "UNDO"} overall_width: FloatProperty(name="Overall Width", default=0.85) overall_height: FloatProperty(name="Overall Height", default=2.1) diff --git a/src/ifcblenderexport/blenderbim/bim/module/model/slab.py b/src/ifcblenderexport/blenderbim/bim/module/model/slab.py index 09efbb6b3b..f082d24a6b 100644 --- a/src/ifcblenderexport/blenderbim/bim/module/model/slab.py +++ b/src/ifcblenderexport/blenderbim/bim/module/model/slab.py @@ -1,8 +1,8 @@ import bpy from bpy.types import Operator from bpy.props import FloatProperty -from bpy_extras.object_utils import AddObjectHelper, object_data_add from mathutils import Vector +from blenderbim.bim.ifc import IfcStore def add_object(self, context): @@ -17,18 +17,20 @@ def add_object(self, context): mesh = bpy.data.meshes.new(name="Dumb Slab") mesh.from_pydata(verts, edges, faces) - obj = object_data_add(context, mesh, operator=self) + obj = bpy.data.objects.new("Slab", mesh) modifier = obj.modifiers.new("Slab Depth", "SOLIDIFY") modifier.use_even_offset = True modifier.offset = 1 modifier.thickness = self.depth obj.name = "Slab" + context.view_layer.active_layer_collection.collection.objects.link(obj) + if IfcStore.get_file(): + bpy.ops.bim.assign_class(obj=obj.name, ifc_class="IfcSlab") -class BIM_OT_add_object(Operator, AddObjectHelper): +class BIM_OT_add_object(Operator): bl_idname = "mesh.add_slab" bl_label = "Dumb Slab" - bl_options = {"REGISTER", "UNDO"} length: FloatProperty(name="Length", default=2) width: FloatProperty(name="Width", default=2) diff --git a/src/ifcblenderexport/blenderbim/bim/module/model/wall.py b/src/ifcblenderexport/blenderbim/bim/module/model/wall.py index da8db6400a..1204eea00c 100644 --- a/src/ifcblenderexport/blenderbim/bim/module/model/wall.py +++ b/src/ifcblenderexport/blenderbim/bim/module/model/wall.py @@ -1,8 +1,8 @@ import bpy from bpy.types import Operator from bpy.props import FloatProperty, BoolProperty -from bpy_extras.object_utils import AddObjectHelper, object_data_add from mathutils import Vector +from blenderbim.bim.ifc import IfcStore def add_object(self, context): @@ -25,7 +25,8 @@ def add_object(self, context): mesh = bpy.data.meshes.new(name="Dumb Wall") mesh.from_pydata(verts, edges, faces) - obj = object_data_add(context, mesh, operator=self) + obj = bpy.data.objects.new("Wall", mesh) + context.view_layer.active_layer_collection.collection.objects.link(obj) if not self.use_plane: modifier = obj.modifiers.new("Wall Height", "SCREW") modifier.angle = 0 @@ -39,13 +40,14 @@ def add_object(self, context): modifier.use_even_offset = True modifier.thickness = self.width obj.name = "Wall" + if IfcStore.get_file(): + bpy.ops.bim.assign_class(obj=obj.name, ifc_class="IfcWall") return obj -class BIM_OT_add_object(Operator, AddObjectHelper): +class BIM_OT_add_object(Operator): bl_idname = "mesh.add_wall" bl_label = "Dumb Wall" - bl_options = {"REGISTER", "UNDO"} height: FloatProperty(name="Height", default=3) length: FloatProperty(name="Length", default=1) diff --git a/src/ifcblenderexport/blenderbim/bim/module/model/window.py b/src/ifcblenderexport/blenderbim/bim/module/model/window.py index d9ca131f46..1872dbdbb9 100644 --- a/src/ifcblenderexport/blenderbim/bim/module/model/window.py +++ b/src/ifcblenderexport/blenderbim/bim/module/model/window.py @@ -3,8 +3,8 @@ import math import ifcopenshell from bpy.types import Operator from bpy.props import FloatProperty -from bpy_extras.object_utils import AddObjectHelper, object_data_add from mathutils import Vector +from blenderbim.bim.ifc import IfcStore def add_object(self, context): @@ -64,7 +64,11 @@ def add_object(self, context): faces = [[0, 1, 2, 3]] mesh = bpy.data.meshes.new(name="Dumb Window Profile") mesh.from_pydata(verts, edges, faces) - obj = object_data_add(context, mesh, operator=self) + obj = bpy.data.objects.new("Window Profile", mesh) + + context.view_layer.active_layer_collection.collection.objects.link(obj) + bpy.context.view_layer.objects.active = obj + obj.select_set(True) bpy.ops.object.convert(target="CURVE") # Window lining sweep @@ -78,7 +82,11 @@ def add_object(self, context): faces = [] mesh = bpy.data.meshes.new(name="Dumb Window") mesh.from_pydata(verts, edges, faces) - obj2 = object_data_add(context, mesh, operator=self) + obj2 = bpy.data.objects.new("Window", mesh) + + context.view_layer.active_layer_collection.collection.objects.link(obj2) + bpy.context.view_layer.objects.active = obj2 + obj2.select_set(True) bpy.ops.object.convert(target="CURVE") obj2.data.splines[0].use_cyclic_u = True @@ -102,10 +110,14 @@ def add_object(self, context): faces = [[0, 1, 2, 3]] mesh = bpy.data.meshes.new(name="Dumb Window Panel") mesh.from_pydata(verts, edges, faces) - obj3 = object_data_add(context, mesh, operator=self) + obj3 = bpy.data.objects.new("Window Panel", mesh) modifier = obj3.modifiers.new("Panel Height", "SOLIDIFY") modifier.offset = 1 modifier.thickness = self.overall_height - 0.08 + + context.view_layer.active_layer_collection.collection.objects.link(obj3) + bpy.context.view_layer.objects.active = obj3 + obj3.select_set(True) bpy.ops.object.convert(target="MESH") ctx = bpy.context.copy() @@ -124,10 +136,14 @@ def add_object(self, context): faces = [[0, 1, 2, 3]] mesh = bpy.data.meshes.new(name="Dumb Window Opening") mesh.from_pydata(verts, edges, faces) - obj4 = object_data_add(context, mesh, operator=self) + obj4 = bpy.data.objects.new("Window Opening", mesh) modifier = obj4.modifiers.new("Panel Height", "SOLIDIFY") modifier.offset = -1 modifier.thickness = self.overall_height + + context.view_layer.active_layer_collection.collection.objects.link(obj4) + bpy.context.view_layer.objects.active = obj4 + obj4.select_set(True) bpy.ops.object.convert(target="MESH") obj4.display_type = "WIRE" obj4.parent = obj2 @@ -135,6 +151,8 @@ def add_object(self, context): obj4.hide_render = True obj4.name = "Window Opening" + if IfcStore.get_file(): + bpy.ops.bim.assign_class(obj=obj2.name, ifc_class="IfcWindow") obj2.name = "Window" #obj2.data.name = "Model/Body/MODEL_VIEW/" + guid #obj2.data.use_fake_user = True @@ -150,10 +168,9 @@ def add_object(self, context): #rep.target_view = "PLAN_VIEW" -class BIM_OT_add_object(Operator, AddObjectHelper): +class BIM_OT_add_object(Operator): bl_idname = "mesh.add_window" bl_label = "Dumb Window" - bl_options = {"REGISTER", "UNDO"} overall_width: FloatProperty(name="Overall Width", default=0.7) overall_height: FloatProperty(name="Overall Height", default=1)