Changeset 4648 for trunk

Timestamp:

Nov 4, 2020 3:27:00 PM (3 years ago)

Author:

vondreele

Message:

replace _active with AnyActive? & GetActive? in GSASIItoolbar.

File:

• trunk/GSASIIplot.py (modified) (9 diffs)

trunk/GSASIIplot.py

@@ -707 +707 @@
             wx.CallAfter(*self.updateActions)
         Toolbar._update_view(self)
+        
+    def AnyActive(self):
+        for Itool in range(self.GetToolsCount()):
+            if self.GetToolState(self.GetToolByPos(Itool).GetId()):
+                return True
+        return False
+    
+    def GetActive(self):
+        for Itool in range(self.GetToolsCount()):
+            tool = self.GetToolByPos(Itool)
+            if self.GetToolState(tool.GetId()):
+                return tool.GetLabel()
+        return None
 
     def OnArrow(self,event):
@@ -800 +813 @@
         or None if neither
         """
-        return self._active
+        return self.GetActive()
 
     def reset_zoompan(self):
@@ -839 +852 @@
                 
 def SetCursor(page):
-    mode = page.toolbar._active
-    if mode == 'PAN':
+    mode = page.toolbar.GetActive()
+    if mode == 'Pan':
         if 'phoenix' in wx.version():
             page.canvas.Cursor = wx.Cursor(wx.CURSOR_SIZING)
         else:
             page.canvas.SetCursor(wx.StockCursor(wx.CURSOR_SIZING))
-    elif mode == 'ZOOM':
+    elif mode == 'Zoom':
         if 'phoenix' in wx.version():
             page.canvas.Cursor = wx.Cursor(wx.CURSOR_MAGNIFIER)
@@ -2326 +2339 @@
         PickId = G2frame.PickId                             # points to item in tree
         if G2frame.GPXtree.GetItemText(PickId) == 'Background' and event.xdata:
-            if Page.toolbar._active:    # prevent ops. if a toolbar zoom button pressed
+            if Page.toolbar.AnyActive():    # prevent ops. if a toolbar zoom button pressed
                 # after any mouse release event (could be a zoom), redraw magnification lines
                 if magLineList: wx.CallAfter(PlotPatterns,G2frame,plotType=plottype,extraKeys=extraKeys)
@@ -5075 +5088 @@
                     
     def OnPress(event):
-        if Page.toolbar._active:    # prevent ops. if a toolbar zoom button pressed
+        if Page.toolbar.AnyActive():    # prevent ops. if a toolbar zoom button pressed
             return 
         xpos,ypos = event.xdata,event.ydata
@@ -7390 +7403 @@
                 return
             Ypos = event.ydata
-            if Ypos and not Page.toolbar._active:         #make sure zoom/pan not selected
+            if Ypos and not Page.toolbar.AnyActive():         #make sure zoom/pan not selected
                 if event.button == 1:
                     Xpix = Xpos*scalex
@@ -7422 +7435 @@
             # nothing being dragged, create a new mask
             Xpos,Ypos = [event.xdata,event.ydata]
-            if not Xpos or not Ypos or Page.toolbar._active:  #got point out of frame or zoom/pan selected
+            if not Xpos or not Ypos or Page.toolbar.AnyActive():  #got point out of frame or zoom/pan selected
                 return
             if G2frame.MaskKey == 's':
@@ -7525 +7538 @@
         elif treeItem == 'Stress/Strain' and G2frame.StrainKey:
             Xpos,Ypos = [event.xdata,event.ydata]
-            if not Xpos or not Ypos or Page.toolbar._active:  #got point out of frame or zoom/pan selected
+            if not Xpos or not Ypos or Page.toolbar.AnyActive():  #got point out of frame or zoom/pan selected
                 return
             dsp = G2img.GetDsp(Xpos,Ypos,Data)
@@ -7540 +7553 @@
         else:   # start here after dragging of integration range lines or a mask
             Xpos,Ypos = [event.xdata,event.ydata]
-            if not Xpos or not Ypos or Page.toolbar._active:  #got point out of frame or zoom/pan selected
+            if not Xpos or not Ypos or Page.toolbar.AnyActive():  #got point out of frame or zoom/pan selected
                 return
             tth,azm,dsp = G2img.GetTthAzmDsp(Xpos,Ypos,Data)[:3]