Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-10 17:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mitred wall joints rebuilt on the new wall engine

Browse Source
This commit is contained in:
Dion Moult
2022-09-23 15:42:05 +10:00
parent 7cee0a85c6
commit 6699bfeb54
2 changed files with 174 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/model/wall.py
+158 -63
View File
@@ -78,7 +78,8 @@ class JoinWall(bpy.types.Operator):
bl_options = {"REGISTER", "UNDO"}
bl_description = """ Trim/Extend the selected walls to the last selected wall:
'T' mode: Trim/Extend to a selected wall or 3D target
'L' mode: Join two selected wall ends
'L' mode: Butt join two selected walls
'V' mode: Mitre join two selected wall
'' (empty) mode: Unjoin selected walls
"""
join_type: bpy.props.StringProperty()
@@ -100,10 +101,12 @@ class JoinWall(bpy.types.Operator):
return {"FINISHED"}
if len(selected_objs) == 1:
joiner.join_E(context.active_object, context.scene.cursor.location)
#IfcStore.edited_objs.add(context.active_object)
return {"FINISHED"}
if len(selected_objs) == 2 and self.join_type == "L":
joiner.join_L([o for o in selected_objs if o != context.active_object][0], context.active_object)
if len(selected_objs) == 2:
if self.join_type == "L":
joiner.join_L([o for o in selected_objs if o != context.active_object][0], context.active_object)
elif self.join_type == "V":
joiner.join_V([o for o in selected_objs if o != context.active_object][0], context.active_object)
if len(selected_objs) < 2:
return {"FINISHED"}
if self.join_type == "T":
@@ -424,7 +427,7 @@ class DumbWallGenerator:
self.location = Vector((0, 0, 0))
if self.has_sketch():
return # For now
return # For now
return self.derive_from_sketch()
return self.derive_from_cursor()
@@ -908,10 +911,37 @@ class DumbWallJoiner:
relating_element=element2,
relating_connection="ATPATH",
related_connection=connection,
description="BUTT",
)
self.recreate_wall(element1, wall1, axis1["reference"], axis1["reference"])
def join_V(self, wall1, wall2):
element1 = tool.Ifc.get_entity(wall1)
element2 = tool.Ifc.get_entity(wall2)
axis1 = self.get_wall_axis(wall1)
axis2 = self.get_wall_axis(wall2)
intersect = tool.Cad.intersect_edges(axis1["reference"], axis2["reference"])
if intersect:
intersect, _ = intersect
else:
return
wall1_end = "ATEND" if tool.Cad.edge_percent(intersect, axis1["reference"]) > 0.5 else "ATSTART"
wall2_end = "ATEND" if tool.Cad.edge_percent(intersect, axis2["reference"]) > 0.5 else "ATSTART"
ifcopenshell.api.run(
"geometry.connect_path",
tool.Ifc.get(),
relating_element=element1,
related_element=element2,
relating_connection=wall1_end,
related_connection=wall2_end,
description="MITRE",
)
self.recreate_wall(element1, wall1, axis1["reference"], axis1["reference"])
self.recreate_wall(element2, wall2, axis2["reference"], axis2["reference"])
def recreate_wall(self, element, obj, axis=None, body=None):
if axis is None or body is None:
axis = body = self.get_wall_axis(obj)["reference"]
@@ -925,12 +955,12 @@ class DumbWallJoiner:
connection = rel.RelatingConnectionType
other = tool.Ifc.get_object(rel.RelatedElement)
if connection not in ["ATPATH", "NOTDEFINED"]:
self.join(obj, other, connection, is_relating=True)
self.join(obj, other, connection, rel.RelatedConnectionType, is_relating=True, description=rel.Description)
for rel in element.ConnectedFrom:
connection = rel.RelatedConnectionType
other = tool.Ifc.get_object(rel.RelatingElement)
if connection not in ["ATPATH", "NOTDEFINED"]:
self.join(obj, other, connection, is_relating=False)
self.join(obj, other, connection, rel.RelatingConnectionType, is_relating=False, description=rel.Description)
new_matrix = copy.deepcopy(obj.matrix_world)
new_matrix.col[3] = self.body[0].to_4d()
@@ -1038,8 +1068,7 @@ class DumbWallJoiner:
break
return height
def join(self, wall1, wall2, connection, is_relating=True):
print('going to join', wall1, wall2, connection, is_relating)
def join(self, wall1, wall2, connection1, connection2, is_relating=True, description="BUTT"):
element1 = tool.Ifc.get_entity(wall1)
element2 = tool.Ifc.get_entity(wall2)
layers1 = get_material_layer_parameters(element1)
@@ -1047,8 +1076,8 @@ class DumbWallJoiner:
axis1 = self.get_wall_axis(wall1, layers1)
axis2 = self.get_wall_axis(wall2, layers2)
angle = tool.Cad.angle_edges(axis1["reference"], axis2["reference"], signed=False, degrees=True)
if tool.Cad.is_x(angle, (0, 180), tolerance=0.001):
angle = tool.Cad.angle_edges(axis1["reference"], axis2["reference"], signed=True, degrees=True)
if tool.Cad.is_x(abs(angle), (0, 180), tolerance=0.001):
return False
# Work out axis line
@@ -1058,13 +1087,13 @@ class DumbWallJoiner:
else:
return False
proposed_axis = [self.axis[0], intersect] if connection == "ATEND" else [intersect, self.axis[1]]
proposed_axis = [self.axis[0], intersect] if connection1 == "ATEND" else [intersect, self.axis[1]]
if tool.Cad.is_x(tool.Cad.angle_edges(self.axis, proposed_axis, degrees=True), 180, tolerance=0.001):
# The user has moved the wall into an invalid position that cannot connect at the desired end
return False
self.axis[1 if connection == "ATEND" else 0] = intersect
self.axis[1 if connection1 == "ATEND" else 0] = intersect
# Work out body extents
intersect1, _ = tool.Cad.intersect_edges(axis1["base"], axis2["base"])
@@ -1072,65 +1101,131 @@ class DumbWallJoiner:
intersect3, _ = tool.Cad.intersect_edges(axis1["side"], axis2["base"])
intersect4, _ = tool.Cad.intersect_edges(axis1["side"], axis2["side"])
intersect12 = intersect1.lerp(intersect2, 0.5)
intersect34 = intersect3.lerp(intersect4, 0.5)
if connection == "ATEND":
if is_relating:
if description == "MITRE":
# Mitre joints are an unofficial convention
if connection1 == "ATEND":
base_target = tool.Cad.furthest_vector(axis1["base"][0], (intersect1, intersect2))
else:
base_target = tool.Cad.closest_vector(axis1["base"][0], (intersect1, intersect2))
if tool.Cad.is_x(angle, (90, 270), tolerance=0.001):
self.body[1] = tool.Cad.point_on_edge(base_target, axis1["reference"])
else:
if is_relating:
side_target = tool.Cad.furthest_vector(axis1["side"][0], (intersect3, intersect4))
else:
side_target = tool.Cad.closest_vector(axis1["side"][0], (intersect3, intersect4))
base_percent = tool.Cad.edge_percent(base_target, axis1["base"])
side_percent = tool.Cad.edge_percent(side_target, axis1["side"])
if base_percent > side_percent:
if tool.Cad.is_x(abs(angle), (90, 270), tolerance=0.001):
self.body[1] = tool.Cad.point_on_edge(base_target, axis1["reference"])
clip = side_target.to_3d()
x_axis = (side_target - base_target).normalized().to_3d()
y_axis = Vector((0, 0, 1))
z_axis = x_axis.cross(y_axis)
self.clippings.append(self.create_matrix(clip, x_axis, y_axis, z_axis))
else:
self.body[1] = tool.Cad.point_on_edge(side_target, axis1["reference"])
clip = base_target.to_3d()
x_axis = (side_target - base_target).normalized().to_3d()
y_axis = Vector((0, 0, 1))
z_axis = x_axis.cross(y_axis)
self.clippings.append(self.create_matrix(clip, x_axis, y_axis, z_axis))
else:
if is_relating:
base_target = tool.Cad.furthest_vector(axis1["base"][1], (intersect1, intersect2))
side_target = tool.Cad.furthest_vector(axis1["side"][0], (intersect3, intersect4))
base_percent = tool.Cad.edge_percent(base_target, axis1["base"])
side_percent = tool.Cad.edge_percent(side_target, axis1["side"])
if base_percent > side_percent:
self.body[1] = tool.Cad.point_on_edge(base_target, axis1["reference"])
else:
self.body[1] = tool.Cad.point_on_edge(side_target, axis1["reference"])
# Mitre clip
if connection1 == connection2:
if angle < 0:
clip1 = tool.Cad.closest_vector(axis1["base"][0], (intersect1, intersect2))
clip2 = tool.Cad.furthest_vector(axis1["side"][0], (intersect3, intersect4))
else:
clip1 = tool.Cad.furthest_vector(axis1["base"][0], (intersect1, intersect2))
clip2 = tool.Cad.closest_vector(axis1["side"][0], (intersect3, intersect4))
else:
if angle < 0:
clip1 = tool.Cad.furthest_vector(axis1["base"][0], (intersect1, intersect2))
clip2 = tool.Cad.closest_vector(axis1["side"][0], (intersect3, intersect4))
else:
clip1 = tool.Cad.closest_vector(axis1["base"][0], (intersect1, intersect2))
clip2 = tool.Cad.furthest_vector(axis1["side"][0], (intersect3, intersect4))
y_axis = Vector((0, 0, -1))
x_axis = (clip1 - clip2).normalized().to_3d()
z_axis = x_axis.cross(y_axis)
self.clippings.append(self.create_matrix(clip1.to_3d(), x_axis, y_axis, z_axis))
else:
base_target = tool.Cad.closest_vector(axis1["base"][1], (intersect1, intersect2))
if tool.Cad.is_x(angle, (90, 270), tolerance=0.001):
self.body[0] = tool.Cad.point_on_edge(base_target, axis1["reference"])
base_target = tool.Cad.furthest_vector(axis1["base"][1], (intersect1, intersect2))
if tool.Cad.is_x(abs(angle), (90, 270), tolerance=0.001):
self.body[0] = tool.Cad.point_on_edge(base_target, axis1["reference"])
else:
side_target = tool.Cad.furthest_vector(axis1["side"][1], (intersect3, intersect4))
base_percent = tool.Cad.edge_percent(base_target, axis1["base"])
side_percent = tool.Cad.edge_percent(side_target, axis1["side"])
if base_percent < side_percent:
self.body[0] = tool.Cad.point_on_edge(base_target, axis1["reference"])
else:
self.body[0] = tool.Cad.point_on_edge(side_target, axis1["reference"])
# Mitre clip
if connection1 == connection2:
if angle < 0:
clip1 = tool.Cad.furthest_vector(axis1["base"][1], (intersect1, intersect2))
clip2 = tool.Cad.closest_vector(axis1["side"][1], (intersect3, intersect4))
else:
clip1 = tool.Cad.closest_vector(axis1["base"][1], (intersect1, intersect2))
clip2 = tool.Cad.furthest_vector(axis1["side"][1], (intersect3, intersect4))
y_axis = Vector((0, 0, 1))
else:
if angle < 0:
clip1 = tool.Cad.closest_vector(axis1["base"][1], (intersect1, intersect2))
clip2 = tool.Cad.furthest_vector(axis1["side"][1], (intersect3, intersect4))
else:
clip1 = tool.Cad.furthest_vector(axis1["base"][1], (intersect1, intersect2))
clip2 = tool.Cad.closest_vector(axis1["side"][1], (intersect3, intersect4))
y_axis = Vector((0, 0, 1))
x_axis = (clip1 - clip2).normalized().to_3d()
z_axis = x_axis.cross(y_axis)
self.clippings.append(self.create_matrix(clip1.to_3d(), x_axis, y_axis, z_axis))
else:
# This is the standard L and T joints described by IFC
if connection1 == "ATEND":
if is_relating:
base_target = tool.Cad.furthest_vector(axis1["base"][0], (intersect1, intersect2))
else:
base_target = tool.Cad.closest_vector(axis1["base"][0], (intersect1, intersect2))
if tool.Cad.is_x(abs(angle), (90, 270), tolerance=0.001):
self.body[1] = tool.Cad.point_on_edge(base_target, axis1["reference"])
else:
if is_relating:
side_target = tool.Cad.furthest_vector(axis1["side"][0], (intersect3, intersect4))
else:
side_target = tool.Cad.closest_vector(axis1["side"][0], (intersect3, intersect4))
base_percent = tool.Cad.edge_percent(base_target, axis1["base"])
side_percent = tool.Cad.edge_percent(side_target, axis1["side"])
if base_percent > side_percent:
self.body[1] = tool.Cad.point_on_edge(base_target, axis1["reference"])
clip = side_target.to_3d()
x_axis = (side_target - base_target).normalized().to_3d()
y_axis = Vector((0, 0, 1))
z_axis = x_axis.cross(y_axis)
self.clippings.append(self.create_matrix(clip, x_axis, y_axis, z_axis))
else:
self.body[1] = tool.Cad.point_on_edge(side_target, axis1["reference"])
clip = base_target.to_3d()
x_axis = (side_target - base_target).normalized().to_3d()
y_axis = Vector((0, 0, 1))
z_axis = x_axis.cross(y_axis)
self.clippings.append(self.create_matrix(clip, x_axis, y_axis, z_axis))
else:
if is_relating:
side_target = tool.Cad.furthest_vector(axis1["side"][1], (intersect3, intersect4))
base_target = tool.Cad.furthest_vector(axis1["base"][1], (intersect1, intersect2))
else:
side_target = tool.Cad.closest_vector(axis1["side"][1], (intersect3, intersect4))
base_percent = tool.Cad.edge_percent(base_target, axis1["base"])
side_percent = tool.Cad.edge_percent(side_target, axis1["side"])
if base_percent < side_percent:
base_target = tool.Cad.closest_vector(axis1["base"][1], (intersect1, intersect2))
if tool.Cad.is_x(abs(angle), (90, 270), tolerance=0.001):
self.body[0] = tool.Cad.point_on_edge(base_target, axis1["reference"])
clip = side_target.to_3d()
x_axis = (side_target - base_target).normalized().to_3d()
y_axis = Vector((0, 0, 1))
z_axis = y_axis.cross(x_axis)
self.clippings.append(self.create_matrix(clip, x_axis, y_axis, z_axis))
else:
self.body[0] = tool.Cad.point_on_edge(side_target, axis1["reference"])
clip = base_target.to_3d()
x_axis = (side_target - base_target).normalized().to_3d()
y_axis = Vector((0, 0, 1))
z_axis = y_axis.cross(x_axis)
self.clippings.append(self.create_matrix(clip, x_axis, y_axis, z_axis))
if is_relating:
side_target = tool.Cad.furthest_vector(axis1["side"][1], (intersect3, intersect4))
else:
side_target = tool.Cad.closest_vector(axis1["side"][1], (intersect3, intersect4))
base_percent = tool.Cad.edge_percent(base_target, axis1["base"])
side_percent = tool.Cad.edge_percent(side_target, axis1["side"])
if base_percent < side_percent:
self.body[0] = tool.Cad.point_on_edge(base_target, axis1["reference"])
clip = side_target.to_3d()
x_axis = (side_target - base_target).normalized().to_3d()
y_axis = Vector((0, 0, 1))
z_axis = y_axis.cross(x_axis)
self.clippings.append(self.create_matrix(clip, x_axis, y_axis, z_axis))
else:
self.body[0] = tool.Cad.point_on_edge(side_target, axis1["reference"])
clip = base_target.to_3d()
x_axis = (side_target - base_target).normalized().to_3d()
y_axis = Vector((0, 0, 1))
z_axis = y_axis.cross(x_axis)
self.clippings.append(self.create_matrix(clip, x_axis, y_axis, z_axis))
return True
src/blenderbim/blenderbim/bim/module/model/workspace.py
+16 -7
View File
@@ -43,6 +43,7 @@ class BimTool(WorkSpaceTool):
("bim.hotkey", {"type": "C", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_C")]}),
("bim.hotkey", {"type": "E", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_E")]}),
("bim.hotkey", {"type": "F", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_F")]}),
("bim.hotkey", {"type": "G", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_G")]}),
("bim.hotkey", {"type": "M", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_M")]}),
("bim.hotkey", {"type": "O", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_O")]}),
("bim.hotkey", {"type": "S", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_S")]}),
@@ -154,7 +155,11 @@ class BimTool(WorkSpaceTool):
row = layout.row(align=True)
row.label(text="", icon="EVENT_SHIFT")
row.label(text="", icon="EVENT_Y")
row.operator("bim.hotkey", text="Regen Connections").hotkey="S_Y"
row.operator("bim.hotkey", text="Mitre").hotkey="S_Y"
row = layout.row(align=True)
row.label(text="", icon="EVENT_SHIFT")
row.label(text="", icon="EVENT_G")
row.operator("bim.hotkey", text="Regen Connections").hotkey="S_G"
row = layout.row(align=True)
row.label(text="", icon="EVENT_SHIFT")
row.label(text="", icon="EVENT_M")
@@ -264,6 +269,14 @@ class Hotkey(bpy.types.Operator):
elif self.props.ifc_class in ["IfcColumnType", "IfcBeamType", "IfcMemberType"]:
bpy.ops.bim.extend_profile(join_type="T")
def hotkey_S_F(self):
if self.has_ifc_class and self.props.ifc_class == "IfcWallType":
bpy.ops.bim.flip_wall()
def hotkey_S_G(self):
if self.has_ifc_class and self.props.ifc_class == "IfcWallType":
bpy.ops.bim.recalculate_wall()
def hotkey_S_T(self):
if not self.has_ifc_class:
return
@@ -285,10 +298,6 @@ class Hotkey(bpy.types.Operator):
else:
bpy.ops.bim.align_product(align_type="NEGATIVE")
def hotkey_S_F(self):
if self.has_ifc_class and self.props.ifc_class == "IfcWallType":
bpy.ops.bim.flip_wall()
def hotkey_S_S(self):
if self.has_ifc_class and self.props.ifc_class == "IfcWallType":
bpy.ops.bim.split_wall()
@@ -298,8 +307,8 @@ class Hotkey(bpy.types.Operator):
bpy.ops.bim.merge_wall()
def hotkey_S_Y(self):
if self.has_ifc_class and self.props.ifc_class == "IfcWallType":
bpy.ops.bim.recalculate_wall()
if self.props.ifc_class == "IfcWallType":
bpy.ops.bim.join_wall(join_type="V")
def hotkey_S_O(self):
bpy.ops.bim.add_element_opening(voided_building_element="", filling_building_element="")