Skip to content

Commit e63ab04

Browse files
committed
gmoccapy: fix setting to disable "run from line"
The "run from line"-button was always clickable regardless of the setting.
1 parent e41227b commit e63ab04

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

src/emc/usr_intf/gmoccapy/gmoccapy.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -396,10 +396,10 @@ def __init__(self, argv):
396396
self.widgets.gremlin.set_property("view", view)
397397

398398
# get if run from line should be used
399-
rfl = self.prefs.getpref("run_from_line", "no_run", str)
399+
self.run_from_line = self.prefs.getpref("run_from_line", "no_run", str)
400400
# and set the corresponding button active
401-
self.widgets["rbtn_{0}_from_line".format(rfl)].set_active(True)
402-
if rfl == "no_run":
401+
self.widgets["rbtn_{0}_from_line".format(self.run_from_line)].set_active(True)
402+
if self.run_from_line == "no_run":
403403
self.widgets.btn_from_line.set_sensitive(False)
404404
else:
405405
self.widgets.btn_from_line.set_sensitive(True)
@@ -2567,10 +2567,12 @@ def on_hal_status_interp_idle(self, widget):
25672567
if self.load_tool:
25682568
return
25692569

2570-
widgetlist = ["ntb_jog", "btn_from_line",
2570+
widgetlist = ["ntb_jog",
25712571
"tbtn_flood", "tbtn_mist", "rbt_forward", "rbt_reverse", "rbt_stop",
25722572
"btn_load", "btn_edit", "tbtn_optional_blocks", "btn_reload"
25732573
]
2574+
if self.run_from_line == "run":
2575+
widgetlist.append("btn_from_line")
25742576
if not self.widgets.rbt_hal_unlock.get_active() and not self.user_mode:
25752577
widgetlist.append("tbtn_setup")
25762578

@@ -2618,14 +2620,15 @@ def on_hal_status_interp_run(self, widget):
26182620
LOG.debug("RUN")
26192621

26202622
widgetlist = ["rbt_manual", "rbt_mdi", "rbt_auto", "tbtn_setup", "btn_index_tool",
2621-
"btn_from_line", "btn_change_tool", "btn_select_tool_by_no",
2623+
"btn_change_tool", "btn_select_tool_by_no",
26222624
"btn_load", "btn_edit", "tbtn_optional_blocks", "rbt_reverse", "rbt_stop", "rbt_forward",
26232625
"btn_tool_touchoff_x", "btn_tool_touchoff_z", "btn_touch", "btn_reload"
26242626
]
26252627
# in MDI it should be possible to add more commands, even if the interpreter is running
26262628
if self.stat.task_mode != linuxcnc.MODE_MDI:
26272629
widgetlist.append("ntb_jog")
2628-
2630+
if self.run_from_line == "run":
2631+
widgetlist.append("btn_from_line")
26292632
self._sensitize_widgets(widgetlist, False)
26302633
self.widgets.btn_run.set_sensitive(False)
26312634
self.widgets.btn_stop.set_sensitive(True)
@@ -4604,11 +4607,12 @@ def on_rbt_unlock_toggled(self, widget, data=None):
46044607
def on_rbtn_run_from_line_toggled(self, widget, data=None):
46054608
if widget.get_active():
46064609
if widget == self.widgets.rbtn_no_run_from_line:
4607-
self.prefs.putpref("run_from_line", "no_run")
4610+
self.run_from_line = "no_run"
46084611
self.widgets.btn_from_line.set_sensitive(False)
46094612
else: # widget == self.widgets.rbtn_run_from_line:
4610-
self.prefs.putpref("run_from_line", "run")
4613+
self.run_from_line = "run"
46114614
self.widgets.btn_from_line.set_sensitive(True)
4615+
self.prefs.putpref("run_from_line", self.run_from_line)
46124616

46134617
def on_chk_use_kb_on_offset_toggled(self, widget, data=None):
46144618
self.prefs.putpref("show_keyboard_on_offset", widget.get_active())

0 commit comments

Comments
 (0)