Changeset 3279

Timestamp:

Feb 12, 2018 3:45:08 PM (4 years ago)

Author:

toby

Message:

make sure new phases get selected in tree; call critical bits (what exactly is not clear) in UpdateGeneral?

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (7 diffs)

trunk/GSASIIdataGUI.py

@@ -896 +896 @@
             self.GPXtree.Expand(sub) 
             self.GPXtree.Expand(psub)
-            wx.CallAfter(SelectDataTreeItem,self,psub) #bring up new phase General tab
+            self.PickIdText = None
+            wx.CallAfter(self.GPXtree.SelectItem,psub) # should call SelectDataTreeItem
+            #wx.CallAfter(SelectDataTreeItem,self,psub) #bring up new phase General tab
 
             if rd.Constraints:

trunk/GSASIIphsGUI.py

@@ -1268 +1268 @@
 ################################################################################
 
-    def UpdateGeneral(Scroll=0):
+    def UpdateGeneral(Scroll=0,SkipDraw=False):
         '''Draw the controls for the General phase data subpage
         '''
@@ -1284 +1284 @@
         'Atoms':[]
         'Drawing':{}
-        """        
-        # UpdateGeneral execution starts here
-        if General.GetSizer(): General.GetSizer().Clear(True)
-        phaseTypes = ['nuclear','magnetic','macromolecular','faulted']
-        SetupGeneral()
-        generalData = data['General']
-        Map = generalData['Map']
-        Flip = generalData['Flip']
-        MCSAdata = generalData['MCSA controls']  
-        PWDR = any(['PWDR' in item for item in data['Histograms'].keys()])
-        # UpdateGeneral execution continues below
-        
+        """
         def NameSizer():   
             
@@ -2232 +2221 @@
 
         # UpdateGeneral execution starts here
+        phaseTypes = ['nuclear','magnetic','macromolecular','faulted']
+        SetupGeneral()
+        generalData = data['General']
+        Map = generalData['Map']
+        Flip = generalData['Flip']
+        MCSAdata = generalData['MCSA controls']  
+        PWDR = any(['PWDR' in item for item in data['Histograms'].keys()])
 #patches        
         if 'Pawley dmax' not in data['General']:
@@ -2239 +2235 @@
         if 'SGGray' not in data['General']['SGData']:
             data['General']['SGData']['SGGray'] = False
-#end patches        
+#end patches
+        if SkipDraw: return
         if General.GetSizer():
             General.GetSizer().Clear(True)
@@ -8923 +8920 @@
         on a Phase data item window
         '''
-        for page in G2frame.phaseDisplay.gridList: # clear out all grids, forcing edits in progress to complete
-            page.ClearGrid()
         page = event.GetSelection()
         G2frame.phaseDisplay.SetSize(G2frame.dataWindow.GetClientSize())    #TODO -almost right
@@ -8930 +8925 @@
         
     def ChangePage(page):
+        for p in G2frame.phaseDisplay.gridList: # clear out all grids, forcing edits in progress to complete
+            p.ClearGrid()
         text = G2frame.phaseDisplay.GetPageText(page)
         G2frame.lastSelectedPhaseTab = text
@@ -9192 +9189 @@
     if G2frame.lastSelectedPhaseTab in Pages:
         ind = Pages.index(G2frame.lastSelectedPhaseTab)
-        ChangePage(0)
+        if ind != 0:
+            UpdateGeneral(SkipDraw=True)
         G2frame.phaseDisplay.SetSelection(ind)
     else: