Changeset 4148 for trunk

Timestamp:

Sep 13, 2019 5:06:45 PM (4 years ago)

Author:

toby

Message:

refactor to create wx app before anything else gets done

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIdataGUI.py (modified) (2 diffs)

trunk/GSASII.py

@@ -14 +14 @@
 
 This is the script to start the GSAS-II graphical user interface (GUI). 
-This script imports GSASIIpath, does some minor initialization 
-and then launches :func:`GSASIIdataGUI.GSASIImain`, 
-which creates a wx.Application that in turns creates the GUI. 
-If the GSAS-II binaries are not installed or are incompatible with
-the OS/Python packages, the user is asked if they should be updated
-from the subversion site. 
+This script imports GSASIIpath, which does some minor initialization
+and then (before any wxPython calls can be made) creates a wx.App application. 
+A this point :func:`GSASIIpath.SetBinaryPath` is called to establish
+the directory where GSAS-II binaries are found. If the binaries 
+are not installed or are incompatible with the OS/Python packages, 
+the user is asked if they should be updated from the subversion site. 
+The wxPython app is then passed to :func:`GSASIIdataGUI.GSASIImain`, 
+which creates the GSAS-II GUI and finally the event loop is started.
 '''
 
 import platform
+import wx
 import GSASIIpath
+GSASIIpath.SetVersionNumber("$Revision$")
 
 __version__ = '1.0.0'
 
 if __name__ == '__main__':
+    application = wx.App(0) # create the GUI framework
     try:
         GSASIIpath.SetBinaryPath(True)
@@ -45 +50 @@
         print('Updating...')
         GSASIIpath.svnUpdateProcess()
-    GSASIIpath.SetVersionNumber("$Revision$")
     GSASIIpath.InvokeDebugOpts()
     import GSASIIdataGUI as G2gd    
-    G2gd.GSASIImain() # start the GUI
+    G2gd.GSASIImain(application) # start the GUI
+    application.MainLoop()

trunk/GSASIIdataGUI.py

@@ -366 +366 @@
         pass
     print ("This is GSAS-II revision %s"%str(GSASIIpath.GetVersionNumber())+'\n')
-    
+
+def warnNumpyVersion(application):
+    dlg = wx.MessageDialog(application.main,
+                'version '+ np.__version__ +
+                ' of numpy produces .gpx files that are not compatible with older versions: please upgrade or downgrade numpy to avoid this version',
+                'numpy Warning',wx.OK)
+    try:
+        dlg.CenterOnParent()
+        dlg.ShowModal()
+    finally:
+        dlg.Destroy()
+        
 ###############################################################################
-# Main application
+# GUI creation
 ###############################################################################
-def GSASIImain():
-    '''Start up the GSAS-II application'''
+def GSASIImain(application):
+    '''Start up the GSAS-II GUI'''                        
     ShowVersions()
     GUIpatches()
-    #GSASIIpath.InvokeDebugOpts()
-    #application = GSASIImain() # don't redirect output, someday we
-    # may want to do this if we can 
-    application = GSASIIGUI(0)
+    knownVersions = ['2.7','3.6','3.7','3.8']
+    if platform.python_version()[:3] not in knownVersions: 
+        dlg = wx.MessageDialog(None, 
+                'GSAS-II requires Python 2.7.x or 3.6+\n Yours is '+sys.version.split()[0],
+                'Python version error',  wx.OK)
+        try:
+            dlg.ShowModal()
+        finally:
+            dlg.Destroy()
+        sys.exit()
+            
+    application.main = GSASII(None)  # application.main is the main wx.Frame (G2frame in most places)
+    application.SetTopWindow(application.main)
+    # save the current package versions
+    application.main.PackageVersions = G2fil.get_python_versions([wx, mpl, np, sp, ogl])
+    if np.__version__ == '1.16.0':
+        wx.CallLater(100,warnNumpyVersion,application)
     if GSASIIpath.GetConfigValue('wxInspector'):
         import wx.lib.inspection as wxeye
         wxeye.InspectionTool().Show()
 
-    #application.main.OnRefine(None)
     try:
         application.SetAppDisplayName('GSAS-II')
@@ -389 +412 @@
     #application.GetTopWindow().SendSizeEvent()
     application.GetTopWindow().Show(True)
-    application.MainLoop()
-
-class GSASIIGUI(wx.App):
-    '''Defines a wxApp for GSAS-II
-
-    Creates a wx frame (self.main) which contains the display of the
-    data tree.
-    '''
-    def OnInit(self):
-        '''Called automatically when the app is created.'''
-        knownVersions = ['2.7','3.6','3.7','3.8']
-        if platform.python_version()[:3] not in knownVersions: 
-            dlg = wx.MessageDialog(None, 
-                'GSAS-II requires Python 2.7.x or 3.6+\n Yours is '+sys.version.split()[0],
-                'Python version error',  wx.OK)
-            try:
-                dlg.ShowModal()
-            finally:
-                dlg.Destroy()
-            sys.exit()
-        self.main = GSASII(None)
-        self.SetTopWindow(self.main)
-        # save the current package versions
-        self.main.PackageVersions = G2fil.get_python_versions([wx, mpl, np, sp, ogl])
-        if np.__version__ == '1.16.0':
-            wx.CallLater(100,self.warnNumpyVersion)
-        return True
-    def warnNumpyVersion(self):
-        dlg = wx.MessageDialog(self.main,
-                'version '+ np.__version__ +
-                ' of numpy produces .gpx files that are not compatible with older versions: please upgrade or downgrade numpy to avoid this version',
-                'numpy Warning',wx.OK)
-        try:
-            dlg.CenterOnParent()
-            dlg.ShowModal()
-        finally:
-            dlg.Destroy()
-    
-    # def MacOpenFile(self, filename):
-    #     '''Called on Mac every time a file is dropped on the app when it is running,
-    #     treat this like a File/Open project menu action.
-    #     Should be ignored on other platforms
-    #     '''
-    #     # PATCH: Canopy 1.4 script main seems dropped on app; ignore .py files
-    #     print 'MacOpen',filename
-    #     if os.path.splitext(filename)[1] == '.py': return
-    #     # end PATCH
-    #     self.main.OnFileOpen(None,filename)
-    # removed because this gets triggered when a file is on the command line in canopy 1.4 -- not likely used anyway
 
 ################################################################################