chore: unify all operator value number-to-string conversion decimal p…

…oints
hugemenace · Jun 25, 2022 · c505ad7 · c505ad7
1 parent b832ca2
commit c505ad7
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 40 deletions.
diff --git a/bevels/bevel.py b/bevels/bevel.py
@@ -286,8 +286,8 @@ def draw_text_callback(self):
 
     draw_property(
         self,
-        "Width: {0:.1f}".format(self.width * 1000), 
-        "(±{0:.1f})  |  Shift (±{1:.1f})".format(self.base_width_factor * 1000, (self.base_width_factor / 10) * 1000),
+        "Width: {0:.2f}".format(self.width * 1000), 
+        "(±{0:.2f})  |  Shift (±{1:.2f})".format(self.base_width_factor * 1000, (self.base_width_factor / 10) * 1000),
         active=self.key_no_modifiers,
         alt_mode=self.key_shift_no_modifiers,
         mouse_value=True,

diff --git a/bevels/edge_bevel.py b/bevels/edge_bevel.py
@@ -349,7 +349,7 @@ def draw_text_callback(self):
 
     draw_property(
         self,
-        "Weight: {0:.2f} ({1:.0f})".format(self.weight, self.width * 1000 * self.weight),
+        "Weight: {0:.2f} ({1:.2f})".format(self.weight, self.width * 1000 * self.weight),
         "(±0.1)  |  Shift (±0.01)",
         active=self.key_no_modifiers,
         alt_mode=self.key_shift_no_modifiers,
@@ -375,7 +375,7 @@ def draw_text_callback(self):
 
     draw_property(
         self,
-        "Width: {0:.1f}".format(self.width * 1000),
+        "Width: {0:.2f}".format(self.width * 1000),
         "Ctrl + Alt (±100) | Shift + Ctrl + Alt (±10)",
         active=self.key_ctrl_alt,
         alt_mode=self.key_shift_ctrl_alt,

diff --git a/bevels/vertex_bevel.py b/bevels/vertex_bevel.py
@@ -336,8 +336,8 @@ def draw_text_callback(self):
 
     draw_property(
         self,
-        "Width: {0:.1f}".format(self.width * 1000), 
-        "(±{0:.1f})  |  Shift (±{1:.1f})".format(self.base_width_factor * 1000, (self.base_width_factor / 10) * 1000),
+        "Width: {0:.2f}".format(self.width * 1000), 
+        "(±{0:.2f})  |  Shift (±{1:.2f})".format(self.base_width_factor * 1000, (self.base_width_factor / 10) * 1000),
         active=self.key_no_modifiers,
         alt_mode=self.key_shift_no_modifiers,
         mouse_value=True,

diff --git a/bevels/weighted_normal_bevel.py b/bevels/weighted_normal_bevel.py
@@ -235,8 +235,8 @@ def draw_text_callback(self):
 
     draw_property(
         self,
-        "Width: {0:.1f}".format(self.width * 1000), 
-        "(±{0:.1f})  |  Shift (±{1:.1f})".format(self.base_width_factor * 1000, (self.base_width_factor / 10) * 1000),
+        "Width: {0:.2f}".format(self.width * 1000), 
+        "(±{0:.2f})  |  Shift (±{1:.2f})".format(self.base_width_factor * 1000, (self.base_width_factor / 10) * 1000),
         active=self.key_no_modifiers,
         alt_mode=self.key_shift_no_modifiers,
         mouse_value=True,

diff --git a/booleans/boolean_inset.py b/booleans/boolean_inset.py
@@ -235,8 +235,8 @@ def draw_text_callback(self):
 
     draw_property(
         self, 
-        "Thickness: {0:.1f}".format(self.thickness * 1000), 
-        "(±{0:.1f})  |  Shift + (±{1:.1f})".format(self.base_thickness_factor * 1000, (self.base_thickness_factor / 10) * 1000),
+        "Thickness: {0:.2f}".format(self.thickness * 1000), 
+        "(±{0:.2f})  |  Shift + (±{1:.2f})".format(self.base_thickness_factor * 1000, (self.base_thickness_factor / 10) * 1000),
         active=self.key_no_modifiers,
         alt_mode=self.key_shift_no_modifiers,
         mouse_value=True,

diff --git a/deform/simple_deform.py b/deform/simple_deform.py
@@ -248,7 +248,7 @@ def draw_text_callback(self):
     if self.is_angular[self.methods[self.current_method]]:
         draw_property(
             self,
-            "Angle: {0:.0f}°".format(self.angle),
+            "Angle: {0:.2f}°".format(self.angle),
             "(±10)  |  Shift (±1)",
             active=self.key_no_modifiers,
             alt_mode=self.key_shift_no_modifiers,

diff --git a/extrusion/profile_extrude.py b/extrusion/profile_extrude.py
@@ -303,17 +303,17 @@ def draw_text_callback(self):
 
     draw_property(
         self, 
-        "Extrusion: {0:.1f}".format(self.extrusion_length * 1000),
-        "(±{0:.1f})  |  Shift + (±{1:.1f})".format(self.base_extrude_factor * 1000, (self.base_extrude_factor / 10) * 1000),
+        "Extrusion: {0:.2f}".format(self.extrusion_length * 1000),
+        "(±{0:.2f})  |  Shift + (±{1:.2f})".format(self.base_extrude_factor * 1000, (self.base_extrude_factor / 10) * 1000),
         active=self.key_no_modifiers,
         alt_mode=self.key_shift_no_modifiers,
         mouse_value=True,
         input_stream=self.extrusion_length_input_stream)
 
     draw_property(
         self, 
-        "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),
+        "Offset: {0:.2f}".format(self.offset * 1000), 
+        "Ctrl (±{0:.2f})  |  Shift + Ctrl (±{1:.2f})".format(self.base_offset_factor * 1000, (self.base_offset_factor / 10) * 1000),
         active=self.key_ctrl,
         alt_mode=self.key_shift_ctrl,
         mouse_value=True,

diff --git a/extrusion/screw.py b/extrusion/screw.py
@@ -300,7 +300,7 @@ def draw_text_callback(self):
 
     draw_property(
         self,
-        "Angle: {0:.0f}°".format(self.angle),
+        "Angle: {0:.2f}°".format(self.angle),
         "Alt (±10)  |  Shift + Alt (±1)",
         active=self.key_alt,
         alt_mode=self.key_shift_alt,
@@ -309,8 +309,8 @@ def draw_text_callback(self):
 
     draw_property(
         self,
-        "Offset: {0:.3f}".format(self.offset),
-        "Ctrl (±{0:.1f})  |  Shift + Ctrl (±{1:.1f})".format(self.base_offset_factor * 1000, (self.base_offset_factor / 10) * 1000),
+        "Offset: {0:.2f}".format(self.offset),
+        "Ctrl (±{0:.2f})  |  Shift + Ctrl (±{1:.2f})".format(self.base_offset_factor * 1000, (self.base_offset_factor / 10) * 1000),
         active=self.key_ctrl,
         alt_mode=self.key_shift_ctrl,
         mouse_value=True,

diff --git a/extrusion/solidify.py b/extrusion/solidify.py
@@ -256,17 +256,17 @@ def draw_text_callback(self):
 
     draw_property(
         self, 
-        "Thickness: {0:.1f}".format(self.thickness * 1000), 
-        "(±{0:.1f})  |  Shift + (±{1:.1f})".format(self.base_thickness_factor * 1000, (self.base_thickness_factor / 10) * 1000),
+        "Thickness: {0:.2f}".format(self.thickness * 1000), 
+        "(±{0:.2f})  |  Shift + (±{1:.2f})".format(self.base_thickness_factor * 1000, (self.base_thickness_factor / 10) * 1000),
         active=self.key_no_modifiers,
         alt_mode=self.key_shift_no_modifiers,
         mouse_value=True,
         input_stream=self.thickness_input_stream)
 
     draw_property(
         self, 
-        "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),
+        "Offset: {0:.2f}".format(self.offset * 1000), 
+        "Ctrl (±{0:.2f})  |  Shift + Ctrl (±{1:.2f})".format(self.base_offset_factor * 1000, (self.base_offset_factor / 10) * 1000),
         active=self.key_ctrl,
         alt_mode=self.key_shift_ctrl,
         mouse_value=True,

diff --git a/replicate/array_cubed.py b/replicate/array_cubed.py
@@ -253,16 +253,16 @@ def draw_text_callback(self):
 
     draw_property(
         self, 
-        "Count: {0:.0f}".format(self.axes[self.axis][1]),
+        "Count: {0}".format(self.axes[self.axis][1]),
         "Alt (±1)",
         active=self.key_no_modifiers,
         alt_mode=False,
         input_stream=self.count_streams[self.axis])
 
     draw_property(
         self,
-        "Offset: {0:.3f}".format(self.axes[self.axis][2]),
-        "Ctrl (±{0:.1f})  |  Shift + Ctrl (±{1:.1f})".format(self.base_offset_factor * 1000, (self.base_offset_factor / 10) * 1000),
+        "Offset: {0:.2f}".format(self.axes[self.axis][2]),
+        "Ctrl (±{0:.2f})  |  Shift + Ctrl (±{1:.2f})".format(self.base_offset_factor * 1000, (self.base_offset_factor / 10) * 1000),
         active=self.key_ctrl,
         alt_mode=self.key_shift_ctrl,
         mouse_value=True,

diff --git a/replicate/circular_array.py b/replicate/circular_array.py
@@ -402,7 +402,7 @@ def draw_text_callback(self):
 
     draw_property(
         self, 
-        "Angle: {}".format('Circle (360°)' if abs(self.angle) == 360 else "Arc ({0:.1f}°)".format(self.angle)),
+        "Angle: {}".format('Circle (360°)' if abs(self.angle) == 360 else "Arc ({0:.2f}°)".format(self.angle)),
         "Alt (±15)  |  Shift + Alt (±1)",
         active=self.key_alt,
         alt_mode=self.key_shift_alt,
@@ -411,8 +411,8 @@ def draw_text_callback(self):
 
     draw_property(
         self, 
-        "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),
+        "Offset: {0:.2f}".format(self.offset * 1000), 
+        "Ctrl (±{0:.2f})  |  Shift + Ctrl (±{1:.2f})".format(self.base_offset_factor * 1000, (self.base_offset_factor / 10) * 1000),
         active=self.key_ctrl,
         alt_mode=self.key_shift_ctrl,
         mouse_value=True,

diff --git a/sketch/panel.py b/sketch/panel.py
@@ -268,8 +268,8 @@ def draw_text_callback(self):
     if self.stage == 1:
         draw_property(
             self,
-            "Inset Amount: {0:.1f}".format(self.inset * 1000),
-            "(±{0:.1f})  |  Shift (±{1:.1f})".format(self.base_inset_factor * 1000, (self.base_inset_factor / 10) * 1000),
+            "Inset Amount: {0:.2f}".format(self.inset * 1000),
+            "(±{0:.2f})  |  Shift (±{1:.2f})".format(self.base_inset_factor * 1000, (self.base_inset_factor / 10) * 1000),
             active=self.key_no_modifiers,
             alt_mode=self.key_shift_no_modifiers,
             mouse_value=True,

diff --git a/sketch/recon_poly.py b/sketch/recon_poly.py
@@ -412,8 +412,8 @@ def draw_text_callback(self):
 
     draw_property(
         self,
-        "{0}: {1:.1f}".format("Width" if self.inner_radius > 0 else "Radius", self.width * 1000),
-        "(±{0:.1f})  |  Shift (±{1:.1f})".format(self.base_width_factor * 1000, (self.base_width_factor / 10) * 1000),
+        "{0}: {1:.2f}".format("Width" if self.inner_radius > 0 else "Radius", self.width * 1000),
+        "(±{0:.2f})  |  Shift (±{1:.2f})".format(self.base_width_factor * 1000, (self.base_width_factor / 10) * 1000),
         active=self.key_no_modifiers, 
         alt_mode=self.key_shift_no_modifiers,
         mouse_value=True,
@@ -429,8 +429,8 @@ def draw_text_callback(self):
 
     draw_property(
         self,
-        "Inner Radius: {0:.1f}".format(self.inner_radius * 1000), 
-        "Ctrl (±{0:.1f})  |  Shift + Ctrl (±{1:.1f})".format(self.base_inner_radius_factor * 1000, (self.base_inner_radius_factor / 10) * 1000),
+        "Inner Radius: {0:.2f}".format(self.inner_radius * 1000), 
+        "Ctrl (±{0:.2f})  |  Shift + Ctrl (±{1:.2f})".format(self.base_inner_radius_factor * 1000, (self.base_inner_radius_factor / 10) * 1000),
         active=self.key_ctrl,
         alt_mode=self.key_shift_ctrl,
         mouse_value=True,

diff --git a/sketch/screw_head.py b/sketch/screw_head.py
@@ -280,8 +280,8 @@ def draw_text_callback(self):
 
     draw_property(
         self,
-        "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),
+        "Offset: {0:.2f}".format(self.offset * 1000), 
+        "Ctrl (±{0:.2f})  |  Shift + Ctrl (±{1:.2f})".format(self.base_offset_factor * 1000, (self.base_offset_factor / 10) * 1000),
         active=self.key_ctrl,
         alt_mode=self.key_shift_ctrl,
         mouse_value=True,

diff --git a/utils/flare.py b/utils/flare.py
@@ -332,7 +332,7 @@ def draw_text_callback(self):
 
     draw_property(
         self, 
-        "Rotation: {0:.1f}".format(self.rotation),
+        "Rotation: {0:.2f}".format(self.rotation),
         "(±15)  |  Shift (±1)",
         active=self.key_no_modifiers,
         alt_mode=self.key_shift_no_modifiers,
@@ -341,7 +341,7 @@ def draw_text_callback(self):
 
     draw_property(
         self, 
-        "Height Offset: {0:.1f}".format(self.height_offset),
+        "Height Offset: {0:.2f}".format(self.height_offset),
         "Alt (±1)  |  Shift + Alt (±0.1)",
         active=self.key_alt,
         alt_mode=self.key_shift_alt,

diff --git a/utils/seams.py b/utils/seams.py
@@ -176,7 +176,7 @@ def draw_text_callback(self):
 
     draw_property(
         self,
-        "Angle: {0:.0f}°".format(self.angle),
+        "Angle: {0:.2f}°".format(self.angle),
         "(±{0:.0f})  |  Shift + (±1)".format(self.base_angle_factor),
         active=self.key_no_modifiers,
         alt_mode=self.key_shift_no_modifiers,

diff --git a/utils/smooth.py b/utils/smooth.py
@@ -149,7 +149,7 @@ def draw_text_callback(self):
 
     draw_property(
         self,
-        "Angle: {0:.0f}°".format(self.angle),
+        "Angle: {0:.2f}°".format(self.angle),
         "(±{0:.0f})  |  Shift + (±1)".format(self.base_angle_factor),
         active=self.key_no_modifiers,
         alt_mode=self.key_shift_no_modifiers,