Changeset 400 for trunk/GSASII.py

Timestamp:

Oct 27, 2011 10:26:50 AM (12 years ago)

Author:

vondreele

Message:

new default for Vcov contour plot - RdYlGn?
faster cleanup on changing/reloading projects
cleanup data delete
implement sample parameter copy
improve Vcov plotting routine
implement plot of vcov from seq refinements

File:

• trunk/GSASII.py (modified) (8 diffs)

trunk/GSASII.py

@@ -251 +251 @@
         self.PatternTree.Bind(wx.EVT_TREE_ITEM_EXPANDED,
             self.OnPatternTreeItemExpanded, id=wxID_PATTERNTREE)
+        self.PatternTree.Bind(wx.EVT_TREE_DELETE_ITEM,
+            self.OnPatternTreeItemDelete, id=wxID_PATTERNTREE)
         self.root = self.PatternTree.AddRoot('Loaded Data: ')
         
@@ -267 +269 @@
         self.dirname = ''
         self.undofile = ''
+        self.TreeItemDelete = False
         self.Offset = [0.0,0.0]
         self.Weight = False
@@ -281 +284 @@
         self.Interpolate = 'nearest'
         self.ContourColor = 'Paired'
+        self.VcovColor = 'RdYlGn'
         self.Projection = 'equal area'
         self.logPlot = False
@@ -312 +316 @@
                         
     def OnPatternTreeSelChanged(self, event):
-        pltNum = self.G2plotNB.nb.GetSelection()
-        if pltNum >= 0:                         #to avoid the startup with no plot!
-            pltPage = self.G2plotNB.nb.GetPage(pltNum)
-            pltPlot = pltPage.figure
-        item = event.GetItem()
-        G2gd.MovePatternTreeToGrid(self,item)
+        if self.TreeItemDelete:
+            self.TreeItemDelete = False
+        else:
+            pltNum = self.G2plotNB.nb.GetSelection()
+            if pltNum >= 0:                         #to avoid the startup with no plot!
+                pltPage = self.G2plotNB.nb.GetPage(pltNum)
+                pltPlot = pltPage.figure
+            item = event.GetItem()
+            G2gd.MovePatternTreeToGrid(self,item)
         
     def OnPatternTreeItemCollapsed(self, event):
@@ -325 +332 @@
         event.Skip()
         
-    def OnPatternTreeDeleteItem(self, event):
-        event.Skip()
+    def OnPatternTreeItemDelete(self, event):
+        self.TreeItemDelete = True
 
     def OnPatternTreeItemActivated(self, event):
         event.Skip()
-        
+                
     def OnPwdrRead(self, event):
         self.CheckNotebook()
@@ -1006 +1013 @@
             while item:
                 name = self.PatternTree.GetItemText(item)
-                if 'PWDR' in name or 'HKLF' in name or 'IMG' or 'PDF' in name:
+                if name not in ['Notebook','Controls','Covariance','Constraints','Restraints','Phases']:
                     if 'PWDR' in name: ifPWDR = True
                     if 'IMG' in name: ifIMG = True
@@ -1054 +1061 @@
                     self.PatternTree.DeleteChildren(self.root)
                     self.GSASprojectfile = ''
-                    self.PatternTree.DeleteChildren(self.root)
+#                    self.PatternTree.DeleteChildren(self.root)
                     if self.HKL: self.HKL = []
                     if self.G2plotNB.plotList:
@@ -1527 +1534 @@
         self.OnFileSave(event)
         Id = G2gd.GetPatternTreeItemId(self,self.root,'Sequental results')
+        print Id
         if not Id:
             Id = self.PatternTree.AppendItem(self.root,text='Sequental results')
+            print Id
             self.PatternTree.SetItemPyData(Id,{})            
         dlg = wx.ProgressDialog('Residual for histogram 0','Powder profile Rwp =',101.0,