Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-19 06:39:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Measure Tool - fix issue where the area highlight was incorrectly displayed in polyline mode.

Browse Source
This commit is contained in:
Bruno Perdigão
2025-04-05 11:55:05 -03:00
parent 2bf303686c
commit c280550e30
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/bim/module/model/decorator.py
+3 -3
View File
@@ -538,7 +538,7 @@ class PolylineDecorator:
polyline_verts = [Vector((p.x, p.y, p.z)) for p in polyline_points] polyline_verts = [Vector((p.x, p.y, p.z)) for p in polyline_points]
# Area # Area
if measure_type == "AREA" and polyline_data.area: if measure_type == "POLY_AREA" and polyline_data.area:
if len(polyline_verts) < 3: if len(polyline_verts) < 3:
return return
center = sum(polyline_verts, Vector()) / len(polyline_verts) # Center between all polyline points center = sum(polyline_verts, Vector()) / len(polyline_verts) # Center between all polyline points
@@ -556,7 +556,7 @@ class PolylineDecorator:
blf.draw(self.font_id, text) blf.draw(self.font_id, text)
# Length # Length
if measure_type in {"POLYLINE", "AREA"}: if measure_type in {"POLYLINE", "POLY_AREA"}:
if len(polyline_verts) < 3: if len(polyline_verts) < 3:
return return
total_length_text_coords = view3d_utils.location_3d_to_region_2d(region, rv3d, polyline_verts[-1]) total_length_text_coords = view3d_utils.location_3d_to_region_2d(region, rv3d, polyline_verts[-1])
@@ -765,7 +765,7 @@ class PolylineDecorator:
# Area highlight # Area highlight
if polyline_data: if polyline_data:
area = polyline_data.area.split(" ")[0] area = polyline_data.area.split(" ")[0]
if area: if polyline_data.measurement_type == "POLY_AREA" and area:
if float(area) > 0: if float(area) > 0:
tris = self.calculate_polygon(polyline_verts)["tris"] tris = self.calculate_polygon(polyline_verts)["tris"]
self.draw_batch("TRIS", polyline_verts, transparent_color(decorator_color_special), tris) self.draw_batch("TRIS", polyline_verts, transparent_color(decorator_color_special), tris)
src/bonsai/bonsai/bim/module/project/decorator.py
+4 -4
View File
@@ -329,7 +329,7 @@ class MeasureDecorator:
all_positions = [] all_positions = []
for i in range(len(polyline_points)): for i in range(len(polyline_points)):
if i < 1 and measure_type == "AREA": if i < 1 and measure_type == "POLY_AREA":
continue continue
if i == 0: if i == 0:
continue continue
@@ -374,7 +374,7 @@ class MeasureDecorator:
polyline_verts = [Vector((p.x, p.y, p.z)) for p in polyline_points] polyline_verts = [Vector((p.x, p.y, p.z)) for p in polyline_points]
# Area # Area
if measure_type == "AREA" and polyline_data.area: if measure_type == "POLY_AREA" and polyline_data.area:
if len(polyline_verts) < 3: if len(polyline_verts) < 3:
continue continue
center = sum(polyline_verts, Vector()) / len(polyline_verts) # Center between all polyline points center = sum(polyline_verts, Vector()) / len(polyline_verts) # Center between all polyline points
@@ -392,7 +392,7 @@ class MeasureDecorator:
blf.draw(self.font_id, text) blf.draw(self.font_id, text)
# Length # Length
if measure_type in {"POLYLINE", "AREA"}: if measure_type in {"POLYLINE", "POLY_AREA"}:
if len(polyline_verts) < 3: if len(polyline_verts) < 3:
continue continue
total_length_text_coords = view3d_utils.location_3d_to_region_2d(region, rv3d, polyline_verts[-1]) total_length_text_coords = view3d_utils.location_3d_to_region_2d(region, rv3d, polyline_verts[-1])
@@ -455,7 +455,7 @@ class MeasureDecorator:
# Area highlight # Area highlight
if polyline_data: if polyline_data:
area = polyline_data.area.split(" ")[0] area = polyline_data.area.split(" ")[0]
if area: if polyline_data.measurement_type == "POLY_AREA" and area:
if float(area) > 0: if float(area) > 0:
tris = self.calculate_polygon(polyline_verts)["tris"] tris = self.calculate_polygon(polyline_verts)["tris"]
self.draw_batch("TRIS", polyline_verts, transparent_color(decorator_color_special), tris) self.draw_batch("TRIS", polyline_verts, transparent_color(decorator_color_special), tris)