From c5a253ef59ed262c1fc378b22adaa21b65ef87f8 Mon Sep 17 00:00:00 2001 From: Tristan Strathearn Date: Sat, 29 Jan 2022 14:52:24 +1000 Subject: [PATCH] fix: remove hardcoded mm suffix on all operator overlay parameter labels --- ring_and_bolt.py | 8 ++++---- screw.py | 2 +- solidify.py | 8 ++++---- vertex_bevel.py | 4 ++-- weighted_normal_bevel.py | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ring_and_bolt.py b/ring_and_bolt.py index a2319b9..e43fec9 100644 --- a/ring_and_bolt.py +++ b/ring_and_bolt.py @@ -170,15 +170,15 @@ def draw_text_callback(self): draw_property( self, - "Inner Radius: {0:.1f}mm".format(self.inner_radius * 1000), - "Alt (±{0:.1f}mm) | Shift + Alt (±{1:.1f}mm)".format(self.base_inner_radius_factor * 1000, (self.base_inner_radius_factor / 10) * 1000), + "Inner Radius: {0:.1f}".format(self.inner_radius * 1000), + "Alt (±{0:.1f}) | Shift + Alt (±{1:.1f})".format(self.base_inner_radius_factor * 1000, (self.base_inner_radius_factor / 10) * 1000), active=self.key_alt, alt_mode=self.key_shift_alt) draw_property( self, - "Width: {0:.1f}mm".format(self.width * 2000), - "Ctrl (±{0:.1f}mm) | Shift + Ctrl (±{1:.1f}mm)".format(self.base_width_factor * 1000, (self.base_width_factor / 10) * 1000), + "Width: {0:.1f}".format(self.width * 2000), + "Ctrl (±{0:.1f}) | Shift + Ctrl (±{1:.1f})".format(self.base_width_factor * 1000, (self.base_width_factor / 10) * 1000), active=self.key_ctrl, alt_mode=self.key_shift_ctrl) diff --git a/screw.py b/screw.py index ad820bc..c2b7590 100644 --- a/screw.py +++ b/screw.py @@ -180,7 +180,7 @@ def draw_text_callback(self): draw_property( self, "Offset: {0:.3f}".format(self.offset), - "Ctrl + Alt (±{0:.1f}mm) | Shift + Ctrl + Alt (±{1:.1f}mm)".format(self.base_offset_factor * 1000, (self.base_offset_factor / 10) * 1000), + "Ctrl + Alt (±{0:.1f}) | Shift + Ctrl + Alt (±{1:.1f})".format(self.base_offset_factor * 1000, (self.base_offset_factor / 10) * 1000), active=self.key_ctrl_alt, alt_mode=self.key_shift_ctrl_alt) diff --git a/solidify.py b/solidify.py index ec3aafc..e38ba73 100644 --- a/solidify.py +++ b/solidify.py @@ -137,8 +137,8 @@ def draw_text_callback(self): draw_property( self, - "Thickness: {0:.1f}mm".format(self.thickness * 1000), - "(±{0:.1f}mm) | Shift + (±{1:.1f}mm)".format(self.base_thickness_factor * 1000, (self.base_thickness_factor / 10) * 1000), + "Thickness: {0:.1f}".format(self.thickness * 1000), + "(±{0:.1f}) | Shift + (±{1:.1f})".format(self.base_thickness_factor * 1000, (self.base_thickness_factor / 10) * 1000), active=self.key_no_modifiers, alt_mode=self.key_shift_no_modifiers) @@ -151,8 +151,8 @@ def draw_text_callback(self): draw_property( self, - "Offset: {0:.1f}mm".format(self.offset * 1000), - "Ctrl (±{0:.1f}mm) | Shift + Ctrl (±{1:.1f}mm)".format(self.base_offset_factor * 1000, (self.base_offset_factor / 10) * 1000), + "Offset: {0:.1f}".format(self.offset * 1000), + "Ctrl (±{0:.1f}) | Shift + Ctrl (±{1:.1f})".format(self.base_offset_factor * 1000, (self.base_offset_factor / 10) * 1000), active=self.key_ctrl, alt_mode=self.key_shift_ctrl) diff --git a/vertex_bevel.py b/vertex_bevel.py index e448e75..222f321 100644 --- a/vertex_bevel.py +++ b/vertex_bevel.py @@ -135,8 +135,8 @@ def draw_text_callback(self): draw_property( self, - "Width: {0:.1f}mm".format(self.width * 1000), - "Alt (±{0:.1f}mm) | Shift + Alt (±{1:.1f}mm)".format(self.base_width_factor * 1000, (self.base_width_factor / 10) * 1000), + "Width: {0:.1f}".format(self.width * 1000), + "Alt (±{0:.1f}) | Shift + Alt (±{1:.1f})".format(self.base_width_factor * 1000, (self.base_width_factor / 10) * 1000), active=self.key_alt, alt_mode=self.key_shift_alt) diff --git a/weighted_normal_bevel.py b/weighted_normal_bevel.py index 69f742e..86413f6 100644 --- a/weighted_normal_bevel.py +++ b/weighted_normal_bevel.py @@ -114,8 +114,8 @@ def draw_text_callback(self): draw_property( self, - "Width: {0:.1f}mm".format(self.width * 1000), - "(±{0:.1f}mm) | Shift (±{1:.1f}mm)".format(self.base_width_factor * 1000, (self.base_width_factor / 10) * 1000), + "Width: {0:.1f}".format(self.width * 1000), + "(±{0:.1f}) | Shift (±{1:.1f})".format(self.base_width_factor * 1000, (self.base_width_factor / 10) * 1000), active=True, alt_mode=self.key_shift_no_modifiers)