Changeset 384 for trunk/GSASII.py

Timestamp:

Oct 7, 2011 1:12:38 PM (12 years ago)

Author:

vondreele

Message:

add constraint & restraint items to tree - now empty
fix noncentro calcs & special position position refinements

File:

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

trunk/GSASII.py

@@ -545 +545 @@
             sub = self.PatternTree.AppendItem(parent=self.root,text='Notebook')
             self.PatternTree.SetItemPyData(sub,[''])
+        if not G2gd.GetPatternTreeItemId(self,self.root,'Controls'):
             sub = self.PatternTree.AppendItem(parent=self.root,text='Controls')
             self.PatternTree.SetItemPyData(sub,{})
+        if not G2gd.GetPatternTreeItemId(self,self.root,'Covariance'):
             sub = self.PatternTree.AppendItem(parent=self.root,text='Covariance')
+            self.PatternTree.SetItemPyData(sub,{})
+        if not G2gd.GetPatternTreeItemId(self,self.root,'Constraints'):
+            sub = self.PatternTree.AppendItem(parent=self.root,text='Constraints')
+            self.PatternTree.SetItemPyData(sub,{})
+        if not G2gd.GetPatternTreeItemId(self,self.root,'Restraints'):
+            sub = self.PatternTree.AppendItem(parent=self.root,text='Restraints')
             self.PatternTree.SetItemPyData(sub,{})
             
@@ -1052 +1060 @@
                     self.dirname = dlg.GetDirectory()
                     G2IO.ProjFileOpen(self)
-                    #patch
-                    if not G2gd.GetPatternTreeItemId(self,self.root,'Covariance'):
-                        sub = self.PatternTree.AppendItem(parent=self.root,text='Covariance')
-                        self.PatternTree.SetItemPyData(sub,{})
-                    #end patch
                     self.PatternTree.SetItemText(self.root,'Loaded Data: '+self.GSASprojectfile)
                     self.PatternTree.Expand(self.root)
@@ -1073 +1076 @@
                     if Id:
                         self.PatternTree.SelectItem(Id)
+                    self.CheckNotebook()
             finally:
                 dlg.Destroy()
+
 
     def OnFileClose(self, event):