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

black .

Browse Source
This commit is contained in:
Andrej730
2025-02-24 11:47:19 +05:00
parent 3854afb34d
commit 0783f8082e
8 changed files with 153 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/bim/module/model/polyline.py
+29 -17
View File
@@ -446,25 +446,25 @@ def get_horizontal_profile_preview_data(context, relating_type):
# The first one is for the profile start, based on the current and previous segment of the polyline.
# The second is for the profile end, based on the current and the next segment.
if i == 0:
d = (polyline_verts[i+1] - polyline_verts[i]).normalized()
d = (polyline_verts[i + 1] - polyline_verts[i]).normalized()
clip_start = d
else:
d1 = (polyline_verts[i] - polyline_verts[i-1]).normalized()
d2 = (polyline_verts[i] - polyline_verts[i+1]).normalized()
clip_start = (d1-d2).normalized()
d1 = (polyline_verts[i] - polyline_verts[i - 1]).normalized()
d2 = (polyline_verts[i] - polyline_verts[i + 1]).normalized()
clip_start = (d1 - d2).normalized()
if i == len(polyline_verts) - 2:
d = (polyline_verts[i+1] - polyline_verts[i]).normalized()
d = (polyline_verts[i + 1] - polyline_verts[i]).normalized()
clip_end = d
else:
d1 = (polyline_verts[i+1] - polyline_verts[i]).normalized()
d2 = (polyline_verts[i+1] - polyline_verts[i+2]).normalized()
clip_end = (d1-d2).normalized()
d1 = (polyline_verts[i + 1] - polyline_verts[i]).normalized()
d2 = (polyline_verts[i + 1] - polyline_verts[i + 2]).normalized()
clip_end = (d1 - d2).normalized()
# Rotates the profile face to the right direction
direction = polyline_verts[i+1] - polyline_verts[i]
direction = polyline_verts[i + 1] - polyline_verts[i]
position = polyline_verts[i]
rotation_matrix = direction.to_track_quat('Z', 'Y').to_matrix().to_4x4()
rotation_matrix = direction.to_track_quat("Z", "Y").to_matrix().to_4x4()
bmesh.ops.transform(bm, verts=bm.verts, matrix=rotation_matrix)
bmesh.ops.translate(bm, verts=bm.verts, vec=position)
bmesh.ops.translate(bm, verts=bm.verts, vec=-direction)
@@ -474,10 +474,22 @@ def get_horizontal_profile_preview_data(context, relating_type):
new_verts = [e for e in last_face["geom"] if isinstance(e, bmesh.types.BMVert)]
bmesh.ops.translate(bm, verts=new_verts, vec=direction * 3)
# Apply the cutting planes
cut = bmesh.ops.bisect_plane(bm, geom=bm.verts[:] + bm.edges[:] + bm.faces[:], plane_co=polyline_verts[i], plane_no=clip_start, clear_inner=True)
cut = bmesh.ops.bisect_plane(
bm,
geom=bm.verts[:] + bm.edges[:] + bm.faces[:],
plane_co=polyline_verts[i],
plane_no=clip_start,
clear_inner=True,
)
bm.verts.index_update()
bm.edges.index_update()
cut = bmesh.ops.bisect_plane(bm, geom=bm.verts[:] + bm.edges[:] + bm.faces[:], plane_co=polyline_verts[i+1], plane_no=clip_end, clear_outer=True)
cut = bmesh.ops.bisect_plane(
bm,
geom=bm.verts[:] + bm.edges[:] + bm.faces[:],
plane_co=polyline_verts[i + 1],
plane_no=clip_end,
clear_outer=True,
)
bm.to_mesh(mesh)
bm.free()
@@ -489,7 +501,7 @@ def get_horizontal_profile_preview_data(context, relating_type):
mesh = bpy.data.meshes.new("TempMesh2")
all_bm.to_mesh(mesh)
all_bm.free()
obj = bpy.data.objects.new('TempObj', mesh)
obj = bpy.data.objects.new("TempObj", mesh)
bm = bmesh.new()
bm.from_mesh(obj.data)
bpy.data.meshes.remove(bpy.data.meshes["TempMesh2"])
@@ -639,21 +651,21 @@ class PolylineOperator:
if x:
if event.shift and event.value == "PRESS" and event.type == "X":
self.tool_state.use_default_container = False
self.tool_state.plane_method = "YZ" if self.tool_state.plane_method !="YZ" else None
self.tool_state.plane_method = "YZ" if self.tool_state.plane_method != "YZ" else None
self.tool_state.axis_method = None
tool.Blender.update_viewport()
if y:
if event.shift and event.value == "PRESS" and event.type == "Y":
self.tool_state.use_default_container = False
self.tool_state.plane_method = "XZ" if self.tool_state.plane_method !="XZ" else None
self.tool_state.plane_method = "XZ" if self.tool_state.plane_method != "XZ" else None
self.tool_state.axis_method = None
tool.Blender.update_viewport()
if z:
if event.shift and event.value == "PRESS" and event.type == "Z":
self.tool_state.use_default_container = False
self.tool_state.plane_method = "XY" if self.tool_state.plane_method !="XY" else None
self.tool_state.plane_method = "XY" if self.tool_state.plane_method != "XY" else None
self.tool_state.axis_method = None
tool.Blender.update_viewport()
src/bonsai/bonsai/bim/module/model/profile.py
+1 -2
View File
@@ -112,10 +112,9 @@ class DumbProfileGenerator:
matrix_world = Matrix.Rotation(pi / 2, 4, "Z") @ Matrix.Rotation(pi / 2, 4, "X") @ matrix_world
matrix_world = Matrix.Rotation(self.rotation, 4, "Z") @ matrix_world
else:
rotation_matrix = self.direction.to_track_quat('Z', 'Y')
rotation_matrix = self.direction.to_track_quat("Z", "Y")
matrix_world = rotation_matrix.to_matrix().to_4x4() @ matrix_world
matrix_world.translation = self.location
if self.insertion_type not in {"POLYLINE"} and self.container_obj:
matrix_world.translation.z = self.container_obj.location.z
src/bonsai/bonsai/tool/polyline.py
+3 -4
View File
@@ -523,11 +523,10 @@ class Polyline(bonsai.core.tool.Polyline):
return "Cannot create two points at the same location"
# Avoids creating overlapping edges
if len(polyline_points) > 1:
v1 = Vector((x, y, z))
v1 = Vector((x, y, z))
v2 = Vector((polyline_points[-1].x, polyline_points[-1].y, polyline_points[-1].z))
v3 = Vector((polyline_points[-2].x, polyline_points[-2].y, polyline_points[-2].z))
angle = tool.Cad.angle_3_vectors(v1, v2, v3, new_angle=None, degrees=True
)
v3 = Vector((polyline_points[-2].x, polyline_points[-2].y, polyline_points[-2].z))
angle = tool.Cad.angle_3_vectors(v1, v2, v3, new_angle=None, degrees=True)
if tool.Cad.is_x(angle, 0):
return
# TODO move this limitation to be Wall tool specific. Right now it also affects Measure tool
src/bonsai/scripts/waldo.py
-1
View File
@@ -227,7 +227,6 @@ class Foo:
else:
ifcopenshell.api.geometry.assign_representation(self.file, product=wall, representation=rep)
def join(self, wall1, wall2, layers1, layers2, connection1, connection2):
if connection1 == "NOTDEFINED" or connection2 == "NOTDEFINED":
return