Changeset ad8bcd6 in sasview

Timestamp:

Jun 13, 2008 2:12:48 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

fc2b91a

Parents:

b659551

Message:

Improved transformation so that it always plots something reasonable in log scale. Minor tweak to dragging.

Location:

guitools

Files:

• PlotPanel.py (modified) (13 diffs)
• fitDialog.py (modified) (1 diff)
• transform.py (modified) (8 diffs)

guitools/PlotPanel.py

@@ -13 +13 @@
 from pylab import  gca, gcf
 from plottables import Theory1D
-
-#from matplotlib.backend_bases import MouseEvent
-#from plottables import Data1D
 #TODO: make the plottables interactive
 
@@ -92 +89 @@
                 lo=loprev
                 hi=hiprev
-                #print "Not possible to scale"
-           
             else:
                 lo,hi = math.pow(10.,lo),math.pow(10.,hi)
-                #assert lo >0,"lo = %g"%lo
-                #print "possible to scale"
-           
-            #print "these are low and high",lo,hi
-
         return (lo,hi)
 
@@ -158 +148 @@
         self.mousemotion=False
         
-        #self.canvas.Bind(wx.EVT_MOUSE_EVENTS,self.onTest)
         self.axes = [self.subplot]
-         # new data for the fit 
+        # new data for the fit 
         self.fit_result = Theory1D(x=[], y=[], dy=None)
         #self.fit_result = Data1D(x=[], y=[],dx=None, dy=None)
@@ -174 +163 @@
         self.ErrBvalue=None
         self.Chivalue=None
+        
+        # Dragging info
         self.begDrag=False
-        #self.begDragI=False
         self.xInit=None
         self.yInit=None
         self.xFinal=None
         self.yFinal=None
-  
+        
+        # Default locations
+        self._default_save_location = os.getcwd()        
+        
+        
     def onLeftDown(self,event): 
         """ left button down and ready to drag"""
         self.leftdown=True
         ax = event.inaxes
-        if ax !=None:
+        if ax != None:
             self.xInit,self.yInit=event.xdata,event.ydata
             
@@ -208 +202 @@
                 self.xFinal,self.yFinal=event.xdata,event.ydata
                 
+                # Check whether this is the first point
+                if self.xInit==None:
+                    self.xInit = self.xFinal
+                    self.yInit = self.yFinal
+                    
                 xdelta = self.xFinal -self.xInit
                 ydelta = self.yFinal -self.yInit
@@ -450 +449 @@
         #print "Save image not implemented"
         path = None
-        dlg = wx.FileDialog(self, "Choose a file", os.getcwd(), "", "*.png", wx.SAVE)
+        dlg = wx.FileDialog(self, "Choose a file", self._default_save_location, "", "*.png", wx.SAVE)
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()
-            mypath = os.path.basename(path)
-            print path
+            self._default_save_location = os.path.dirname(path)
         dlg.Destroy()
         if not path == None:
@@ -654 +652 @@
                 
             if (self.xLabel=="log10(x)" ):
-                item.transformX(transform.toX,transform.errToX)
+                item.transformX(transform.toX_pos,transform.errToX_pos)
                 self.set_xscale("log")
                 name, units = item.get_xaxis() 
@@ -664 +662 @@
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
-                self.graph.yaxis("log\ \ %s" % name,  "%s" % units)
+                self.graph.yaxis("\log\ \ %s" % name,  "%s" % units)
                 
                 
@@ -675 +673 @@
                 
             if ( self.yLabel=="log10(y)" ): 
-                item.transformY(transform.toX,transform.errToX)
+                item.transformY(transform.toX_pos,transform.errToX_pos)
                 self.set_yscale("log")  
                 name, units = item.get_yaxis()
@@ -708 +706 @@
                 yname, yunits = item.get_yaxis()
                 xname, xunits = item.get_xaxis()
-                self.graph.yaxis("log\ (%s \ \ %s)" % (yname,xname),  "%s%s" % (yunits,xunits))
+                self.graph.yaxis("\log\ (%s \ \ %s)" % (yname,xname),  "%s%s" % (yunits,xunits))
                
                 
@@ -717 +715 @@
                 xname, xunits = item.get_xaxis() 
                 xunits = convertUnit(2,xunits) 
