summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Morley <chrisinnanaimo@hotmail.com>2013-12-02 14:00:00 -0800
committerChris Morley <chrisinnanaimo@hotmail.com>2013-12-02 14:00:00 -0800
commitd96f36d343c4665148a7ce03531f3f926c925277 (patch)
treec6453968b8759ee218b71a4635433571eaa4cf0a
parent78d09b3866c0ac9ab48bc1011bcc61babd45bf55 (diff)
downloadlinuxcnc-d96f36d343c4665148a7ce03531f3f926c925277.tar.gz
linuxcnc-d96f36d343c4665148a7ce03531f3f926c925277.zip
gscreen/gmoccapy -fix a sequencing problem with embedded objects
Dewey noticed pyncgui with Gscreen was not displaying properly. Thi tries to fix it and factors out some initilization code, so screens can change the order or add their own routines.
Diffstat
-rw-r--r--share/gscreen/skins/gaxis/gaxis_handler.py2
-rwxr-xr-xshare/gscreen/skins/gmoccapy/gmoccapy_handler.py2
-rw-r--r--share/gscreen/skins/industrial/industrial_handler.py2
-rwxr-xr-xsrc/emc/usr_intf/gscreen/gscreen.py110
4 files changed, 60 insertions, 56 deletions
diff --git a/share/gscreen/skins/gaxis/gaxis_handler.py b/share/gscreen/skins/gaxis/gaxis_handler.py
index a3a7f9b78..e29411dff 100644
--- a/share/gscreen/skins/gaxis/gaxis_handler.py
+++ b/share/gscreen/skins/gaxis/gaxis_handler.py
@@ -53,6 +53,8 @@ class HandlerClass:
# To truely be friendly, we should add a way to change the theme directly in the custom screen.
# we also set up the statusbar and add a ready-to-home message
def initialize_widgets(self):
+ self.gscreen.init_show_windows()
+ self.gscreen.init_dynamic_tabs()
self.gscreen.change_theme(self.data.theme_name)
self.gscreen.statusbar_id = self.widgets.statusbar1.get_context_id("Statusbar1")
self.gscreen.homed_status_message = self.widgets.statusbar1.push(1,"Ready For Homing")
diff --git a/share/gscreen/skins/gmoccapy/gmoccapy_handler.py b/share/gscreen/skins/gmoccapy/gmoccapy_handler.py
index 3b278142a..6f8a76d3d 100755
--- a/share/gscreen/skins/gmoccapy/gmoccapy_handler.py
+++ b/share/gscreen/skins/gmoccapy/gmoccapy_handler.py
@@ -160,6 +160,8 @@ class HandlerClass:
# we also set up the statusbar and add a ready-to-home message
def initialize_widgets(self):
# These are gscreen widgets included in this screen
+ self.gscreen.init_show_windows()
+ self.gscreen.init_dynamic_tabs()
self.gscreen.init_statusbar()
self.gscreen.init_tooleditor()
self.gscreen.init_embeded_terminal()
diff --git a/share/gscreen/skins/industrial/industrial_handler.py b/share/gscreen/skins/industrial/industrial_handler.py
index 7a89704de..19497d8fe 100644
--- a/share/gscreen/skins/industrial/industrial_handler.py
+++ b/share/gscreen/skins/industrial/industrial_handler.py
@@ -277,6 +277,8 @@ class HandlerClass:
# We don't want Gscreen to initialize ALL it's regular widgets because this custom
# screen doesn't have them all -just most of them. So we call the ones we want
def initialize_widgets(self):
+ self.gscreen.init_show_windows()
+ self.gscreen.init_dynamic_tabs()
#self.gscreen.init_axis_frames()
#self.gscreen.init_dro_colors()
self.gscreen.init_screen2()
diff --git a/src/emc/usr_intf/gscreen/gscreen.py b/src/emc/usr_intf/gscreen/gscreen.py
index f316a01fc..2fc6511e5 100755
--- a/src/emc/usr_intf/gscreen/gscreen.py
+++ b/src/emc/usr_intf/gscreen/gscreen.py
@@ -391,7 +391,7 @@ class Gscreen:
global xmlname2
global gscreen_debug
global verbose_debug
- skinname = "gscreen"
+ self.skinname = "gscreen"
self.inipath = sys.argv[2]
(progdir, progname) = os.path.split(sys.argv[0])
@@ -401,7 +401,7 @@ class Gscreen:
if temp == '-c':
try:
print ("**** GSCREEN INFO: Skin name ="),sys.argv[num+1]
- skinname = sys.argv[num+1]
+ self.skinname = sys.argv[num+1]
except:
pass
if temp == '-d': gscreen_debug = True
@@ -411,14 +411,14 @@ class Gscreen:
locallocale = os.path.join(CONFIGPATH,"locale")
if os.path.exists(locallocale):
LOCALEDIR = locallocale
- domain = skinname
- print ("**** GSCREEN INFO: CUSTOM locale name =",LOCALEDIR,skinname)
+ domain = self.skinname
+ print ("**** GSCREEN INFO: CUSTOM locale name =",LOCALEDIR,self.skinname)
else:
- locallocale = os.path.join(SKINPATH,"%s/locale"%skinname)
+ locallocale = os.path.join(SKINPATH,"%s/locale"%self.skinname)
if os.path.exists(locallocale):
LOCALEDIR = locallocale
- domain = skinname
- print ("**** GSCREEN INFO: SKIN locale name =",LOCALEDIR,skinname)
+ domain = self.skinname
+ print ("**** GSCREEN INFO: SKIN locale name =",LOCALEDIR,self.skinname)
else:
LOCALEDIR = os.path.join(BASE, "share", "locale")
domain = "linuxcnc"
@@ -428,12 +428,12 @@ class Gscreen:
gettext.bindtextdomain(domain, LOCALEDIR)
# main screen
- localglade = os.path.join(CONFIGPATH,"%s.glade"%skinname)
+ localglade = os.path.join(CONFIGPATH,"%s.glade"%self.skinname)
if os.path.exists(localglade):
print _("\n**** GSCREEN INFO: Using CUSTOM glade file from %s ****"% localglade)
xmlname = localglade
else:
- localglade = os.path.join(SKINPATH,"%s/%s.glade"%(skinname,skinname))
+ localglade = os.path.join(SKINPATH,"%s/%s.glade"%(self.skinname,self.skinname))
if os.path.exists(localglade):
print _("\n**** GSCREEN INFO: Using SKIN glade file from %s ****"% localglade)
xmlname = localglade
@@ -447,12 +447,12 @@ class Gscreen:
print _("**** Gscreen GLADE ERROR: With main screen xml file: %s"% xmlname)
sys.exit(0)
# second screen
- localglade = os.path.join(CONFIGPATH,"%s2.glade"%skinname)
+ localglade = os.path.join(CONFIGPATH,"%s2.glade"%self.skinname)
if os.path.exists(localglade):
print _("\n**** GSCREEN INFO: Using CUSTOM glade file from %s ****"% localglade)
xmlname2 = localglade
else:
- localglade = os.path.join(SKINPATH,"%s/%s2.glade"%(skinname,skinname))
+ localglade = os.path.join(SKINPATH,"%s/%s2.glade"%(self.skinname,self.skinname))
if os.path.exists(localglade):
print _("\n**** GSCREEN INFO: Using SKIN glade file from %s ****"% localglade)
xmlname2 = localglade
@@ -520,9 +520,9 @@ class Gscreen:
# at this point, any glade HAL widgets and their pins are set up.
# look for custom handler files:
- HANDLER_FN = "%s_handler.py"%skinname
+ HANDLER_FN = "%s_handler.py"%self.skinname
local_handler_path = os.path.join(CONFIGPATH,HANDLER_FN)
- skin_handler_path = os.path.join(SKINPATH,"%s/%s"%(skinname,HANDLER_FN))
+ skin_handler_path = os.path.join(SKINPATH,"%s/%s"%(self.skinname,HANDLER_FN))
if os.path.exists(local_handler_path):
temp = [local_handler_path]
elif os.path.exists(skin_handler_path):
@@ -702,24 +702,6 @@ class Gscreen:
else:
self.connect_signals(handlers)
- # dynamic tabs setup
- self._dynamic_childs = {}
- atexit.register(self.kill_dynamic_childs)
- self.set_dynamic_tabs()
-
- # set title and display everything including the second screen if requested
- if skinname == "gscreen":
- title = "Gscreen"
- else:
- title = "Gscreen-%s"% skinname
- self.widgets.window1.set_title("%s for linuxcnc"% title)
- if self.screen2:
- self.widgets.window2.show()
- self.widgets.window2.move(0,0)
- if not self.data.use_screen2:
- self.widgets.window2.hide()
- self.widgets.window1.show()
-
# Set up the widgets
if "initialize_widgets" in dir(self.handler_instance):
self.handler_instance.initialize_widgets()
@@ -796,6 +778,8 @@ class Gscreen:
# initialize default widgets
def initialize_widgets(self):
+ self.init_show_windows()
+ self.init_dynamic_tabs()
self.init_axis_frames()
self.init_dro_colors()
self.init_screen2()
@@ -813,7 +797,6 @@ class Gscreen:
self.init_themes()
self.init_screen1_geometry()
self.init_running_options()
- self.init_hide_cursor()
self.init_mode()
self.init_sensitive_on_off()
self.init_sensitive_run_idle()
@@ -822,6 +805,7 @@ class Gscreen:
self.init_sensitive_override_mode()
self.init_sensitive_graphics_mode()
self.init_sensitive_origin_mode()
+ self.init_hide_cursor()
self.init_state()
@@ -836,30 +820,20 @@ class Gscreen:
print formatted_lines[-1]
def init_axis_frames(self):
- temp = self.data.axis_list
- try:
- if "a" in temp:
- self.widgets.frame_a.show()
- self.widgets.image6.hide() # make more room for axis display
- except:
- self.show_try_errors()
- try:
- if "b" in temp:
- self.widgets.frame_b.show()
- self.widgets.image6.hide() # make more room for axis display
- except:
- self.show_try_errors()
- try:
- if "c" in temp:
- self.widgets.frame_c.show()
- self.widgets.image6.hide() # make more room for axis display
- except:
- self.show_try_errors()
- try:
- if "y" in temp:
- self.widgets.frame_y.show()
- except:
- self.show_try_errors()
+ for letter in ('x','y','z','a','b','c','u','v','w'):
+ try:
+ frame_for_letter = eval("self.widgets." + 'frame_' + letter)
+ except:
+ self.show_try_errors()
+ continue
+ if letter in self.data.axis_list:
+ frame_for_letter.show()
+ # don't show image6 when axes other than xyz are present
+ if letter in ('a','b','c','u','v','w'):
+ self.widgets.image6.hide() ;# make more room for axis display
+ else:
+ # hide unneeded frames for axes not in use
+ frame_for_letter.hide() ;# frame not relevant
if self.data.rotary_joints:
try:
self.widgets.button_select_rotary_adjust.show()
@@ -868,6 +842,12 @@ class Gscreen:
except:
self.show_try_errors()
+ def init_dynamic_tabs(self):
+ # dynamic tabs setup
+ self._dynamic_childs = {}
+ atexit.register(self.kill_dynamic_childs)
+ self.set_dynamic_tabs()
+
def init_dro_colors(self):
self.widgets.abs_colorbutton.set_color(gtk.gdk.color_parse(self.data.abs_textcolor))
self.set_abs_color()
@@ -1061,8 +1041,26 @@ class Gscreen:
except:
self.show_try_errors()
self.on_hal_status_state_off(None)
+ try:
+ self.widgets.search_box.hide()
+ except:
+ self.show_try_errors()
self.add_alarm_entry(_("Control powered up and initialized"))
+ def init_show_windows(self):
+ # set title and display everything including the second screen if requested
+ if self.skinname == "gscreen":
+ title = "Gscreen"
+ else:
+ title = "Gscreen-%s"% self.skinname
+ self.widgets.window1.set_title("%s for linuxcnc"% title)
+ if self.screen2:
+ self.widgets.window2.show()
+ self.widgets.window2.move(0,0)
+ if not self.data.use_screen2:
+ self.widgets.window2.hide()
+ self.widgets.window1.show()
+
def init_unlock_code(self):
print "unlock code #",int(self.data.unlock_code)
self.widgets.unlock_number.set_value(int(self.data.unlock_code))
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-03 15:37:54 +0000