Changeset 2246
- Timestamp:
- May 10, 2016 9:51:51 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r2244 r2246 3680 3680 Id = G2gd.GetPatternTreeItemId(self, Id, txt) 3681 3681 self.PickIdText = None #force reload of page 3682 self.PickId = Id 3683 self.PatternTree.SelectItem(Id) 3684 G2gd.MovePatternTreeToGrid(self,Id) # reload current tree item, should update current plot 3682 if Id: 3683 self.PickId = Id 3684 self.PatternTree.SelectItem(Id) 3685 G2gd.MovePatternTreeToGrid(self,Id) # reload current tree item, should update current plot 3685 3686 finally: 3686 3687 dlg2.Destroy() -
trunk/GSASIIplot.py
r2242 r2246 190 190 self.treeItem[plotLabel][1] = self.G2frame.dataDisplayPhaseText 191 191 192 def RaisePageNoRefresh(self,Page):193 'Raises a plot tab without triggering a refresh via OnPageChanged'194 self.skipPageChange = True195 Page.SetFocus()196 self.skipPageChange = False197 198 def SetSelectionNoRefresh(self,plotNum):199 'Raises a plot tab without triggering a refresh via OnPageChanged'200 self.skipPageChange = True201 self.nb.SetSelection(plotNum) # raises plot tab202 Page = self.G2frame.G2plotNB.nb.GetPage(plotNum)203 Page.SetFocus()204 self.skipPageChange = False205 206 192 def addMpl(self,name=""): 207 193 'Add a tabbed page with a matplotlib plot' … … 252 238 return 253 239 240 def RaisePageNoRefresh(self,Page): 241 'Raises a plot tab without triggering a refresh via OnPageChanged' 242 # print 'Raise',str(self).split('0x')[1] 243 self.skipPageChange = True 244 Page.SetFocus() 245 self.skipPageChange = False 246 247 def SetSelectionNoRefresh(self,plotNum): 248 'Raises a plot tab without triggering a refresh via OnPageChanged' 249 # print 'Select',str(self).split('0x')[1] 250 self.skipPageChange = True 251 self.nb.SetSelection(plotNum) # raises plot tab 252 Page = self.G2frame.G2plotNB.nb.GetPage(plotNum) 253 Page.SetFocus() 254 self.skipPageChange = False 255 254 256 def OnPageChanged(self,event): 255 257 '''respond to someone pressing a tab on the plot window. … … 259 261 repeated replotting. 260 262 ''' 263 tabLabel = event.GetEventObject().GetPageText(event.GetSelection()) 264 # print 'PageChanged, self=',str(self).split('0x')[1],tabLabel,self.skipPageChange 265 # print 'event type=',event.GetEventType() 261 266 self.status.DestroyChildren() #get rid of special stuff on status bar 262 267 self.status.SetFields(['','']) # clear old status message 263 268 self.status.SetStatusWidths([150,-1]) 264 269 if self.skipPageChange: 265 self.skipPageChange = False 270 # self.skipPageChange = False 271 # if tabLabel in self.treeItem: 272 # del self.treeItem[tabLabel] 266 273 return 267 274 page = self.panelList[self.nb.GetSelection()] #GetCurrentPage() not in wx 2.7 268 tabLabel = event.GetEventObject().GetPageText(event.GetSelection())269 275 if tabLabel in self.treeItem: 270 276 treeItems, tabname = self.treeItem[tabLabel] 271 id = self.G2frame.root277 pid = self.G2frame.root 272 278 for item in treeItems: 273 id = G2gd.GetPatternTreeItemId(self.G2frame,id, item)274 wx.CallLater(100,self.InvokeTreeItem, id)279 pid = G2gd.GetPatternTreeItemId(self.G2frame, pid, item) 280 wx.CallLater(100,self.InvokeTreeItem,pid) 275 281 else: 276 282 print 'OnPageChanged: not found:',tabLabel 277 283 278 def InvokeTreeItem(self, id):284 def InvokeTreeItem(self,pid): 279 285 '''This is called to select an item from the tree using the self.allowZoomReset 280 286 flag to prevent a reset to the zoom of the plot (where implemented) 281 287 ''' 282 288 self.allowZoomReset = False 283 if id: self.G2frame.PatternTree.SelectItem(id) 284 self.allowZoomReset = True 289 if pid: self.G2frame.PatternTree.SelectItem(pid) 290 self.allowZoomReset = True 291 # print 'invoke',str(self).split('0x')[1] 285 292 286 293 class GSASIItoolbar(Toolbar):
Note: See TracChangeset
for help on using the changeset viewer.