Changeset 4972de2 in sasview

Timestamp:

Jun 18, 2008 4:08:43 PM (16 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:

aa4b8379

Parents:

fc2b91a

Message:

Updated for interactive graphs.

Location:

guitools

Files:

• BaseInteractor.py (added)
• PlotPanel.py (modified) (3 diffs)
• binder.py (added)
• plottable_interactor.py (added)
• plottables.py (modified) (7 diffs)

guitools/PlotPanel.py

@@ -14 +14 @@
 from plottables import Theory1D
 #TODO: make the plottables interactive
+from binder import BindArtist
 
 DEBUG = False
-print "hello"
 
 from plottables import Graph
@@ -149 +149 @@
         
         self.axes = [self.subplot]
+        
+        # Interactor
+        self.connect = BindArtist(self.subplot.figure)
+        #self.selected_plottable = None
+
         # new data for the fit 
         self.fit_result = Theory1D(x=[], y=[], dy=None)
@@ -560 +565 @@
     #    if trigger == 'xlim': self._connect_to_xlim(callback)
 
+    def interactive_points(self,x,y,dx=None,dy=None,name='', color=0,symbol=0,label=None):
+        """Draw markers with error bars"""
+        self.subplot.set_yscale('linear')
+        self.subplot.set_xscale('linear')
+        
+        from plottable_interactor import PointInteractor
+        p = PointInteractor(self, self.subplot, zorder=3, id=name)
+        p.points(x, y, dx, dy, color, symbol, label)
+        
+        self.subplot.set_yscale(self.yscale)
+        self.subplot.set_xscale(self.xscale)
+
+    def interactive_curve(self,x,y,dy=None,name='',color=0,symbol=0,label=None):
+        """Draw markers with error bars"""
+        self.subplot.set_yscale('linear')
+        self.subplot.set_xscale('linear')
+        
+        from plottable_interactor import PointInteractor
+        p = PointInteractor(self, self.subplot, zorder=4, id=name)
+        p.curve(x, y, dy, color, symbol, label)
+        
+        self.subplot.set_yscale(self.yscale)
+        self.subplot.set_xscale(self.xscale)
+
+    def plottable_selected(self, id):
+        """
+            Called to register a plottable as selected
+        """
+        #TODO: check that it really is in the list of plottables
+        self.graph.selected_plottable = id
+
     def points(self,x,y,dx=None,dy=None,color=0,symbol=0,label=None):
         """Draw markers with error bars"""

guitools/plottables.py

@@ -236 +236 @@
         return labels
     
+    def get_plottable(self, name):
+        """
+            Return the plottable with the given
+            name if it exists. Otherwise return None
+        """
+        for item in self.plottables:
+            if item.name==name:
+                return item
+        return None
+    
     def returnPlottable(self):
         """
@@ -246 +256 @@
     def render(self,plot):
         """Redraw the graph"""
+        plot.connect.clearall()
+        
         plot.clear()
         plot.properties(self.prop)
@@ -258 +270 @@
         self.reset()
         self.set(**kw)
+        
+        # Name of selected plottable, if any
+        self.selected_plottable = None
 
 
@@ -352 +367 @@
     short_name = None
     
+    # Fancy name
+    name = None
+    
     # Data
     x  = None
@@ -360 +378 @@
     # Parameter to allow a plot to be part of the list without being displayed
     hidden = False
+    
+    # Flag to set whether a plottable has an interactor or not
+    interactive = True
 
     def __setattr__(self, name, value):
@@ -801 +822 @@
         
     def render(self,plot,**kw):
-        plot.points(self.view.x,self.view.y,dx=self.view.dx,dy=self.view.dy,**kw)
-     
+        """
+            Renders the plottable on the graph
+        """
+        if self.interactive==True:
+            plot.interactive_points(self.view.x,self.view.y,
+                                    dx=self.view.dx,dy=self.view.dy,
+                                    name=self.name, **kw)            
+        else:
+            plot.points(self.view.x,self.view.y,dx=self.view.dx,dy=self.view.dy,**kw)
    
     def changed(self):
@@ -835 +863 @@
         
     def render(self,plot,**kw):
-        plot.curve(self.view.x,self.view.y,dy=self.view.dy,**kw)
+        if self.interactive==True:
+            plot.interactive_curve(self.view.x,self.view.y,
+                                   dy=self.view.dy,
+                                   name=self.name,**kw)
+        else:
+            plot.curve(self.view.x,self.view.y,dy=self.view.dy,**kw)
+            
 
     def changed(self):