Changeset 46693050 in sasview

Timestamp:

Apr 23, 2008 12:36: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:

863607a

Parents:

35891ce

Message:

working on fit linear

Location:

guitools

Files:

• PlotPanel.py (modified) (8 diffs)
• fitDialog.py (modified) (1 diff)
• plottables.py (modified) (7 diffs)
• transform.py (modified) (3 diffs)

guitools/PlotPanel.py

@@ -64 +64 @@
         # keep track if the previous transformation of x and y in Property dialog
         self.prevXtrans =" "
+        
         self.prevYtrans =" "
         
@@ -343 +344 @@
                 
             if (self.xscales=="log10(x)" ):
-                item.transform_x( transform.toX, transform.errToLogX )
+                item.transform_x( transform.toX, transform.errToX )
                 self.set_xscale("log")
                 name, units = item.get_xaxis()
+                item.check_data_Plottable() 
                 self.graph.xaxis("Log10 %s" % name,  "%s^{-1}" % units)
                 
@@ -364 +366 @@
                 self.set_yscale("log")  
                 name, units = item.get_yaxis()
+                #item.check_data_Plottable() 
                 self.graph.yaxis("Log10 %s" % name,  "%s^{-1}" % units)
                 
@@ -392 +395 @@
                 
             if ( self.yscales =="ln(y*x^(2))"):
-                item.transform_y( transform.toYX2 ,transform.errToLogYX2 )
+                item.transform_y( transform.toLogYX2 ,transform.errToLogYX2 )
                 self.set_yscale("linear")
                 yname, yunits = item.get_yaxis()
@@ -415 +418 @@
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
-                self.graph.yaxis("Log %s" % name,  "%s^{-1}" % units)
+                self.graph.yaxis("$Log %s$" % name,  "%s^{-1}" % units)
         #item.name = self.yscales+" vs " +self.xscales      
         self.prevXtrans = self.xscales 
@@ -422 +425 @@
         self.graph.render(self)
         self.subplot.figure.canvas.draw_idle()
-    def onFitDisplay(self, plottable):
+        
+    def onFitDisplay(self, plottable,xmin,xmax):
         """
             Add a new plottable into the graph .In this case this plottable will be used 
@@ -428 +432 @@
             @param plottable: the plottable to plot
         """
+        list =[]
+        tempx=[]
+        tempy=[]
+        tempdx=[]
+        tempdy=[]
+        #Stored plotted plottable in a new plottable 
+        list = self.graph.returnPlottable()
+        if len(list.keys())>0:
+            for item in list:
+                if self.graph.isPlotted(item)== True:
+                    x,y,dx,dy = item.returnValuesOfView()
+                    if((min(x) < xmin )and( max(x) > xmax ))\
+                        or ((min(x) <= xmin )and( max(x) > xmax ))\
+                        or((min(x) < xmin )and( max(x) >= xmax )):
+                        item.reducedXrange(xmin,xmax)
+                    else:
+                         item.originalXrange()
+            
+        
+        #Add the data to fit 
         plottable.reset_view()
         self.graph.add(plottable)
@@ -434 +458 @@
         self.subplot.figure.canvas.draw_idle()
         self.graph.delete(plottable)
+    
       
     

guitools/fitDialog.py

@@ -245 +245 @@
             
             #Send the data to display to the PlotPanel
-            self.push_data(self.file_data1)
+            self.push_data(self.file_data1,xminView, xmaxView)
             
             # Display the fitting value on the Fit Dialog

guitools/plottables.py

@@ -218 +218 @@
             p.render(plot,color=self.plottables[p],symbol=0,label=labels[p])
         plot.render()
+   
+    def clear(self,plot): 
+        plot.clear()
 
     def __init__(self,**kw):
@@ -375 +378 @@
         """ Reload view with new value to plot"""
         self.view = self.View(self.x, self.y, self.dx, self.dy)
-       
+        #save the initial value
+        self.view.Xreel = self.view.x
+        self.view.Yreel = self.view.y
+        self.view.DXreel = self.view.dx
+        self.view.DYreel = self.view.dy
        
     
@@ -412 +419 @@
         
         return self.view.returnXview()
-   
+    def check_data_PlottableX(self): 
+        self.view.check_data_logX()
+    def check_data_PlottableY(self): 
+        self.view.check_data_logY() 
+    def originalXrange(self):
+        self.view.reelXrange()
+    def reducedXrange(self,min,max):
+        self.view.reduceXrange(min, max)
     class View:
         """
@@ -421 +435 @@
         dx = None
         dy = None
+        
         
         def __init__(self, x=None, y=None, dx=None, dy=None):
@@ -427 +442 @@
             self.dx = dx
             self.dy = dy
-            
+            #to change x range to the reel range
+            self.Xreel = self.x
+            self.Yreel = self.y
+            self.DXreel = self.dx
+            self.DYreel = self.dy
+           
         def transform_x(self, func, errfunc, x,y=None,dx=None, dy=None):
             """
@@ -452 +472 @@
                     raise ValueError, "Plottable.View: Given y and dy are not of the same length"
             
-            self.x = numpy.zeros(len(x))
-            self.dx = numpy.zeros(len(x))
+            self.x = []
+            self.dx = []
             
             for i in range(len(x)):
                 if has_y:
-                     self.x[i] = func(x[i],y[i])
-                     if (dx!=None) and (dy !=None):
-                         self.dx[i] = errfunc(x[i], y[i], dx[i], dy[i])
-                     elif (dx != None):
-                         self.dx[i] = errfunc(x[i], y[i], dx[i],0)
-                     elif (dy != None):
-                         self.dx[i] = errfunc(x[i], y[i],0,dy[i])
-                     else:
-                         self.dx[i] = errfunc(x[i],y[i],0, 0)
+                     try:
+                         xtemp = func(x[i],y[i])
+                         
+                         
+                         if (dx!=None) and (dy !=None):
+                             dxtemp = errfunc(x[i], y[i], dx[i], dy[i])
+                         elif (dx != None):
+                             dxtemp = errfunc(x[i], y[i], dx[i],0)
+                         elif (dy != None):
+                             dxtemp = errfunc(x[i], y[i],0,dy[i])
+                         else:
+                             dxtemp = errfunc(x[i],y[i],0, 0)
+                         
+                         self.x.append(xtemp)
+                         self.dx.append(dxtemp)
+                         self.Xreel = []
+                         self.DXreel=[]
+                         self.Xreel = self.x
+                         self.DXreel = self.dx
+                         
+                     except:
+                         print "View.transform_x: skipping point %g" % x[i]
+                         print sys.exc_value
+                         
+                         
                 else:
-                    self.x[i] = func(x[i])
-                    if (dx != None):
-                        self.dx[i] = errfunc(x[i], dx[i])
-                    else:
-                        self.dx[i] = errfunc(x[i],None)
+                    try:
+                        xtemp = func(x[i])
+                        if (dx != None):
+                            dxtemp = errfunc(x[i], dx[i])
+                        else:
+                            dxtemp = errfunc(x[i],None)  
+                        self.x.append(xtemp)
+                        self.dx.append(dxtemp)
+                        self.Xreel = []
+                        self.DXreel=[]
+                        self.Xreel = self.x
+                        self.DXreel = self.dx
+                         
+                    except:
+                         print "View.transform_x: skipping point %g" % x[i]
+                         print sys.exc_value
                     
                          
@@ -498 +545 @@
                     raise ValueError, "Plottable.View: Given x and dx are not of the same length"
             
-            self.y = numpy.zeros(len(y))
-            self.dy = numpy.zeros(len(y))
+            self.y = []
+            self.dy = []
            
             for i in range(len(y)):
                 
                  if has_x:
-                     self.y[i] = func(y[i],x[i])
-                     if (dx!=None) and (dy !=None):
-                         self.dy[i] = errfunc(y[i], x[i], dy[i], dx[i])
-                     elif (dx != None):
-                         self.dy[i] = errfunc(y[i], x[i], 0, dx[i])
-                     elif (dy != None):
-                         self.dy[i] = errfunc(y[i], x[i], dy[i], 0)
-                     else:
-                         self.dy[i] = errfunc(y[i], None)
+                     try:
+                         tempy = func(y[i],x[i])
+                         if (dx!=None) and (dy !=None):
+                             tempdy = errfunc(y[i], x[i], dy[i], dx[i])
+                         elif (dx != None):
+                             tempdy = errfunc(y[i], x[i], 0, dx[i])
+                         elif (dy != None):
+                             tempdy = errfunc(y[i], x[i], dy[i], 0)
+                         else:
+                             tempdy = errfunc(y[i], None)
+                         self.y.append(tempy)
+                         self.dy.append(tempdy)
+                         self.Yreel = []
+                         self.DYreel=[]
+                         self.Yreel = self.y
+                         self.DYreel = self.dy
+                     except:
+                         print "View.transform_y: skipping point %g" % y[i]
+                         print sys.exc_value
+                            
                  else:
-                     self.y[i] = func(y[i])
-                     if (dy != None):
-                         self.dy[i] = errfunc( y[i],dy[i])
-                     else:
-                         self.dy[i] = errfunc( y[i],None)
-                
-     
+                     try:
+                         tempy = func(y[i])
+                         if (dy != None):
+                             tempdy = errfunc( y[i],dy[i])
+                         else:
+                             tempdy = errfunc( y[i],None)
+                         self.y.append(tempy)
+                         self.dy.append(tempdy)
+                         self.Yreel = []
+                         self.DYreel=[]
+                         self.Yreel = self.y
+                         self.DYreel = self.dy
+                     except:
+                          print "View.transform_y: skipping point %g" % y[i]
+                          print sys.exc_value
+                          
+
+            
         def returnXview(self):
             return self.x,self.y,self.dx,self.dy
         
