Skip to content

Commit a7e769c

Browse files
committed
gmoccapy: disable G-code view only when program running, otherwise only disallow editing
This allows the G-code to be viewed not grayed out in all states expect when program is running. Furthermore a preparation for displaying a progressbar when program is running.
1 parent 9282395 commit a7e769c

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/emc/usr_intf/gmoccapy/gmoccapy.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ def __init__(self, argv):
451451
self.widgets.chk_toggle_readout.set_active(self.toggle_readout)
452452

453453
self.widgets.adj_start_spindle_RPM.set_value(self.spindle_start_rpm)
454-
self.widgets.gcode_view.set_sensitive(False)
454+
self.widgets.gcode_view.set_editable(False)
455455
self.widgets.ntb_user_tabs.remove_page(0)
456456

457457
# call the function to change the button status
@@ -2573,7 +2573,7 @@ def on_hal_status_interp_idle(self, widget):
25732573
if self.load_tool:
25742574
return
25752575

2576-
widgetlist = ["ntb_jog", "btn_from_line",
2576+
widgetlist = ["ntb_jog", "btn_from_line", "gcode_view",
25772577
"tbtn_flood", "tbtn_mist", "rbt_forward", "rbt_reverse", "rbt_stop",
25782578
"btn_load", "btn_edit", "tbtn_optional_blocks", "btn_reload"
25792579
]
@@ -2630,7 +2630,7 @@ def on_hal_status_interp_run(self, widget):
26302630
]
26312631
# in MDI it should be possible to add more commands, even if the interpreter is running
26322632
if self.stat.task_mode != linuxcnc.MODE_MDI:
2633-
widgetlist.append("ntb_jog")
2633+
widgetlist.append("gcode_view")
26342634

26352635
self._sensitize_widgets(widgetlist, False)
26362636
self.widgets.btn_run.set_sensitive(False)
@@ -5241,7 +5241,7 @@ def on_btn_edit_clicked(self, widget, data=None):
52415241
self.widgets.box_dro_side.hide()
52425242
if not self.widgets.vbx_jog.get_visible():
52435243
self.widgets.vbx_jog.set_visible(True)
5244-
self.widgets.gcode_view.set_sensitive(True)
5244+
self.widgets.gcode_view.set_editable(True)
52455245
self.widgets.gcode_view.grab_focus()
52465246
if self.widgets.chk_use_kb_on_edit.get_active():
52475247
self.widgets.ntb_info.set_current_page(1)
@@ -5318,7 +5318,7 @@ def on_ntb_button_switch_page(self, *args):
53185318
self.widgets.vbox14.show()
53195319
self.widgets.vbox_jog.set_hexpand(False)
53205320
self.widgets.box_dro_side.show()
5321-
self.widgets.gcode_view.set_sensitive(False)
5321+
self.widgets.gcode_view.set_editable(False)
53225322
self.widgets.btn_save.set_sensitive(True)
53235323
self.widgets.hal_action_reload.emit("activate")
53245324
self.widgets.ntb_info.set_current_page(0)
@@ -5360,7 +5360,7 @@ def on_tbtn_optional_blocks_toggled(self, widget, data=None):
53605360
# this can not be done with the status widget,
53615361
# because it will not emit a RESUME signal
53625362
def on_tbtn_pause_toggled(self, widget, data=None):
5363-
widgetlist = ["rbt_forward", "rbt_reverse", "rbt_stop", "ntb_jog"]
5363+
widgetlist = ["rbt_forward", "rbt_reverse", "rbt_stop", "gcode_view"]
53645364
self._sensitize_widgets(widgetlist, widget.get_active())
53655365
widget.set_image(self.widgets["img_pause_active" if widget.get_active() else "img_pause"])
53665366

0 commit comments

Comments
 (0)