Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-24 17:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix in polyline wall after 95202364a86c8c56f54dde2873b703ac0cc548b4

Browse Source
This commit is contained in:
Bruno Perdigão
2024-10-05 12:33:32 -03:00
parent 0068023c6f
commit ce1f1bc394
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/bim/module/model/decorator.py
+4 -4
View File
@@ -352,7 +352,7 @@ class PolylineDecorator:
def calculate_measurement_x_y_and_z(self, context): def calculate_measurement_x_y_and_z(self, context):
polyline_data = context.scene.BIMPolylineProperties.insertion_polyline polyline_data = context.scene.BIMPolylineProperties.insertion_polyline
polyline_points = polyline_data[0].polyline_points if len(polyline_data) > 0 else [] polyline_points = polyline_data[0].polyline_points if polyline_data else []
if len(polyline_points) == 0 or len(polyline_points) > 2: if len(polyline_points) == 0 or len(polyline_points) > 2:
return None, None return None, None
@@ -411,7 +411,7 @@ class PolylineDecorator:
self.line_shader.uniform_float("lineWidth", 2.0) self.line_shader.uniform_float("lineWidth", 2.0)
decorator_color = self.addon_prefs.decorator_color_special decorator_color = self.addon_prefs.decorator_color_special
polyline_data = context.scene.BIMPolylineProperties.insertion_polyline polyline_data = context.scene.BIMPolylineProperties.insertion_polyline
polyline_points = polyline_data[0].polyline_points if len(polyline_data) > 0 else [] polyline_points = polyline_data[0].polyline_points if polyline_data else []
prop = context.scene.BIMPolylineProperties.product_preview prop = context.scene.BIMPolylineProperties.product_preview
points = [] points = []
@@ -526,7 +526,7 @@ class PolylineDecorator:
rv3d = region.data rv3d = region.data
measure_type = context.scene.MeasureToolSettings.measure_type measure_type = context.scene.MeasureToolSettings.measure_type
polyline_data = context.scene.BIMPolylineProperties.insertion_polyline polyline_data = context.scene.BIMPolylineProperties.insertion_polyline
polyline_points = polyline_data[0].polyline_points if len(polyline_data) > 0 else [] polyline_points = polyline_data[0].polyline_points if polyline_data else []
self.addon_prefs = tool.Blender.get_addon_preferences() self.addon_prefs = tool.Blender.get_addon_preferences()
self.font_id = 1 self.font_id = 1
@@ -673,7 +673,7 @@ class PolylineDecorator:
# Create polyline with selected points # Create polyline with selected points
polyline_data = context.scene.BIMPolylineProperties.insertion_polyline polyline_data = context.scene.BIMPolylineProperties.insertion_polyline
polyline_points = polyline_data[0].polyline_points if len(polyline_data) > 0 else [] polyline_points = polyline_data[0].polyline_points if polyline_data else []
polyline_verts = [] polyline_verts = []
polyline_edges = [] polyline_edges = []
for point_prop in polyline_points: for point_prop in polyline_points:
src/bonsai/bonsai/bim/module/model/wall.py
+1 -1
View File
@@ -521,7 +521,7 @@ class DumbWallGenerator:
def derive_from_polyline(self): def derive_from_polyline(self):
polyline_data = bpy.context.scene.BIMPolylineProperties.insertion_polyline polyline_data = bpy.context.scene.BIMPolylineProperties.insertion_polyline
polyline_points = polyline_data.polyline_points polyline_points = polyline_data[0].polyline_points if polyline_data else []
is_polyline_closed = False is_polyline_closed = False
if len(polyline_points) > 3: if len(polyline_points) > 3:
first_vec = Vector((polyline_points[0].x, polyline_points[0].y, polyline_points[0].z)) first_vec = Vector((polyline_points[0].x, polyline_points[0].y, polyline_points[0].z))
src/bonsai/bonsai/tool/polyline.py
+5 -5
View File
@@ -305,8 +305,8 @@ class Polyline(bonsai.core.tool.Polyline):
base_vertices = [] base_vertices = []
top_vertices = [] top_vertices = []
polyline_data = context.scene.BIMPolylineProperties.insertion_polyline[0] polyline_data = context.scene.BIMPolylineProperties.insertion_polyline
polyline_points = polyline_data.polyline_points polyline_points = polyline_data[0].polyline_points if polyline_data else []
if len(polyline_points) < 2: if len(polyline_points) < 2:
context.scene.BIMPolylineProperties.product_preview.clear() context.scene.BIMPolylineProperties.product_preview.clear()
return return
@@ -561,7 +561,7 @@ class Polyline(bonsai.core.tool.Polyline):
@classmethod @classmethod
def close_polyline(cls): def close_polyline(cls):
polyline_data = bpy.context.scene.BIMPolylineProperties.insertion_polyline polyline_data = bpy.context.scene.BIMPolylineProperties.insertion_polyline
polyline_points = polyline_data[0].polyline_points if len(polyline_data) > 0 else [] polyline_points = polyline_data[0].polyline_points if polyline_data else []
if len(polyline_points) > 2: if len(polyline_points) > 2:
first_point = polyline_points[0] first_point = polyline_points[0]
last_point = polyline_points[-1] last_point = polyline_points[-1]
@@ -578,13 +578,13 @@ class Polyline(bonsai.core.tool.Polyline):
@classmethod @classmethod
def remove_last_polyline_point(cls): def remove_last_polyline_point(cls):
polyline_data = bpy.context.scene.BIMPolylineProperties.insertion_polyline polyline_data = bpy.context.scene.BIMPolylineProperties.insertion_polyline
polyline_points = polyline_data[0].polyline_points if len(polyline_data) > 0 else [] polyline_points = polyline_data[0].polyline_points if polyline_data else []
polyline_points.remove(len(polyline_points) - 1) polyline_points.remove(len(polyline_points) - 1)
@classmethod @classmethod
def move_polyline_to_measure(cls, context, input_ui): def move_polyline_to_measure(cls, context, input_ui):
polyline_data = bpy.context.scene.BIMPolylineProperties.insertion_polyline polyline_data = bpy.context.scene.BIMPolylineProperties.insertion_polyline
polyline_points = polyline_data[0].polyline_points if len(polyline_data) > 0 else [] polyline_points = polyline_data[0].polyline_points if polyline_data else []
measurement_data = bpy.context.scene.BIMPolylineProperties.measurement_polyline.add() measurement_data = bpy.context.scene.BIMPolylineProperties.measurement_polyline.add()
measurement_type = bpy.context.scene.MeasureToolSettings.measure_type measurement_type = bpy.context.scene.MeasureToolSettings.measure_type
measurement_data.measurement_type = measurement_type measurement_data.measurement_type = measurement_type
src/bonsai/bonsai/tool/snap.py
+1 -1
View File
@@ -124,7 +124,7 @@ class Snap(bonsai.core.tool.Snap):
default_container_elevation = tool.Ifc.get_object(tool.Root.get_default_container()).location.z default_container_elevation = tool.Ifc.get_object(tool.Root.get_default_container()).location.z
polyline_data = bpy.context.scene.BIMPolylineProperties.insertion_polyline polyline_data = bpy.context.scene.BIMPolylineProperties.insertion_polyline
polyline_points = polyline_data[0].polyline_points if len(polyline_data) > 0 else [] polyline_points = polyline_data[0].polyline_points if polyline_data else []
if polyline_points: if polyline_points:
last_point_data = polyline_points[-1] last_point_data = polyline_points[-1]
last_point = Vector((last_point_data.x, last_point_data.y, last_point_data.z)) last_point = Vector((last_point_data.x, last_point_data.y, last_point_data.z))