Skip to content

Commit 9b1c22a

Browse files
committed
gmoccapy: get offset names directly from offsetpage-widget
This allows to use the proper default values defined in the offsetpage.glade file if no gmoccapy preference file is given.
1 parent 3bb59c9 commit 9b1c22a

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

src/emc/usr_intf/gmoccapy/gmoccapy.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2203,12 +2203,11 @@ def _init_offsetpage(self):
22032203
self.widgets.offsetpage1.set_font("sans 12")
22042204
self.widgets.offsetpage1.set_foreground_color(self._get_RGBA_color("#28D0D9"))
22052205
self.widgets.offsetpage1.selection_mask = ("Tool", "G5x", "Rot")
2206-
systemlist = ["Tool", "G5x", "Rot", "G92", "G54", "G55", "G56", "G57", "G58", "G59", "G59.1",
2207-
"G59.2", "G59.3"]
22082206
names = []
2209-
for system in systemlist:
2207+
default_names = self.widgets.offsetpage1.get_names()
2208+
for system, name in default_names:
22102209
system_name = "system_name_{0}".format(system)
2211-
name = self.prefs.getpref(system_name, system, str)
2210+
name = self.prefs.getpref(system_name, name, str)
22122211
names.append([system, name])
22132212
self.widgets.offsetpage1.set_names(names)
22142213

0 commit comments

Comments
 (0)