Changeset 1505 for branch/logging/log.py

Timestamp:

Sep 20, 2014 8:27:59 PM (7 years ago)

Author:

toby

Message:

track with relative phase & histogram numbers

File:

• branch/logging/log.py (modified) (13 diffs)

branch/logging/log.py

@@ -5 +5 @@
 G2logList = [None]
 'Contains a list of logged actions; first item is ignored'
-LogInfo = {'Logging':False, 'Tree':None}
+LogInfo = {'Logging':False, 'Tree':None, 'G2frame':None}
 'Contains a dict with values that are needed in the module'
 
@@ -12 +12 @@
 # TODO:
 ### Note: no provinance info for histogram instrument parameters: need to remove insVal etc.
-
-# track histograms and phases with relative indices
 
 #===========================================================================
@@ -33 +31 @@
         if debug: print 'Logging var change: w/treeRefs',treeRefs,'indexRefs',indexRefs,'new value=',value
     def __str__(self):
+        treeList = self.treeRefs[:]
+        if type(treeList[0]) is tuple:
+            treeList[0] = 'Hist #'+str(treeList[0][1]+1)+' of type '+treeList[0][0]
+        elif len(treeList) > 1 and type(treeList[1]) is int:
+            treeList[1] = 'Phase #'+str(treeList[1]+1)
         return 'Variable change: Key(s)= '+_l2s(self.indexRefs)+' to value='+str(self.value)
 
@@ -63 +66 @@
     def __init__(self,itemlist):
         self.treeItemList = itemlist
-        if debug: print 'Logging press on tree: "',itemlist
+        if debug: print 'Logging press on tree: ',itemlist
     def __str__(self):
-        return 'Tree item pressed: '+_l2s(self.treeItemList)
+        treeList = self.treeItemList[:]
+        if type(treeList[0]) is tuple:
+            treeList[0] = 'Hist #'+str(treeList[0][1]+1)+' of type '+treeList[0][0]
+        elif len(treeList) > 1 and type(treeList[1]) is int:
+            treeList[1] = 'Phase #'+str(treeList[1]+1)
+        return 'Tree item pressed: '+_l2s(treeList)
             
 def _wrapper(func):
@@ -170 +178 @@
     def __init__(self,parent=None,*args,**kwargs):
         super(self.__class__,self).__init__(parent=parent,*args,**kwargs)
-        self.G2frame = parent.GetParent()
+        LogInfo['G2frame'] = self.G2frame = parent.GetParent()
         self.root = self.AddRoot('Loaded Data: ')
         self.SelectionChanged = None
@@ -194 +202 @@
         if self.SelectionChanged:
             textlist = self._getTreeItemsList(event.GetItem())
-            if LogInfo['Logging']: 
+            if LogInfo['Logging'] and event.GetItem() != self.root:
+                textlist[0] = self.GetRelativeHistNum(textlist[0])
+                if textlist[0] == "Phases" and len(textlist) > 1:
+                    textlist[1] = self.GetRelativePhaseNum(textlist[1])
                 G2logList.append(TreeLogEntry(textlist))
             self.SelectionChanged(event)
@@ -224 +235 @@
         self.repaintAction = None
 
