Changeset 903 for trunk/GSASII.py

Timestamp:

May 13, 2013 3:18:21 PM (9 years ago)

Author:

toby

Message:

Fix problem with large constraints; Change binding of data item menus so they can be used from any window (Mac only); Start on AUI notebook (not in use); fix periodic table on Mac; capture error if argument file is not found; start on sphinx documentation formatting

File:

• trunk/GSASII.py (modified) (6 diffs)

trunk/GSASII.py

@@ -9 +9 @@
 # $Id$
 ########### SVN repository information ###################
+'''
+*GSAS-II Main Module*
+=====================
+
+Main routines for the GSAS-II program
+'''
 
 import os
@@ -101 +107 @@
 
 class GSASII(wx.Frame):
-    
+    '''Define the main GSAS-II frame and its associated menu items
+    '''
     def _Add_FileMenuItems(self, parent):
         item = parent.Append(
@@ -1101 +1108 @@
             self.dirname = os.path.dirname(arg[1])
             if self.dirname: os.chdir(self.dirname)
-            G2IO.ProjFileOpen(self)
-            self.PatternTree.Expand(self.root)
-            for item in self.Refine: item.Enable(True)
-            for item in self.SeqRefine: item.Enable(True)
+            try:
+                G2IO.ProjFileOpen(self)
+                self.PatternTree.Expand(self.root)
+                for item in self.Refine: item.Enable(True)
+                for item in self.SeqRefine: item.Enable(True)
+            except:
+                print 'Error opening file',arg[1]
 
     def OnSize(self,event):
@@ -2327 +2337 @@
 
 class GSASIImain(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.'''
         self.main = GSASII(None)
         self.main.Show()
@@ -2334 +2350 @@
 
 def main():
+    '''Start up the GSAS-II application'''
     application = GSASIImain(0)
     if wxInspector: wxeye.InspectionTool().Show()
@@ -2341 +2358 @@
     
 if __name__ == '__main__':
-    main()
+    main() # start the GUI