Changeset 7fef474 in sasview

Timestamp:

Jun 19, 2008 2:10:18 PM (17 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

9b85e93

Parents:

3fd1ebc

Message:

Fixed context menu artifact for interactive plottables.

File:

• guitools/plottable_interactor.py (modified) (3 diffs)

guitools/plottable_interactor.py

@@ -15 +15 @@
         self._context_menu = False
         self._dragged = False
+        self.connect_markers([self.axes])
+        
         
     def _color(self,c):
@@ -85 +87 @@
         
     def _on_click(self, evt):
-        self._context_menu = False
+        """
+            Called when a mouse button is clicked
+            from within the boundaries of an artist.
+        """
+        if self._context_menu==True:
+            self._context_menu = False
+            evt.artist = self.marker
+            self._on_leave(evt)
+        
         
     def _on_release(self, evt): 
+        """
+            Called when a mouse button is released
+            within the boundaries of an artist
+        """
         # Check to see whether we are about to pop 
         # the context menu up
@@ -94 +108 @@
         
     def _on_enter(self, evt):
-        self.base.plottable_selected(self.id)
-        evt.artist.set_color('y')
-        if hasattr(evt.artist, "set_facecolor"):
-            evt.artist.set_facecolor('y')
-        if hasattr(evt.artist, "set_edgecolor"):
-            evt.artist.set_edgecolor('y')
-        self.axes.figure.canvas.draw_idle()
+        """
+            Called when we are entering the boundaries
+            of an artist.
+        """
+        if not evt.artist.__class__.__name__=="Subplot":
+        
+            self.base.plottable_selected(self.id)
+            evt.artist.set_color('y')
+            if hasattr(evt.artist, "set_facecolor"):
+                evt.artist.set_facecolor('y')
+            if hasattr(evt.artist, "set_edgecolor"):
+                evt.artist.set_edgecolor('y')
+            self.axes.figure.canvas.draw_idle()
         
     def _on_leave(self, evt):
-        if self._context_menu==False:
-            self.base.plottable_selected(None)
-            evt.artist.set_color(self.color)
-            if hasattr(evt.artist, "set_facecolor"):
-                evt.artist.set_facecolor(self.color)
-            if hasattr(evt.artist, "set_edgecolor"):            
-                evt.artist.set_edgecolor(self.color)
-            self.axes.figure.canvas.draw_idle()
-            
-        self._context_menu = False
+        """
+            Called when we are leaving the boundaries
+            of an artist.
+        """
+        if not evt.artist.__class__.__name__=="Subplot":
+            if self._context_menu==False:
+                self.base.plottable_selected(None)
+                evt.artist.set_color(self.color)
+                if hasattr(evt.artist, "set_facecolor"):
+                    evt.artist.set_facecolor(self.color)
+                if hasattr(evt.artist, "set_edgecolor"):            
+                    evt.artist.set_edgecolor(self.color)
+                self.axes.figure.canvas.draw_idle()
     
     def update(self):