+    def GetRelativeHistNum(self,histname):
+        '''Returns list with a histogram type and a relative number for that
+        histogram, or the original string if not a histogram
+        '''
+        histtype = histname.split()[0]
+        if histtype != histtype.upper(): # histograms (only) have a keyword all in caps
+            return histname
+        item, cookie = self.GetFirstChild(self.root)
+        i = 0
+        while item:
+            itemtext = self.GetItemText(item)
+            if itemtext == histname:
+                return histtype,i
+            elif itemtext.split()[0] == histtype:
+                i += 1
+            item, cookie = self.GetNextChild(self.root, cookie)
+        else:
+            raise Exception("Histogram not found: "+histname)
+
+    def ConvertRelativeHistNum(self,histtype,histnum):
+        '''Converts a histogram type and relative histogram number to a
+        histogram name in the current project
+        '''
+        item, cookie = self.GetFirstChild(self.root)
+        i = 0
+        while item:
+            itemtext = self.GetItemText(item)
+            if itemtext.split()[0] == histtype:
+                if i == histnum: return itemtext
+                i += 1
+            item, cookie = self.GetNextChild(self.root, cookie)
+        else:
+            raise Exception("Histogram #'+str(histnum)+' of type "+histtype+' not found')
+        
+    def GetRelativePhaseNum(self,phasename):
+        '''Returns a phase number if the string matches a phase name
+        or else returns the original string
+        '''
+        item, cookie = self.GetFirstChild(self.root)
+        while item:
+            itemtext = self.GetItemText(item)
+            if itemtext == "Phases":
+                parent = item
+                item, cookie = self.GetFirstChild(parent)
+                i = 0
+                while item:
+                    itemtext = self.GetItemText(item)
+                    if itemtext == phasename:
+                        return i
+                    item, cookie = self.GetNextChild(parent, cookie)
+                    i += 1
+                else:
+                    return phasename # not a phase name
+            item, cookie = self.GetNextChild(self.root, cookie)
+        else:
+            raise Exception("No phases found ")
+
+    def ConvertRelativePhaseNum(self,phasenum):
+        '''Converts relative phase number to a phase name in
+        the current project
+        '''
+        item, cookie = self.GetFirstChild(self.root)
+        while item:
+            itemtext = self.GetItemText(item)
+            if itemtext == "Phases":
+                parent = item
+                item, cookie = self.GetFirstChild(parent)
+                i = 0
+                while item:
+                    if i == phasenum:
+                        return self.GetItemText(item)
+                    item, cookie = self.GetNextChild(parent, cookie)
+                    i += 1
+                else:
+                    raise Exception("Phase "+str(phasenum)+" not found")
+            item, cookie = self.GetNextChild(self.root, cookie)
+        else:
+            raise Exception("No phases found ")
+                
     def RepaintDataWindow(self):
         item = self.repaintAction
@@ -251 +341 @@
         'Perform a Tree press action when read from the log'
         parent = self.root
-        for txt in logitem.treeItemList:
+        for i,txt in enumerate(logitem.treeItemList):
+            if i == 0 and type(txt) is tuple:
+                txt = self.ConvertRelativeHistNum(*txt)
+            elif i == 1 and type(txt) is int and logitem.treeItemList[0] == "Phases":
+                txt = self.ConvertRelativePhaseNum(txt)
             item = G2gd.GetPatternTreeItemId(self.G2frame,parent,txt)
             if not item:
@@ -280 +374 @@
         'Perform a Variable Change action, when read from the log'
         parentId = self.root
-        for treeitem in logitem.treeRefs:
+        for i,treeitem in enumerate(logitem.treeRefs):
+            if i == 0 and type(treeitem) is tuple:
+                treeitem = self.ConvertRelativeHistNum(*treeitem)
             item, cookie = self.GetFirstChild(parentId)
             while item:
@@ -313 +409 @@
     if not LogInfo['Logging']: return
     if hasattr(result,'treeRefs'):
+        treevars = result.treeRefs[:]
+        treevars[0] = LogInfo['Tree'].GetRelativeHistNum(treevars[0])
+        if treevars[0] == "Phases" and len(treevars) > 1:
+            treevars[1] = LogInfo['Tree'].GetRelativePhaseNum(treevars[1])
         lastLog = G2logList[-1]
         fullrefs = result.indexRefs+[key]
         if type(lastLog) is VarLogEntry:
-            if lastLog.treeRefs == result.treeRefs and lastLog.indexRefs == fullrefs:
+            if lastLog.treeRefs == treevars and lastLog.indexRefs == fullrefs:
                 lastLog.value = result[key]
                 if debug: print 'update last log to ',result[key]
                 return
-        G2logList.append(VarLogEntry(result.treeRefs,fullrefs,result[key]))
+        G2logList.append(VarLogEntry(treevars,fullrefs,result[key]))
     else:
         print key,'Error: var change has no provenance info'
@@ -424 +524 @@
 def LogOn():
     'Turn On logging of actions'
+    if debug: print 'LogOn'
     LogInfo['Logging'] = True
 
 def LogOff():
     'Turn Off logging of actions'
+    if debug: print 'LogOff'
     LogInfo['Logging'] = False
-
+    
 def ShowLogStatus():
     'Return the logging status'
@@ -436 +538 @@
 def ReplayLog(event):
     'replay the logged actions (needs to be a wx.widget)'
-    LogOff() # TODO: need to update menu item as well
+    
+    LogInfo['G2frame'].OnMacroRecordStatus(None,False) # turn off recording
     LogInfo['Tree'].ClearDataRepaint()
     print 70*'='
     print 'Performing logged actions:'
     for item in G2logList:
-        if item:
-            print item
+        if item: # skip over 1st item in list (None)
+            print 'replaying',item
             LogInfo['Tree'].ReplayLogItem(item)
             wx.Yield()
@@ -451 +554 @@
     
     
+LogOn() # for debug