start work on logging tree changes; add __version__ to main GSASII module

Author: briantoby

GSASII/GSASIIGUI.py

@@ -16,7 +16,9 @@
 __version__ = '5.0.0'
 gv = GSASIIpath.getSavedVersionInfo()
 if gv is not None:
-    if len(gv.git_tags):
+    if len(gv.git_versiontag):
+        __version__ = gv.git_versiontag[1:]
+    elif len(gv.git_tags):
         __version__ = gv.git_tags[0]
     elif len(gv.git_prevtags):
         __version__ = gv.git_prevtags[0]
@@ -94,7 +96,18 @@ def MacOpenFiles(self, filenames):
     if sys.platform == "darwin":
         wx.CallLater(50,application.ClearStartup)
     GSASIIpath.InvokeDebugOpts()
+    wx.GetApp().Yield()
+    wx.CallLater(2000,DoStuff)
     application.MainLoop()
 
+def DoStuff():
+    import wx
+    wx.GetApp().Yield()
+    print('entering DoStuff')
+    wx.Sleep(1)
+    print('after wait')
+    wx.Sleep(2)
+    print('leaving DoStuff')
+    wx.GetApp().Yield()
 if __name__ == '__main__':
     main()

GSASII/GSASIIdataGUI.py

@@ -99,6 +99,11 @@ def new_util_find_library( name ):
 commonNames = ['abc','bca','cab','a-cb','ba-c','-cba','P->A','A->P','P->B','B->P','P->C','C->P',
     'P->I','I->P','P->F','F->P','H->R','R->H','R->O','O->R','abc*','setting 1->2']          #don't put any new ones after the setting one!
 
+loggingExitCommands = []
+# clear out any old commamnds in the file
+with open('/tmp/G2logging.txt','w') as fp:
+    fp.write(f'# GSAS-II event logging file {time.ctime()}\n')
+    
 def GetDisplay(pos):
     '''Gets display number (0=main display) for window position (pos). If pos outside all displays
     returns None
@@ -617,6 +622,7 @@ def GSASIImain(application):
             dlg.ShowModal()
         finally:
             dlg.Destroy()
+        for cmd in loggingExitCommands: cmd()  # cleanup logging
         sys.exit()
 
     application.main = GSASII(None)  # application.main is the main wx.Frame (G2frame in most places)
@@ -634,6 +640,11 @@ def GSASIImain(application):
 class G2EventLogger(wx.EvtHandler):
     '''This is used to record all wx events
     '''
+    def log2File(self,txt):
+        with open('/tmp/G2logging.txt','a') as fp:
+            fp.write(txt)
+            fp.write('\n')
+
     def ProcessEvent(self, event):
         # how to log "action" widgets (checkbuttons, buttons, etc.)?
         # How to log info supplied in dialogs
@@ -650,6 +661,7 @@ def ShowTreeSelection(tree):
                 txt = tree.GetItemText(sel)
                 print('  parent',txt)
             print('Tree selection (after)',l)
+            self.log2File(f'Tree_selection: {l}')
         #fp = open('/tmp/events.txt','a')
         #print(f"Event {event.GetEventType()} Obj {event.GetEventObject()}")
         #fp.write(f"Event {event.GetEventType()} Obj {event.GetEventObject()}\n")
@@ -710,11 +722,12 @@ def logFrame(self,frame):
         self.eventLog = {}
         self.start = time.time()
         self.G2frame = frame
-        frame.PushEventHandler(self)
+        self.G2frame.PushEventHandler(self)
+        loggingExitCommands.append(self.unlogFrame)
     def unlogFrame(self):
         # note that we need to do a PopEventHandler before the
         # frame is deleted
-        frame.PopEventHandler(self)
+        self.G2frame.PopEventHandler()
 
 #### Create main frame (window) for GUI; main menu items here #######################################
 class GSASII(wx.Frame):
@@ -2448,6 +2461,7 @@ def OnPreferences(self,event):
                 project = None
             G2fil.openInNewTerm(project)
             print ('exiting GSAS-II')
+            for cmd in loggingExitCommands: cmd()  # cleanup logging
             sys.exit()
 
     def _Add_ImportMenu_smallangle(self,parent):
@@ -4684,6 +4698,7 @@ def ExitMain(self, event):
             self.G2plotNB.Destroy()
         if self.undofile and os.path.exists(self.undofile):
             os.remove(self.undofile)
+        for cmd in loggingExitCommands: cmd()  # cleanup logging
         sys.exit()
 
     def OnExportMTZ(self,event):

GSASII/__init__.py

@@ -30,5 +30,6 @@ def no_path_hacking(event_name, args):
 
 
 from .GSASIIGUI import main  # noqa: E402
+from .GSASIIGUI import __version__
 
 __all__ = ['main']