Changeset 3279
- Timestamp:
- Feb 12, 2018 3:45:08 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIdataGUI.py
r3277 r3279 896 896 self.GPXtree.Expand(sub) 897 897 self.GPXtree.Expand(psub) 898 wx.CallAfter(SelectDataTreeItem,self,psub) #bring up new phase General tab 898 self.PickIdText = None 899 wx.CallAfter(self.GPXtree.SelectItem,psub) # should call SelectDataTreeItem 900 #wx.CallAfter(SelectDataTreeItem,self,psub) #bring up new phase General tab 899 901 900 902 if rd.Constraints: -
trunk/GSASIIphsGUI.py
r3278 r3279 1268 1268 ################################################################################ 1269 1269 1270 def UpdateGeneral(Scroll=0 ):1270 def UpdateGeneral(Scroll=0,SkipDraw=False): 1271 1271 '''Draw the controls for the General phase data subpage 1272 1272 ''' … … 1284 1284 'Atoms':[] 1285 1285 'Drawing':{} 1286 """ 1287 # UpdateGeneral execution starts here 1288 if General.GetSizer(): General.GetSizer().Clear(True) 1289 phaseTypes = ['nuclear','magnetic','macromolecular','faulted'] 1290 SetupGeneral() 1291 generalData = data['General'] 1292 Map = generalData['Map'] 1293 Flip = generalData['Flip'] 1294 MCSAdata = generalData['MCSA controls'] 1295 PWDR = any(['PWDR' in item for item in data['Histograms'].keys()]) 1296 # UpdateGeneral execution continues below 1297 1286 """ 1298 1287 def NameSizer(): 1299 1288 … … 2232 2221 2233 2222 # UpdateGeneral execution starts here 2223 phaseTypes = ['nuclear','magnetic','macromolecular','faulted'] 2224 SetupGeneral() 2225 generalData = data['General'] 2226 Map = generalData['Map'] 2227 Flip = generalData['Flip'] 2228 MCSAdata = generalData['MCSA controls'] 2229 PWDR = any(['PWDR' in item for item in data['Histograms'].keys()]) 2234 2230 #patches 2235 2231 if 'Pawley dmax' not in data['General']: … … 2239 2235 if 'SGGray' not in data['General']['SGData']: 2240 2236 data['General']['SGData']['SGGray'] = False 2241 #end patches 2237 #end patches 2238 if SkipDraw: return 2242 2239 if General.GetSizer(): 2243 2240 General.GetSizer().Clear(True) … … 8923 8920 on a Phase data item window 8924 8921 ''' 8925 for page in G2frame.phaseDisplay.gridList: # clear out all grids, forcing edits in progress to complete8926 page.ClearGrid()8927 8922 page = event.GetSelection() 8928 8923 G2frame.phaseDisplay.SetSize(G2frame.dataWindow.GetClientSize()) #TODO -almost right … … 8930 8925 8931 8926 def ChangePage(page): 8927 for p in G2frame.phaseDisplay.gridList: # clear out all grids, forcing edits in progress to complete 8928 p.ClearGrid() 8932 8929 text = G2frame.phaseDisplay.GetPageText(page) 8933 8930 G2frame.lastSelectedPhaseTab = text … … 9192 9189 if G2frame.lastSelectedPhaseTab in Pages: 9193 9190 ind = Pages.index(G2frame.lastSelectedPhaseTab) 9194 ChangePage(0) 9191 if ind != 0: 9192 UpdateGeneral(SkipDraw=True) 9195 9193 G2frame.phaseDisplay.SetSelection(ind) 9196 9194 else:
Note: See TracChangeset
for help on using the changeset viewer.