Changeset 1d40f44 in sasview

Timestamp:

Apr 2, 2008 4:35:46 PM (17 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:

4965ea1

Parents:

b6b9d76

Message:

is working

Location:

guitools

Files:

• PlotPanel.py (modified) (6 diffs)
• plottables.py (modified) (1 diff)

guitools/PlotPanel.py

@@ -113 +113 @@
             @param x: float value
         """
-        return math.pow(x,2)
+        return x*x
     
     def fromX2(self,x):
@@ -399 +399 @@
                 self.set_yscale("linear")
                 self.graph.yaxis("\\rm{Intensity^{2}} ","cm^{-2}")
-              
-        item.reset_view()
+   
         self.prevXtrans = self.xscales 
         self.prevYtrans = self.yscales  
-       
+        
         self.graph.render(self)
         self.subplot.figure.canvas.draw_idle()
@@ -423 +422 @@
             @param dx: float value
         """
-        if not dx == None:
+        if  dx != None:
             err = 2*x*dx
             if err >= x:
@@ -436 +435 @@
             @param dx: float value
         """
-        if (x > 0) and (dx != None):
-            err = dx/(2*math.sqrt(x))
+        if (x > 0):
+            if(dx != None):
+                err = dx/(2*math.sqrt(x))
+            else:
+                err = 0
             if err >= x:
-                err = 0.9*x
+                err = 0.9*x    
+        else:
+            err = 0.9*x
+           
             return err
-        elif x==0.0:
-            err = 0.9*x
-            return err
-        else:
-            return 0.0
         
     def errFuncToLogX(self,x,dx=None):
@@ -453 +453 @@
             @param dx: float value
         """
-        #if (x != 0) and (dx != None):
-        #    err= dx/x
-        #elif :
         if x!=0:
             if dx==None:
-                err = 1/x
+                #err = 1/x
+                err = 0
             else:
                 err = dx/x
@@ -470 +468 @@
     def errFuncfromLogXY(self,x,dx=None):
         """
-            calculate error of sqrt(x)
+            calculate error of Log(xy)
             @param x: float value
             @param dx: float value
         """
-        if (x > 0) and (dx != None):
-            err= math.exp(x)*dx
-            if err >= x:
-                err = 0.9*x
-            return err
-        elif x == 0 :
-            err = 0.9*x
-            return err 
-        elif dx == None:
-            return 0
-        else:
-            raise ValueError, "Can't  calculate the error"
+        return 
+       
                    
     def onFitDisplay(self, plottable):

guitools/plottables.py

@@ -345 +345 @@
         """ Reload view with new value to plot"""
         self.view = self.View(self.x, self.y, self.dx, self.dy)
+        print "the value of view x",self.view.x
+        print "the value of view y",self.view.y
+       
     
     def render(self,plot):