Changeset b5e98540 in sasview for sansview/perspectives/fitting

Timestamp:

Apr 15, 2009 10:39:38 AM (16 years ago)

Author:

Jae Cho <jhjcho@…>

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:

aa1e9a72

Parents:

27c5c26

Message:

fixed the first or last points missing from calculations

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (3 diffs)
• fitpage.py (modified) (2 diffs)
• modelpage.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -525 +525 @@
         """
         
-        self.qmin.SetValue(format_number(self.state.qmin))
-        self.qmax.SetValue(format_number(self.state.qmax)) 
+        #self.qmin.SetValue(format_number(self.state.qmin))
+        #self.qmax.SetValue(format_number(self.state.qmax)) 
+        self.qmin.SetValue(str(self.state.qmin))
+        self.qmax.SetValue(str(self.state.qmax)) 
         if self.state.npts!=None:
             self.npts.SetValue(format_number(self.state.npts)) 
@@ -1214 +1216 @@
         #--------------------------------------------------------------
         self.qmin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.qmin.SetValue(format_number(self.qmin_x))
+        #For qmin and qmax, do not use format_number.(If do, qmin and max could be different from what is in the data.)
+        #self.qmin.SetValue(format_number(self.qmin_x))
+        self.qmin.SetValue(str(self.qmin_x))
         self.qmin.SetToolTipString("Minimun value of Q in linear scale.")
         self.qmin.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)
@@ -1221 +1225 @@
      
         self.qmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.qmax.SetValue(format_number(self.qmax_x))
+        #For qmin and qmax, do not use format_number.(If do, qmin and max could be different from what is in the data.)
+        #self.qmax.SetValue(format_number(self.qmax_x))
+        self.qmax.SetValue(str(self.qmax_x))
         self.qmax.SetToolTipString("Maximum value of Q in linear scale.")
         self.qmax.Bind(wx.EVT_SET_FOCUS, self.onSetFocus)

sansview/perspectives/fitting/fitpage.py

@@ -145 +145 @@
         if not hasattr(self.data,"data"): #Display only for 1D data fit
             # Minimum value of data   
-            data_min = str(format_number(numpy.min(self.data.x)))
+            #data_min = str(format_number(numpy.min(self.data.x)))
+            data_min = str((numpy.min(self.data.x)))
             # Maximum value of data  
-            data_max = str(format_number(numpy.max(self.data.x)))
+#            data_max = str(format_number(numpy.max(self.data.x)))
+            data_max = str((numpy.max(self.data.x)))
             text4_3 = wx.StaticText(self, -1, 'Total Q Range (1/A)',
                                      style=wx.ALIGN_LEFT)
@@ -160 +162 @@
             y= numpy.max(self.data.ymin, self.data.ymax)
             radius_max = math.sqrt(x*x + y*y)
+            
+            #For qmin and qmax, do not use format_number.(If do, qmin and max could be different from what is in the data.)
             # Minimum value of data   
-            data_min = str(format_number(radius_min))
+            #data_min = str(format_number(radius_min))
+            data_min = str((radius_min))
             # Maximum value of data  
-            data_max = str(format_number(radius_max))
+            #data_max = str(format_number(radius_max))
+            data_max = str((radius_max))
             text4_3 = wx.StaticText(self, -1, 'Total Q Range (1/A)',
                                      style=wx.ALIGN_LEFT)

sansview/perspectives/fitting/modelpage.py

@@ -396 +396 @@
         
         # Set the controls
+        #For qmin and qmax, do not use format_number.(If do, qmin and max could be different from what is in the data.)
+        """
         self.qmin.SetValue(format_number(self.qmin_x))
         self.qmax.SetValue(format_number(self.qmax_x))
+        self.npts.SetValue(format_number(self.num_points))
+        """
+        self.qmin.SetValue((self.qmin_x))
+        self.qmax.SetValue((self.qmax_x))
         self.npts.SetValue(format_number(self.num_points))