Skip to content

Commit 5565398

Browse files
committed
gmoccapy: fix option "-logo"
1 parent 7070452 commit 5565398

1 file changed

Lines changed: 7 additions & 13 deletions

File tree

src/emc/usr_intf/gmoccapy/gmoccapy.py

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -249,16 +249,14 @@ def __init__(self, argv):
249249
if arg == "-user_mode":
250250
self.user_mode = True
251251
self.widgets.tbtn_setup.set_sensitive(False)
252-
message = "\n" + _("user mode selected")
253-
LOG.debug(message)
252+
LOG.debug(_("user mode selected"))
254253
if arg == "-logo":
255254
self.logofile = str(argv[ index + 1 ])
256-
message = "\n" + _("logo entry found = {0}").format(self.logofile)
257-
LOG.debug(message)
255+
LOG.debug(_("logo entry found = {0}").format(self.logofile))
258256
self.logofile = self.logofile.strip("\"\'")
259257
if not os.path.isfile(self.logofile):
260258
self.logofile = None
261-
message = "\n" + _("Logofile entry found, but could not be converted to path.")
259+
message = _("Logofile entry found, but could not be converted to path.")
262260
message += "\n" + _("The file path should not contain any spaces")
263261
LOG.warning(message)
264262

@@ -2069,15 +2067,13 @@ def _init_kinematics_type (self):
20692067
self.widgets.tbtn_switch_mode.set_sensitive(False)
20702068
self.widgets.tbtn_switch_mode.set_active(True)
20712069
self.widgets.lbl_replace_mode_btn.hide()
2072-
#TODO
2073-
#self.widgets.ntb_jog_JA.set_page(1)
2070+
self.widgets.ntb_jog_JA.set_current_page(1)
20742071
else:
20752072
self.widgets.gremlin.set_property("enable_dro", self.enable_gremlin_dro )
20762073
self.widgets.gremlin.use_joints_mode = False
20772074
self.widgets.tbtn_switch_mode.hide()
20782075
self.widgets.lbl_replace_mode_btn.show()
2079-
#TODO
2080-
#self.widgets.ntb_jog_JA.set_page(0)
2076+
self.widgets.ntb_jog_JA.set_current_page(0)
20812077

20822078
# init the function to hide the cursor
20832079
def _init_hide_cursor(self):
@@ -2849,16 +2845,14 @@ def on_hal_status_motion_mode_changed(self, widget, new_mode):
28492845
self.widgets.gremlin.set_property("enable_dro", True)
28502846
self.widgets.gremlin.use_joints_mode = True
28512847
self.widgets.tbtn_switch_mode.set_active(True)
2852-
#TODO
2853-
#self.widgets.ntb_jog_JA.set_page(1)
2848+
self.widgets.ntb_jog_JA.set_current_page(1)
28542849
state = False
28552850
else:
28562851
if not self.widgets.tbtn_fullsize_preview0.get_active():
28572852
self.widgets.gremlin.set_property("enable_dro", self.enable_gremlin_dro)
28582853
self.widgets.gremlin.use_joints_mode = False
28592854
self.widgets.tbtn_switch_mode.set_active(False)
2860-
#TODO
2861-
#self.widgets.ntb_jog_JA.set_page(0)
2855+
self.widgets.ntb_jog_JA.set_current_page(0)
28622856
state = True
28632857
if self.stat.task_state != linuxcnc.STATE_ON:
28642858
state = False

0 commit comments

Comments
 (0)