Changeset 5251ec6 in sasview for src/sas/sasgui/plottools/binder.py

Timestamp:

Oct 11, 2018 2:20:56 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

98b9f32

Parents:

67ed543

Message:

improved support for py37 in sasgui

File:

• src/sas/sasgui/plottools/binder.py (modified) (11 diffs)

src/sas/sasgui/plottools/binder.py

@@ -28 +28 @@
         return self.artist is not other.artist
 
-    def __nonzero__(self):
+    def __bool__(self):
         return self.artist is not None
+
+    __nonzero__ = __bool__
 
 
 class BindArtist(object):
     """
+    Track keyboard modifiers for events.
     """
-    # Track keyboard modifiers for events.
     # TODO: Move keyboard modifier support into the backend.  We cannot
     # TODO: properly support it from outside the windowing system since there
@@ -65 +67 @@
             ]
         except:
-            print("bypassing scroll_event: wrong matplotlib version")
+            logger.warn("bypassing scroll_event: wrong matplotlib version")
             self._connections = [
                 canvas.mpl_connect('motion_notify_event', self._onMotion),
@@ -74 +76 @@
             ]
 
+        # Turn off picker if it hasn't already been done
+        try:
+            canvas.mpl_disconnect(canvas.button_pick_id)
+            canvas.mpl_disconnect(canvas.scroll_pick_id)
+        except Exception as exc:
+            logger.error(exc)
+
         self._current = None
         self._actions = {}
@@ -87 +96 @@
         Use clearall() to reset all connections.
         """
-
         for h in artists:
             for a in self.events:
@@ -123 +131 @@
         """
         try:
-            for cid in self._connections: self.canvas.mpl_disconnect(cid)
-        except:
-            logger.error("Error disconnection canvas: %s" % sys.exc_value)
+            for cid in self._connections:
+                self.canvas.mpl_disconnect(cid)
+        except Exception as exc:
+            logger.error("Error disconnection canvas: %s" % exc)
         self._connections = []
 
@@ -172 +181 @@
         sure it applies.  E.g., the callback for 'press' might be:
             if event.button == 1 and event.shift: process Shift-click
-
-        TODO: Only receive events with the correct modifiers (e.g., S-click,
-        TODO:   or *-click for any modifiers).
-        TODO: Only receive button events for the correct button (e.g., click1
-        TODO:   release3, or dclick* for any button)
-        TODO: Support virtual artist, so that and artist can be flagged as
-        TODO:   having a tag list and receive the correct events
-        TODO: Support virtual events for binding to button-3 vs shift button-1
-        TODO:   without changing callback code
-        TODO: Attach multiple callbacks to the same event?
-        TODO: Clean up interaction with toolbar modes
-        TODO: push/pushclear/pop context so that binding changes for
-             the duration
-        TODO:   e.g., to support ? context sensitive help
-        """
+        """
+        #TODO: Only receive events with the correct modifiers (e.g., S-click,
+        #TODO:   or *-click for any modifiers).
+        #TODO: Only receive button events for the correct button (e.g., click1
+        #TODO:   release3, or dclick* for any button)
+        #TODO: Support virtual artist, so that and artist can be flagged as
+        #TODO:   having a tag list and receive the correct events
+        #TODO: Support virtual events for binding to button-3 vs shift button-1
+        #TODO:   without changing callback code
+        #TODO: Attach multiple callbacks to the same event?
+        #TODO: Clean up interaction with toolbar modes
+        #TODO: push/pushclear/pop context so that binding changes for the duration
+        #TODO:   e.g., to support ? context sensitive help
+
         # Check that the trigger is valid
         if trigger not in self._actions:
-            raise ValueError, "%s invalid --- valid triggers are %s"\
-                 % (trigger, ", ".join(self.events))
+            raise ValueError("%s invalid --- valid triggers are %s"
+                % (trigger, ", ".join(self.events)))
 
         # Register the trigger callback
@@ -205 +213 @@
         """
         if action not in self.events:
-            raise ValueError, "Trigger expects " + ", ".join(self.events)
+            raise ValueError("Trigger expects " + ", ".join(self.events))
 
         # Tag the event with modifiers
@@ -214 +222 @@
         setattr(ev, 'prop', {})
 
-        # Fallback scheme.  If the event does not return false, pass to parent.
+        # Fallback scheme. If the event does not return false, pass to parent.
         processed = False
         artist, prop = actor.artist, actor.prop
@@ -237 +245 @@
         """
         # TODO: sort by zorder of axes then by zorder within axes
-        self._artists.sort(cmp=lambda x, y: cmp(y.zorder, x.zorder))
+        self._artists.sort(key=lambda x: x.zorder, reverse=True)
         found = Selection()
         for artist in self._artists:
@@ -276 +284 @@
 
             transform = self._hasclick.artist.get_transform()
-            # x,y = event.xdata,event.ydata
+            #x,y = event.xdata,event.ydata
             x, y = event.x, event.y
             try:
@@ -286 +294 @@
                     # #transform ="CompositeGenericTransform" crash
                     pass
-            except:
-                # # CRUFT matplotlib-0.91 support
+            except: # CRUFT: matplotlib-0.91 support
                 # # exception for transform ="CompositeGenericTransform"
                 # # crashes also here
                 x, y = transform.inverse_xy_tup((x, y))
 
-            # event.xdata, event.ydata = x, y
+            #TODO: why compute (x,y) if it isn't being used?
+            #event.xdata, event.ydata = x, y
             self.trigger(self._hasclick, 'drag', event)
         else: