Changeset 1510 for branch/logging/GSASII.py

Timestamp:

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

Author:

toby

Message:

logging pretty well ready to roll

File:

• branch/logging/GSASII.py (modified) (9 diffs)

branch/logging/GSASII.py

@@ -76 +76 @@
 import GSASIIobj as G2obj
 import GSASIIlattice as G2lat
+import GSASIIlog as log
 
 #wx inspector - use as needed
@@ -124 +125 @@
     '''
     def MenuBinding(self,event):
-        import log
         log.InvokeMenuCommand(event.GetId(),self,event)
             
@@ -130 +130 @@
         '''Override the Bind() function so that we can wrap calls that will be logged.
         '''
-        import log
         #print 'main frame bind',handler
         if eventtype == wx.EVT_MENU and 'id' in kwargs:
@@ -1626 +1625 @@
         
     def OnMacroRecordStatus(self,event,setvalue=None):
-        import log
         nextvalue = log.ShowLogStatus() != True
         if setvalue is not None:
@@ -1640 +1638 @@
 
     def _init_Macro(self):
-        import log
         menu = self.MacroMenu
         item = menu.Append(
@@ -1653 +1650 @@
             kind=wx.ITEM_NORMAL,text='Show log')
         def OnShowLog(event):
-            import log
             print 70*'='
             print 'List of logged actions'
@@ -1671 +1667 @@
             kind=wx.ITEM_NORMAL,text='Save log')
         def OnSaveLog(event):
-            import log
             import cPickle
             defnam = os.path.splitext(
@@ -1703 +1698 @@
         def OnLoadLog(event):
             # this appends. Perhaps we should ask to clear? 
-            import log
             import cPickle
             defnam = os.path.splitext(
@@ -1979 +1973 @@
         
         wxID_PATTERNTREE = wx.NewId()
-        #self.PatternTree = wx.TreeCtrl(id=wxID_PATTERNTREE,
-        import log
+        #self.PatternTree = wx.TreeCtrl(id=wxID_PATTERNTREE, # replaced for logging
         self.PatternTree = G2gd.G2TreeCtrl(id=wxID_PATTERNTREE,
             parent=self.mainPanel, pos=wx.Point(0, 0),style=wx.TR_DEFAULT_STYLE )