Changeset 2da23bc in sasview

Timestamp:

Apr 2, 2008 12:39:24 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:

b6b9d76

Parents:

8cebf9b

Message:

problem with the scale fixed.

Location:

guitools

Files:

• PlotPanel.py (modified) (7 diffs)
• plottables.py (modified) (3 diffs)

guitools/PlotPanel.py

@@ -373 +373 @@
                 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 +383 @@
                 if  self.prevXtrans != "x^(2)":
                     item.transform_x(  self.toX2, self.errFuncToX2 )
+                
                 item.transform_x(  self.toX, self.errFunctoX )
                 self.set_xscale('linear')
@@ -386 +389 @@
                 
             if (self.xscales=="Log(x)" ):
-                #if self.prevXtrans == "x^(2)":
-                   # item.transform_x(  self.fromX2, self.errFuncfromX2 )
-                
-#                item.transform_x(  self.toX, self.errFuncToLogX )
+                if self.prevXtrans == "x^(2)":
+                    item.transform_x(  self.fromX2, self.errFuncfromX2 )
+                
+                item.transform_x(  self.toX, self.errFuncToLogX )
                 self.set_xscale("log")
                 self.graph.xaxis('\\rm{q} ', 'A^{-1}')
@@ -395 +398 @@
             if ( self.yscales=="y" ):
                 if self.prevYtrans == "y^(2)":
-                    item.transform_y(  self.toX2, self.errFuncToX2 )
-                item.transform_x(  self.toX, self.errFunctoX )
+                    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}")
@@ -403 +409 @@
                 if self.prevYtrans == "y^(2)":
                      item.transform_y(  self.fromX2, self.errFuncfromX2 )
-                item.transform_x(  self.toX, self.errFuncToLogX)
+                     
+                item.transform_y(  self.toX, self.errFuncToLogX)
                 self.set_yscale("log")  
                 self.graph.yaxis("\\rm{Intensity} ","cm^{-1}")
@@ -410 +417 @@
                 if self.prevYtrans != "y^(2)":
                      item.transform_y(  self.toX2, self.errFuncToX2 )  
-                item.transform_x(  self.toX, self.errFunctoX )    
+                item.transform_y(  self.toX, self.errFunctoX )    
                 self.set_yscale("linear")
                 self.graph.yaxis("\\rm{Intensity^{2}} ","cm^{-2}")
@@ -483 +490 @@
         """
         if (x > 0) and (dx != None):
-            err= dx/2*math.sqrt(x)
+            err= math.exp(x)*dx
             if err >= x:
                 err = 0.9*x

guitools/plottables.py

@@ -411 +411 @@
             
             for i in range(len(x)):
-                 self.x[i] = func(x[i])
-                 self.dx[i] = errfunc(x[i], dx[i])
-                          
+                self.x[i] = func(x[i])
+                if dx:
+                    self.dx[i] = errfunc(x[i], dx[i])
+                else:
+                   self.dx[i] = errfunc(x[i])       
         def transform_y(self, func, errfunc, y, dy):
             """
@@ -424 +426 @@
             """
             import copy
+            import numpy
             # Sanity check
             if dy and not len(y)==len(dy):
@@ -433 +436 @@
             for i in range(len(y)):
                  self.y[i] = func(y[i])
-                 self.dy[i] = errfunc(y[i], dy[i])
+                 if dy:
+                     self.dy[i] = errfunc(y[i], dy[i])
+                 else:
+                     self.dy[i] = errfunc(y[i])
      
 class Data1D(Plottable):