-                self.graph.yaxis("Log (%s \ \ %s^{2})" % (yname,xname),  "%s%s" % (yunits,xunits))
+                self.graph.yaxis("\log (%s \ \ %s^{2})" % (yname,xname),  "%s%s" % (yunits,xunits))
                 
             
@@ -726 +724 @@
                 xname, xunits = item.get_xaxis()
                 xunits = convertUnit(4,xunits) 
-                self.graph.yaxis("Log (%s \ \ %s^{4})" % (yname,xname),  "%s%s" % (yunits,xunits))
+                self.graph.yaxis("\log (%s \ \ %s^{4})" % (yname,xname),  "%s%s" % (yunits,xunits))
                 
             if ( self.viewModel == "Guinier lny vs x^(2)"):
@@ -740 +738 @@
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
-                self.graph.yaxis("$Log %s$" % name,  "%s" % units)
+                self.graph.yaxis("\log\ \ %s" % name,  "%s" % units)
                
                 

guitools/fitDialog.py

@@ -285 +285 @@
               
                 #Find the fitting parameters
+                # Always use the same defaults, so that fit history doesn't play a role! 
+                self.cstA = fittings.Parameter(self.model, 'A', self.default_A)
+                self.cstB  = fittings.Parameter(self.model, 'B', self.default_B)
                 
                 if (self.xLabel.lower() == "log10(x)"):

guitools/transform.py

@@ -8 +8 @@
     """
     return x
+
+def toX_pos(x,y=None):
+    """
+    This function is used to load value on Plottable.View
+    @param x: Float value
+    @return x,
+    """
+    if not x>0:
+        raise ValueError, "Transformation only accepts positive values."
+    else:
+        return x
 
 def toX2(x,y=None):
@@ -35 +46 @@
     """
     if not x > 0:
-        raise ValueError, "Log(X)of a negative value "
+        raise ValueError, "Log(x)of a negative value "
     else:
         return math.log(x)
@@ -86 +97 @@
     if dx==None:
         dx=0
+    return dx
+
+def errToX_pos(x,y=None,dx=None,dy=None):
+    """
+        calculate error of x**2
+        @param x: float value
+        @param dx: float value
+    """
+    if dx==None:
+        dx=0
+        
+    # Check that the point on the graph is positive
+    # within errors
+    if not x-dx > 0:
+        raise ValueError, "Transformation does not accept point that are consistent with zero."
+    
     return dx
 
@@ -124 +151 @@
     if dx==None:
         dx = 0
+        
+    # Check that the point on the graph is positive
+    # within errors
+    if not x-dx > 0:
+        raise ValueError, "Transformation does not accept point that are consistent with zero."
+        
     if x!=0:
         dx = dx/(x*math.log(10))
@@ -139 +172 @@
     if dx==None:
         dx = 0
+            
+    # Check that the point on the graph is positive
+    # within errors
+    if not x-dx > 0:
+        raise ValueError, "Transformation does not accept point that are consistent with zero."
+
     if x!=0:
         dx = dx/x
@@ -160 +199 @@
         calculate error of Log(xy)
     """
+    # Check that the point on the graph is positive
+    # within errors
+    if (not x-dx > 0) or (not y-dy > 0):
+        raise ValueError, "Transformation does not accept point that are consistent with zero."
+    
     if (x!=0) and (y!=0):
         if dx == None:
@@ -175 +219 @@
         calculate error of Log(yx**2)
     """
+    # Check that the point on the graph is positive
+    # within errors
+    if (not x-dx > 0) or (not y-dy > 0):
+        raise ValueError, "Transformation does not accept point that are consistent with zero."
+    
     if (x > 0) and (y > 0):
         if (dx == None):
@@ -217 +266 @@
         @param x: float value
     """
+    # Check that the point on the graph is positive
+    # within errors
+    if (not x-dx > 0) or (not y-dy > 0):
+        raise ValueError, "Transformation does not accept point that are consistent with zero."
+    
     if dx==None:
         dx=0