Changeset 3755d77 in sasview for guitools

Timestamp:

Sep 29, 2008 9:01:08 AM (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:

a9e04aa

Parents:

65b788b2

Message:

fixed bug with transforms

Location:

guitools

Files:

• PlotPanel.py (modified) (1 diff)
• data_generator/logx_y_err.txt (added)
• fitDialog.py (modified) (4 diffs)

guitools/PlotPanel.py

@@ -1 +1 @@
 import wx.lib.newevent
-import matplotlib
+try:
+    import matplotlib
+except:
+    import pkg_resources
+    pkg_resources.require("matplotlib<0.92.0")
+    import matplotlib
+    
 matplotlib.interactive(False)
 #Use the WxAgg back end. The Wx one takes too long to render

guitools/fitDialog.py

@@ -205 +205 @@
             self.x,self.y,self.dx,self.dy= self.plottable.returnValuesOfView()
             
-            self.mini =min(self.x)
-            self.maxi =max(self.x)
-            
+            #self.mini =min(self.x)
+            #self.maxi =max(self.x)
+            
+            try:
+                self.mini = self.floatForwardTransform(min(self.x))
+            except:
+                self.mini = "Invalid"
+            try:
+                self.maxi = self.floatForwardTransform(max(self.x))
+            except:
+                self.maxi = "Invalid"
             
             self.initXmin.SetValue(format_number(min(self.plottable.x)))
@@ -381 +389 @@
         if float(usermin) < float(usermax):
             if float(usermin) >= float(self.mini) and float(usermin) < float(self.maxi):
-                self.xminFit.SetValue(format_number(usermin))
+                self.xminFit.SetValue(format_number(float(usermin)))
             else:
-                self.xminFit.SetValue(format_number(self.mini))
+                self.xminFit.SetValue(format_number(float(self.mini)))
                 
             if float(usermax) > float(self.mini) and float(usermax) <= float(self.maxi):
-                self.xmaxFit.SetLabel(format_number(usermax))
+                self.xmaxFit.SetLabel(format_number(float(usermax)))
             else:
-                self.xmaxFit.SetLabel(format_number(self.maxi))
+                self.xmaxFit.SetLabel(format_number(float(self.maxi)))
                 
             mini =float(self.xminFit.GetValue())
@@ -394 +402 @@
             
             return mini, maxi
+        
+    def floatForwardTransform(self,x):
+        """
+             transform a float.
+        """
+        #TODO: refactor this with proper object-oriented design
+        # This code stinks.
+        
+        if ( self.xLabel=="x" ):
+            return transform.toX(x)
+        
+        if ( self.xLabel=="x^(2)" ): 
+            return transform.toX2(x)
+        
+        if (self.xLabel=="log10(x)" ):
+            return math.log10(x)
+            
     def floatTransform(self,x):
         """
@@ -427 +452 @@
         
         elif (self.xLabel=="log10(x)" ):
-            print "fitdialog: x",x
             return math.pow(10, x)