Changeset 4148 for trunk/GSASII.py

Timestamp:

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

Author:

toby

Message:

refactor to create wx app before anything else gets done

File:

• trunk/GSASII.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()