From e8a7a032aa1937fd0d140e58e816f3be45c8da40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Perdig=C3=A3o?= Date: Wed, 21 Aug 2024 22:55:20 -0300 Subject: [PATCH] Changed the order of the input panel for Polyline and Measure tool. Distance and Angle now come first. --- src/bonsai/bonsai/bim/module/model/decorator.py | 2 +- src/bonsai/bonsai/bim/module/model/wall.py | 4 ++-- src/bonsai/bonsai/bim/module/project/operator.py | 4 ++-- src/bonsai/bonsai/tool/snap.py | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/bonsai/bonsai/bim/module/model/decorator.py b/src/bonsai/bonsai/bim/module/model/decorator.py index 759ca50319..25ce4f856f 100644 --- a/src/bonsai/bonsai/bim/module/model/decorator.py +++ b/src/bonsai/bonsai/bim/module/model/decorator.py @@ -508,7 +508,7 @@ class PolylineDecorator: batch.draw(shader) def draw_text(self, context): - texts = {"X": "X coord:", "Y": "Y coord:", "Z": "Z coord:", "D": "Distance:", "A": "Angle:", "AREA": "Area:"} + texts = {"D": "Distance:", "A": "Angle:", "X": "X coord:", "Y": "Y coord:", "Z": "Z coord:", "AREA": "Area:"} self.addon_prefs = tool.Blender.get_addon_preferences() self.font_id = 0 blf.size(self.font_id, 12) diff --git a/src/bonsai/bonsai/bim/module/model/wall.py b/src/bonsai/bonsai/bim/module/model/wall.py index d8c4fb13cc..f72e61ce40 100644 --- a/src/bonsai/bonsai/bim/module/model/wall.py +++ b/src/bonsai/bonsai/bim/module/model/wall.py @@ -299,10 +299,10 @@ class DrawPolylineWall(bpy.types.Operator): self.number_output = "" self.number_is_negative = False self.is_input_on = False - self.input_options = ["X", "Y", "D", "A"] + self.input_options = ["D", "A", "X", "Y"] self.input_type = "OFF" self.input_value_xy = [None, None] - self.input_panel = {"X": "", "Y": "", "D": "", "A": ""} + self.input_panel = {"D": "", "A": "", "X": "", "Y": ""} self.snap_angle = None def recalculate_inputs(self, context): diff --git a/src/bonsai/bonsai/bim/module/project/operator.py b/src/bonsai/bonsai/bim/module/project/operator.py index db772d8e8d..24eb610d05 100644 --- a/src/bonsai/bonsai/bim/module/project/operator.py +++ b/src/bonsai/bonsai/bim/module/project/operator.py @@ -2308,10 +2308,10 @@ class MeasureTool(bpy.types.Operator): self.number_output = "" self.number_is_negative = False self.is_input_on = False - self.input_options = ["X", "Y", "Z", "D", "A"] + self.input_options = ["D", "A", "X", "Y", "Z"] self.input_type = "OFF" self.input_value_xy = [None, None] - self.input_panel = {"X": "", "Y": "", "Z": "", "D": "", "A": "", "AREA": ""} + self.input_panel = {"D": "", "A": "", "X": "", "Y": "", "Z": "", "AREA": ""} self.snap_angle = None def recalculate_inputs(self, context): diff --git a/src/bonsai/bonsai/tool/snap.py b/src/bonsai/bonsai/tool/snap.py index 8b1669c9de..71147de338 100644 --- a/src/bonsai/bonsai/tool/snap.py +++ b/src/bonsai/bonsai/tool/snap.py @@ -420,7 +420,6 @@ class Snap(bonsai.core.tool.Snap): else: snap_points = cls.get_snap_points_on_polyline() snap_point = cls.select_snap_point(snap_points, intersection, snap_threshold) - print("POLY", snap_points, snap_point) if snap_point: if event.shift and axis_start: