Changeset 2366
- Timestamp:
- Jul 6, 2016 12:04:42 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIplot.py
r2355 r2366 68 68 nxs = np.newaxis 69 69 # GSASIIpath.IPyBreak() 70 plotDebug = False 70 71 71 72 class _tabPlotWin(wx.Panel): … … 240 241 def RaisePageNoRefresh(self,Page): 241 242 'Raises a plot tab without triggering a refresh via OnPageChanged' 242 #print 'Raise',str(self).split('0x')[1]243 if plotDebug: print 'Raise',str(self).split('0x')[1] 243 244 self.skipPageChange = True 244 245 Page.SetFocus() … … 247 248 def SetSelectionNoRefresh(self,plotNum): 248 249 'Raises a plot tab without triggering a refresh via OnPageChanged' 249 #print 'Select',str(self).split('0x')[1]250 if plotDebug: print 'Select',str(self).split('0x')[1] 250 251 self.skipPageChange = True 251 252 self.nb.SetSelection(plotNum) # raises plot tab … … 262 263 ''' 263 264 tabLabel = event.GetEventObject().GetPageText(event.GetSelection()) 264 # print 'PageChanged, self=',str(self).split('0x')[1],tabLabel,self.skipPageChange 265 # print 'event type=',event.GetEventType() 265 if plotDebug: 266 print 'PageChanged, self=',str(self).split('0x')[1],tabLabel,self.skipPageChange 267 print 'event type=',event.GetEventType() 266 268 self.status.DestroyChildren() #get rid of special stuff on status bar 267 269 self.status.SetFields(['','']) # clear old status message … … 292 294 if pid: self.G2frame.PatternTree.SelectItem(pid) 293 295 self.allowZoomReset = True 294 #print 'invoke',str(self).split('0x')[1],str(pid)296 if plotDebug: print 'invoke',str(self).split('0x')[1],str(pid) 295 297 296 298 class GSASIItoolbar(Toolbar): … … 2490 2492 Page.Choice = None 2491 2493 G2frame.G2plotNB.RaisePageNoRefresh(Page) 2494 G2frame.G2plotNB.skipPageChange = True 2492 2495 G2frame.G2plotNB.status.DestroyChildren() 2493 2496 Plot.set_title(Title) … … 3047 3050 Page = G2frame.G2plotNB.nb.GetPage(plotNum) 3048 3051 Page.Choice = None 3052 G2frame.G2plotNB.RaisePageNoRefresh(Page) 3053 G2frame.G2plotNB.skipPageChange = True 3049 3054 G2frame.G2plotNB.status.SetStatusText('',1) 3050 3055 … … 4234 4239 Page.figure.clf() 4235 4240 Plot = Page.figure.gca() #get a fresh plot after clf() 4236 # if not event: #event from GUI TextCtrl - don't want focus to change to plot!!!4237 # G2frame.G2plotNB.SetSelectionNoRefresh(plotNum) # raises plot tab4238 4241 except ValueError: 4239 4242 Plot = G2frame.G2plotNB.addMpl('2D Powder Image').gca() … … 5651 5654 Draw('size') 5652 5655 5653 def OnFocus(event): #not needed?? Bind commented out below5656 def OnFocus(event): 5654 5657 Draw('focus') 5655 5658 -
trunk/GSASIIpwdGUI.py
r2365 r2366 1220 1220 1221 1221 def KeyEditPeakGrid(event): 1222 '''for deleting excluded regions 1223 ''' 1222 1224 if event.GetKeyCode() == wx.WXK_DELETE: 1223 1225 row = G2frame.dataDisplay.GetSelectedRows()[0] … … 1280 1282 if not G2frame.dataFrame.GetStatusBar(): 1281 1283 Status = G2frame.dataFrame.CreateStatusBar() 1284 if len(data)>2: 1285 Status.SetStatusText('To delete excluded region: select & press Delete key') 1282 1286 G2frame.Bind(wx.EVT_MENU,OnLimitCopy,id=G2gd.wxID_LIMITCOPY) 1283 1287 G2frame.Bind(wx.EVT_MENU,OnAddExcl,id=G2gd.wxID_ADDEXCLREGION)
Note: See TracChangeset
for help on using the changeset viewer.