Changeset b6b9d76 in sasview

Timestamp:

Apr 2, 2008 3:10:25 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:

1d40f44

Parents:

2da23bc

Message:

modified plotpanel and plottable

Location:

guitools

Files:

• PlotPanel.py (modified) (6 diffs)
• plottables.py (modified) (2 diffs)

guitools/PlotPanel.py

@@ -371 +371 @@
         for item in list:
             if ( self.xscales=="x" ):
-                if self.prevXtrans == "x^(2)":
-                    item.transform_x(  self.fromX2, self.errFuncfromX2 )
-                if self.prevXtrans == "Log(x)":
-                    item.transform_x(  self.toX, self.errFuncfromLogXY )
-                    
                 item.transform_x(  self.toX, self.errFunctoX )
                 self.set_xscale("linear")
@@ -381 +376 @@
                 
             if ( self.xscales=="x^(2)" ):
-                if  self.prevXtrans != "x^(2)":
-                    item.transform_x(  self.toX2, self.errFuncToX2 )
-                
-                item.transform_x(  self.toX, self.errFunctoX )
+                item.transform_x(  self.toX2, self.errFuncToX2 )
                 self.set_xscale('linear')
                 self.graph.xaxis('\\rm{q^{2}} ', 'A^{-2}')
                 
             if (self.xscales=="Log(x)" ):
-                if self.prevXtrans == "x^(2)":
-                    item.transform_x(  self.fromX2, self.errFuncfromX2 )
-                
                 item.transform_x(  self.toX, self.errFuncToLogX )
                 self.set_xscale("log")
@@ -397 +386 @@
                 
             if ( self.yscales=="y" ):
-                if self.prevYtrans == "y^(2)":
-                    item.transform_y(  self.fromX2, self.errFuncfromX2 )
-                if self.prevYtrans == "Log(y)":
-                    item.transform_y(  self.toX, self.errFuncfromLogXY )
-                    
                 item.transform_y(  self.toX, self.errFunctoX )
                 self.set_yscale("linear")
                 self.graph.yaxis("\\rm{Intensity} ","cm^{-1}")
                 
-            if ( self.yscales=="Log(y)" ):
-                if self.prevYtrans == "y^(2)":
-                     item.transform_y(  self.fromX2, self.errFuncfromX2 )
-                     
+            if ( self.yscales=="Log(y)" ): 
                 item.transform_y(  self.toX, self.errFuncToLogX)
                 self.set_yscale("log")  
@@ -415 +396 @@
                 
             if ( self.yscales=="y^(2)" ):
-                if self.prevYtrans != "y^(2)":
-                     item.transform_y(  self.toX2, self.errFuncToX2 )  
-                item.transform_y(  self.toX, self.errFunctoX )    
+                item.transform_y(  self.toX2, self.errFuncToX2 )    
                 self.set_yscale("linear")
                 self.graph.yaxis("\\rm{Intensity^{2}} ","cm^{-2}")
-            item.set_View(item.x,item.y) 
-             
+              
+        item.reset_view()
         self.prevXtrans = self.xscales 
         self.prevYtrans = self.yscales  
@@ -435 +414 @@
         if dx >=x:
             return 0.9*x
+        if dx==None:
+             return 0
         return dx
     def errFuncToX2(self,x,dx=None):
@@ -472 +453 @@
             @param dx: float value
         """
-        if (x != 0) and ( dx != None):
-            err= dx/x
+        #if (x != 0) and (dx != None):
+        #    err= dx/x
+        #elif :
+        if x!=0:
+            if dx==None:
+                err = 1/x
+            else:
+                err = dx/x
             if err >= x:
                 err = 0.9*x
-            return err
-        elif x==0:
+        else:
             err = 0.9*x
-            return err
-        else:
-            return 0
+        
+        return err
         
     def errFuncfromLogXY(self,x,dx=None):

guitools/plottables.py

@@ -412 +412 @@
             for i in range(len(x)):
                 self.x[i] = func(x[i])
-                if dx:
+                if dx !=None:
                     self.dx[i] = errfunc(x[i], dx[i])
                 else:
@@ -436 +436 @@
             for i in range(len(y)):
                  self.y[i] = func(y[i])
-                 if dy:
+                 if dy !=None:
                      self.dy[i] = errfunc(y[i], dy[i])
                  else: