Changeset 1510 for branch/logging/GSASIIgrid.py

Timestamp:

Oct 1, 2014 4:14:25 PM (8 years ago)

Author:

toby

Message:

logging pretty well ready to roll

File:

• branch/logging/GSASIIgrid.py (modified) (6 diffs)

branch/logging/GSASIIgrid.py

@@ -45 +45 @@
 import GSASIIobj as G2obj
 import GSASIIexprGUI as G2exG
-import log
+import GSASIIlog as log
 
 # trig functions in degrees
@@ -171 +171 @@
     def __init__(self,parent=None,*args,**kwargs):
         super(self.__class__,self).__init__(parent=parent,*args,**kwargs)
-        log.LogInfo['G2frame'] = self.G2frame = parent.GetParent()
+        self.G2frame = parent.GetParent()
         self.root = self.AddRoot('Loaded Data: ')
         self.SelectionChanged = None
@@ -198 +198 @@
                 if textlist[0] == "Phases" and len(textlist) > 1:
                     textlist[1] = self.GetRelativePhaseNum(textlist[1])
-                log.G2logList.append(log.TreeLogEntry(textlist))
+                log.MakeTreeLog(textlist)
             self.SelectionChanged(event)
 
@@ -318 +318 @@
     def onPress(self,event):
         'create log event and call handler'
-        G2logList.append(log.ButtonLogEntry(self.locationcode,self.label))
+        log.MakeButtonLog(self.locationcode,self.label)
         self.handler(event)
 
@@ -3597 +3597 @@
 
     def PageChangeEvent(self,event):
-        import log
         G2frame = self.parent.G2frame
         page = event.GetSelection()
         if self.PageChangeHandler:
             if log.LogInfo['Logging']:
-                log.G2logList.append(log.TabLogEntry(
+                log.MakeTabLog(
                     G2frame.dataFrame.GetTitle(),
                     G2frame.dataDisplay.GetPageText(page)
-                ))
+                    )
             self.PageChangeHandler(event)
             
@@ -4135 +4134 @@
 
     # DEBUG code: stick testing button on Controls page
-    import log
     def TestButton(event):
         print 'TestButton'