Changeset 1509 for branch/logging/GSASII.py

Timestamp:

Sep 29, 2014 2:31:04 PM (9 years ago)

Author:

toby

Message:

logging refactored, and much cleaner\!

File:

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

branch/logging/GSASII.py

@@ -1632 +1632 @@
         if nextvalue:
             log.LogOn()
-            setto = True
+            set2 = True
         else:
             log.LogOff()
-            setto = False
+            set2 = False
         for menuitem in self.MacroStatusList:
-            menuitem.Check(setto)
+            menuitem.Check(set2)
 
     def _init_Macro(self):
@@ -1656 +1656 @@
             print 70*'='
             print 'List of logged actions'
-            for line in log.G2logList:
-                if line: print line
+            for i,line in enumerate(log.G2logList):
+                if line: print i,line
             print 70*'='
         self.Bind(wx.EVT_MENU, OnShowLog, item)
 
+        item = menu.Append(
+            help='Clear logged commands', id=wx.ID_ANY,
+            kind=wx.ITEM_NORMAL,text='Clear log')
+        def OnClearLog(event): log.G2logList=[None]
+        self.Bind(wx.EVT_MENU, OnClearLog, item)
+        
         item = menu.Append(
             help='Save logged commands to file', id=wx.ID_ANY,
@@ -1686 +1692 @@
             if filename:
                 fp = open(filename,'wb')
-                fp.write(str(len(log.G2logList))+'\n')
+                fp.write(str(len(log.G2logList)-1)+'\n')
                 for item in log.G2logList:
-                    cPickle.dump(item,fp)
+                    if item: cPickle.dump(item,fp)
                 fp.close()
         self.Bind(wx.EVT_MENU, OnSaveLog, item)
@@ -1696 +1702 @@
             kind=wx.ITEM_NORMAL,text='Load log')
         def OnLoadLog(event):
+            # this appends. Perhaps we should ask to clear? 
             import log
             import cPickle
@@ -1974 +1981 @@
         #self.PatternTree = wx.TreeCtrl(id=wxID_PATTERNTREE,
         import log
-        self.PatternTree = log.G2TreeCtrl(id=wxID_PATTERNTREE,
+        self.PatternTree = G2gd.G2TreeCtrl(id=wxID_PATTERNTREE,
             parent=self.mainPanel, pos=wx.Point(0, 0),style=wx.TR_DEFAULT_STYLE )
         self.PatternTree.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnPatternTreeSelChanged)