Changeset bbec827 in sasview for guitools/PlotPanel.py

Timestamp:

May 1, 2008 5:04:40 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

ddff053

Parents:

34ae302

Message:

working

File:

• guitools/PlotPanel.py (modified) (6 diffs)

guitools/PlotPanel.py

@@ -12 +12 @@
 from matplotlib.widgets import RectangleSelector
 from pylab import  gca, gcf
-
+from plottables import Theory1D
+#from plottables import Data1D
 #TODO: make the plottables interactive
 
@@ -103 +104 @@
         self.canvas.mpl_connect('scroll_event',self.onWheel)
         self.axes = [self.subplot]
+         # new data for the fit 
+        self.fit_result = Theory1D(x=[], y=[], dy=None)
+        #self.fit_result = Data1D(x=[], y=[],dx=None, dy=None)
+        self.fit_result.name = "Fit"
+        self.fit_result.ID = "isFit"
 
     def onWheel(self, event):
@@ -130 +136 @@
                 if insidex:
                     xdata,_ = ax.transAxes.inverse_xy_tup((x,y))
-                    print "xaxis",x,"->",xdata
+                    #print "xaxis",x,"->",xdata
                 insidey,_ = ax.yaxis.contains(event)
                 if insidey:
                     _,ydata = ax.transAxes.inverse_xy_tup((x,y))
-                    print "yaxis",y,"->",ydata
+                    #print "yaxis",y,"->",ydata
             if xdata is not None:
                 lo,hi = ax.get_xlim()
@@ -420 +426 @@
         list =[]
         list = self.graph.returnPlottable()
+        self.fit_result.x =[]  
+        self.fit_result.y =[] 
+        self.fit_result.dx=None
+        self.fit_result.dy=None
         
         for item in list:
@@ -507 +517 @@
                 name, units = item.get_yaxis()
                 self.graph.yaxis("$Log %s$" % name,  "%s^{-1}" % units)
-                
+            item.transformView()
         #item.name = self.yscales+" vs " +self.xscales      
         self.prevXtrans = self.xscales 
         self.prevYtrans = self.yscales  
-        item.transformView()
         self.graph.render(self)
         self.subplot.figure.canvas.draw_idle()
         
-    def onFitDisplay(self, plottable,xmin,xmax):
+    def onFitDisplay(self, tempx,tempy,xmin,xmax):
         """
             Add a new plottable into the graph .In this case this plottable will be used 
@@ -521 +530 @@
             @param plottable: the plottable to plot
         """
+        
+        
         list =[]
         list = self.graph.returnPlottable()
         for item in list:
             item.onFitRange(xmin,xmax)
-        #Add the data to fit 
-        self.graph.add(plottable)
+        # Create new data plottable with result
+        self.fit_result.x =[] 
+        self.fit_result.y =[]
+        self.fit_result.x =tempx  
+        self.fit_result.y =tempy     
+        self.fit_result.dx=None
+        self.fit_result.dy=None
+        #Load the view with the new values
+        self.fit_result.reset_view() 
+        self.graph.add(self.fit_result) 
+        
         self.graph.render(self)
-        
         self.subplot.figure.canvas.draw_idle()
-        self.graph.delete(plottable)
+        #self.graph.delete(plottable)
    
     def onResetGraph(self,event):