-        def returnValueOfView(self,i): 
-            print"this is i:",i
-            if i in range(len(self.x)):
-                print self.x[i]
-                return self.x[i]
+        def checkMin(self,x,min,pos=None):
+            if pos==None:
+                pos=0
+                for i in range(len(self.x)):
+                    if not min in x:# The user enters a value not in x
+                        if x[i] > min:
+                            index= i-1
+                            print "this is index",index
+                            return index1
+                    else:
+                         index=i
+                         print"the user enter a value inside x",index
+                         return index
+            else:
+                index= pos
+                return index
+            
+        def checkMax(self,x,max,pos=None):
+            if pos==None:
+                pos=0
+                for i in range(len(self.x)):
+                    if not max in x:# The user enters a value not in x
+                        if x[i] >max:
+                           
+                            index= i-1
+                            return index
+                    else:
+                         index=i
+                         return index
+            else:
+                index= pos
+                return index
+              
+        def reduceXrange(self,min,max):
+            
+            # to change the x range to the user range
+            self.Xscale = []
+            self.Yscale = []
+            self.DXscale = []
+            self.DYscale = []
+            indexmin =self.checkMin(self.x,min,None)
+            indexmax =self.checkMin(self.x,max,None)
+            for i in range(len(self.x)):
+                if( self.x[i] >=self.x[indexmin])and( self.x[i] <= max):
+                    self.Xscale.append(self.x[i])
+                    self.Yscale.append(self.y[i])
+                    self.DXscale.append(self.dx[i])
+                    self.DYscale.append(self.dy[i])
+            print self.Xscale
+            self.x= self.Xscale  
+            self.y= self.Yscale
+            self.dx= self.DXscale
+            self.dy= self.DYscale
+        
+            
+        def reelXrange(self):
+            self.x= self.Xreel
+            self.y= self.Yreel
+            self.dx= self.DXreel
+            self.dy= self.DYreel
+           
+        
+        def check_data_logX(self): 
+            tempx=[]
+            tempdx=[]
+            tempy=[]
+            tempdy=[]
+        
+            for i in range(len(self.x)):
+                try:
+                    if (self.x[i]> 0):
+                       
+                        tempx.append(self.x[i])
+                        tempdx.append(self.dx[i])
+                        tempy.append(self.y[i])
+                        tempdy.append(self.dy[i])
+                except:
+                    #print "View.transform_x: skipping point %g" %self.x[i]
+                    print sys.exc_value  
+                    pass     
+                
+            self.x=[]
+            self.dx=[]
+            self.y=[]
+            self.dy=[]
+            self.x=tempx
+            self.y=tempy
+            self.dx=tempdx
+            self.dy=tempdy
+        def check_data_logY(self): 
+            tempx=[]
+            tempdx=[]
+            tempy=[]
+            tempdy=[]
+        
+            for i in range(len(self.x)):
+                try:
+                    if (self.y[i]> 0):
+                       
+                        tempx.append(self.x[i])
+                        tempdx.append(self.dx[i])
+                        tempy.append(self.y[i])
+                        tempdy.append(self.dy[i])
+                except:
+                    #print "View.transform_x: skipping point %g" %self.x[i]
+                    print sys.exc_value  
+                    pass     
+                
+            self.x=[]
+            self.dx=[]
+            self.y=[]
+            self.dy=[]
+            self.x=tempx
+            self.y=tempy
+            self.dx=tempdx
+            self.dy=tempdy
+                
+            
 
 class Data1D(Plottable):

guitools/transform.py

@@ -61 +61 @@
          raise ValueError,"cannot be computed"
      
-     
-def toYX2(x,y):
-    return (x**2)*y
-
-
-def toXY(x,y):
-    return x*y
 
 def toLogYX4(x, y):
@@ -84 +77 @@
         return math.log(x*y)
 
-def fromLogXY(self,x):
-    """
-        This function is used to load value on Plottable.View
-        Calculate e^(x)
-        @param x: float value
-    """
-    return math.exp(x*y)
-
-         
-        
+
+
 def errToX(x,y=None,dx=None,dy=None):
     """
@@ -142 +127 @@
     if dx==None:
         dx = 0
+    if x!=0:
+        dx = dx/x
+    else:
+        raise ValueError, "errToLogX: divide by zero"
+    
     if math.fabs(dx) >= math.fabs(x):
-        return 0.9*x
+        dx = 0.9*x
+    
     return dx