Changeset 4624 for trunk/GSASIIdataGUI.py

Timestamp:

Oct 26, 2020 9:40:05 PM (2 years ago)

Author:

toby

Message:

improve rigid body stuff; finish tutorial

File:

• trunk/GSASIIdataGUI.py (modified) (2 diffs)

trunk/GSASIIdataGUI.py

@@ -3314 +3314 @@
         '''Make sure the data tree has the minimally expected controls.
         '''
+        new = False
         if not GetGPXtreeItemId(self,self.root,'Notebook'):
+            new = True
             sub = self.GPXtree.AppendItem(parent=self.root,text='Notebook')
             self.GPXtree.SetItemPyData(sub,[''])
         if not GetGPXtreeItemId(self,self.root,'Controls'):
+            new = True
             sub = self.GPXtree.AppendItem(parent=self.root,text='Controls')
             self.GPXtree.SetItemPyData(sub,copy.copy(G2obj.DefaultControls))
         if not GetGPXtreeItemId(self,self.root,'Covariance'):
+            new = True
             sub = self.GPXtree.AppendItem(parent=self.root,text='Covariance')
             self.GPXtree.SetItemPyData(sub,{})
         if not GetGPXtreeItemId(self,self.root,'Constraints'):
+            new = True
             sub = self.GPXtree.AppendItem(parent=self.root,text='Constraints')
             self.GPXtree.SetItemPyData(sub,{'Hist':[],'HAP':[],'Phase':[]})
         if not GetGPXtreeItemId(self,self.root,'Restraints'):
+            new = True
             sub = self.GPXtree.AppendItem(parent=self.root,text='Restraints')
             self.GPXtree.SetItemPyData(sub,{})
         if not GetGPXtreeItemId(self,self.root,'Rigid bodies'):
+            new = True
             sub = self.GPXtree.AppendItem(parent=self.root,text='Rigid bodies')
             self.GPXtree.SetItemPyData(sub,{'Vector':{'AtInfo':{}},
                 'Residue':{'AtInfo':{}},'RBIds':{'Vector':[],'Residue':[]}})
+        if new:
+            self.GPXtree.Expand(self.GPXtree.root)
                 
     class CopyDialog(wx.Dialog):
@@ -3816 +3825 @@
             self.GPXtree.GetItemPyData(subr).update({PhaseName:{}})
         self.GPXtree.AppendItem(parent=subr,text=PhaseName)
-        sub = self.GPXtree.AppendItem(parent=sub,text=PhaseName)
+        newphase = self.GPXtree.AppendItem(parent=sub,text=PhaseName)
         E,SGData = G2spc.SpcGroup('P 1')
-        self.GPXtree.SetItemPyData(sub,G2obj.SetNewPhase(Name=PhaseName,SGData=SGData))
-        SelectDataTreeItem(self,sub) #bring up new phase General tab
+        self.GPXtree.SetItemPyData(newphase,G2obj.SetNewPhase(Name=PhaseName,SGData=SGData))
+        self.GPXtree.Expand(sub)
+        SelectDataTreeItem(self,newphase) #bring up new phase General tab
         
     def OnDeletePhase(self,event):