Changeset 2366

Timestamp:

Jul 6, 2016 12:04:42 PM (7 years ago)

Author:

vondreele

Message:

Add a bit of instruction for deleting excluded regions
fix another plot behavior problem; use plotDebug to debug plot change issues

Location:

trunk

Files:

• GSASIIplot.py (modified) (9 diffs)
• GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASIIplot.py

@@ -68 +68 @@
 nxs = np.newaxis
 #    GSASIIpath.IPyBreak()
+plotDebug = False
     
 class _tabPlotWin(wx.Panel):    
@@ -240 +241 @@
     def RaisePageNoRefresh(self,Page):
         'Raises a plot tab without triggering a refresh via OnPageChanged'
-#        print 'Raise',str(self).split('0x')[1]
+        if plotDebug: print 'Raise',str(self).split('0x')[1]
         self.skipPageChange = True
         Page.SetFocus()
@@ -247 +248 @@
     def SetSelectionNoRefresh(self,plotNum): 
         'Raises a plot tab without triggering a refresh via OnPageChanged' 
-#        print 'Select',str(self).split('0x')[1]
+        if plotDebug: print 'Select',str(self).split('0x')[1]
         self.skipPageChange = True
         self.nb.SetSelection(plotNum) # raises plot tab 
@@ -262 +263 @@
         '''
         tabLabel = event.GetEventObject().GetPageText(event.GetSelection())
-#        print 'PageChanged, self=',str(self).split('0x')[1],tabLabel,self.skipPageChange
-#        print 'event type=',event.GetEventType()
+        if plotDebug: 
+            print 'PageChanged, self=',str(self).split('0x')[1],tabLabel,self.skipPageChange
+            print 'event type=',event.GetEventType()
         self.status.DestroyChildren()    #get rid of special stuff on status bar
         self.status.SetFields(['',''])  # clear old status message
@@ -292 +294 @@
         if pid: self.G2frame.PatternTree.SelectItem(pid)
         self.allowZoomReset = True
-#        print 'invoke',str(self).split('0x')[1],str(pid)
+        if plotDebug: print 'invoke',str(self).split('0x')[1],str(pid)
             
 class GSASIItoolbar(Toolbar):
@@ -2490 +2492 @@
         Page.Choice = None
     G2frame.G2plotNB.RaisePageNoRefresh(Page)
+    G2frame.G2plotNB.skipPageChange = True      
     G2frame.G2plotNB.status.DestroyChildren()
     Plot.set_title(Title)
@@ -3047 +3050 @@
         Page = G2frame.G2plotNB.nb.GetPage(plotNum)
     Page.Choice = None
+    G2frame.G2plotNB.RaisePageNoRefresh(Page)
+    G2frame.G2plotNB.skipPageChange = True
     G2frame.G2plotNB.status.SetStatusText('',1)
     
@@ -4234 +4239 @@
             Page.figure.clf()
             Plot = Page.figure.gca()          #get a fresh plot after clf()
-#        if not event:                       #event from GUI TextCtrl - don't want focus to change to plot!!!
-#            G2frame.G2plotNB.SetSelectionNoRefresh(plotNum) # raises plot tab
     except ValueError:
         Plot = G2frame.G2plotNB.addMpl('2D Powder Image').gca()
@@ -5651 +5654 @@
         Draw('size')
         
-    def OnFocus(event):         #not needed?? Bind commented out below
+    def OnFocus(event):
         Draw('focus')
         

trunk/GSASIIpwdGUI.py

@@ -1220 +1220 @@
         
     def KeyEditPeakGrid(event):
+        '''for deleting excluded regions
+        '''
         if event.GetKeyCode() == wx.WXK_DELETE:
             row = G2frame.dataDisplay.GetSelectedRows()[0]
@@ -1280 +1282 @@
     if not G2frame.dataFrame.GetStatusBar():
         Status = G2frame.dataFrame.CreateStatusBar()
+    if len(data)>2:
+        Status.SetStatusText('To delete excluded region: select & press Delete key')
     G2frame.Bind(wx.EVT_MENU,OnLimitCopy,id=G2gd.wxID_LIMITCOPY)
     G2frame.Bind(wx.EVT_MENU,OnAddExcl,id=G2gd.wxID_ADDEXCLREGION)