Skip to content

Commit 984bbf6

Browse files
authored
Merge pull request #2039 from jb0/gcode_utility_facing
Add logic for default values in facing.py
2 parents e54f5a9 + 344ce38 commit 984bbf6

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

lib/python/qtvcp/lib/gcode_utility/facing.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,20 @@ def __init__(self, parent=None):
3838
self.mb.setText(help_text)
3939
self.mb.setStandardButtons(QMessageBox.Ok)
4040

41+
4142
# Initial values
4243
self._tmp = None
4344
self.unit_code = "G21"
44-
self.rpm = 500
45+
if not STATUS.is_metric_mode():
46+
self.unit_code = "G20"
47+
self.rbtn_inch.click()
48+
self.rpm = INFO.get_error_safe_setting("DISPLAY", "DEFAULT_SPINDLE_0_SPEED", 500)
4549
self.size_x = 100
4650
self.size_y = 100
4751
self.feedrate = 0
48-
self.stepover = 5
49-
self.tool_dia = 10
50-
self.safe_z = 20.0
52+
self.stepover = 5 if STATUS.is_metric_mode() else 0.5
53+
self.tool_dia = 10 if STATUS.is_metric_mode() else 1
54+
self.safe_z = 20.0 if STATUS.is_metric_mode() else 1
5155
self.valid = True
5256
self.units_text = ''
5357

0 commit comments

Comments
 (0)