Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-21 14:23:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed annotations angle operator svg rendering bug

Browse Source 
Fixed bug where the angle was drawn in svg only for the first two edges of the curve.
Now it takes into account all edges - first angle = edge0 + edge1, second angle = edge1 + edge2 etc.
This commit is contained in:
Andrej730
2022-12-19 20:07:29 +05:00
committed by Dion Moult
parent 3ab02a3931
commit a7cbc628a8
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py
+8 -5
View File
@@ -622,12 +622,13 @@ class SvgWriter:
) )
def draw_angle_annotations(self, obj): def draw_angle_annotations(self, obj):
# calculate p3 which is the center of the arc
# to use draw_svg_3point_arc()
points = obj.data.splines[0].points points = obj.data.splines[0].points
region = bpy.context.region region = bpy.context.region
region_3d = bpy.context.area.spaces.active.region_3d region_3d = bpy.context.area.spaces.active.region_3d
points_2d = [view3d_utils.location_3d_to_region_2d(region, region_3d, p.co.xyz) for p in points] points_chunked = [points[i:i+3] for i in range(len(points)-2)]
for points_chunk in points_chunked:
points_2d = [view3d_utils.location_3d_to_region_2d(region, region_3d, p.co.xyz) for p in points_chunk]
edge0 = points_2d[0] - points_2d[1] edge0 = points_2d[0] - points_2d[1]
edge1 = points_2d[2] - points_2d[1] edge1 = points_2d[2] - points_2d[1]
@@ -636,18 +637,20 @@ class SvgWriter:
dir1 = edge1.normalized() dir1 = edge1.normalized()
dir2 = ((dir0 + dir1) / 2).normalized() dir2 = ((dir0 + dir1) / 2).normalized()
# calculate p3 which is the center of the arc
# to use draw_svg_3point_arc()
p3 = points_2d[1] + dir2 * angle_radius p3 = points_2d[1] + dir2 * angle_radius
# make all edges the same radius # make all edges the same radius
p0 = points_2d[1] + dir0 * angle_radius p0 = points_2d[1] + dir0 * angle_radius
p2 = points_2d[1] + dir1 * angle_radius p2 = points_2d[1] + dir1 * angle_radius
points = [view3d_utils.region_2d_to_origin_3d(region, region_3d, p) for p in [p0, p3, p2]] points_chunk = [view3d_utils.region_2d_to_origin_3d(region, region_3d, p) for p in [p0, p3, p2]]
# points = [p.co.xyz for p in bpy.context.object.data.splines[0].points[:3]] # points = [p.co.xyz for p in bpy.context.object.data.splines[0].points[:3]]
bm = bmesh.new() bm = bmesh.new()
bm.verts.index_update() bm.verts.index_update()
bm.edges.index_update() bm.edges.index_update()
new_verts = [bm.verts.new(p) for p in points] new_verts = [bm.verts.new(p) for p in points_chunk]
new_edges = [bm.edges.new( (new_verts[e[0]], new_verts[e[1]]) ) for e in ((0, 1), (1, 2))] new_edges = [bm.edges.new( (new_verts[e[0]], new_verts[e[1]]) ) for e in ((0, 1), (1, 2))]
self.draw_svg_3point_arc(obj, bm) self.draw_svg_3point_arc(obj, bm)