Changeset d4bb639 in sasview for sansview/perspectives/fitting

Timestamp:

Sep 17, 2009 3:14:09 PM (15 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:

a85f622

Parents:

5582a9f1

Message:

Removed self.qmin.default…

File:

• sansview/perspectives/fitting/basepage.py (modified) (4 diffs)

sansview/perspectives/fitting/basepage.py

@@ -14 +14 @@
 (NextStateEvent, EVT_NEXT_STATE)   = wx.lib.newevent.NewEvent()
 _BOX_WIDTH = 76
-
+_QMIN_DEFAULT = 0.001
+_QMAX_DEFAULT = 0.13
+_NPTS_DEFAULT = 50
 class BasicPage(wx.ScrolledWindow):
     """
@@ -73 +75 @@
         ## check that the fit range is correct to plot the model again
         self.fitrange= True
-        ## Q range defaults
-        self.qmin_def = 0.001
-        self.qmax_def = 0.13
-        self.num_points_def = 50
+
         ## Q range
-        self.qmin_x= 0.001
-        self.qmax_x= 0.13
-        self.num_points= 50
+        self.qmin_x= _QMIN_DEFAULT
+        self.qmax_x= _QMAX_DEFAULT
+        self.num_points= _NPTS_DEFAULT
         
         ## Create memento to save the current state
@@ -1668 +1667 @@
         sizer.Add(wx.StaticText(self, -1, ' Max'))
         sizer.Add(self.reset_qrange)   
-        
-        
-        sizer.Add((5,5))
-        sizer.Add(wx.StaticText(self, -1, 'Min'))
-        sizer.Add(wx.StaticText(self, -1, 'Max'))
-        sizer.Add(wx.StaticText(self, -1, 'Q range'))
              
         sizer.Add(self.qmin)
@@ -1736 +1729 @@
             self.qmax_x = max(self.data.x)
         else:
-            self.qmin_x = self.qmin_def
-            self.qmax_x = self.qmax_def
-            self.num_points = self.num_points_def
+            self.qmin_x = _QMIN_DEFAULT
+            self.qmax_x = _QMAX_DEFAULT
+            self.num_points = _NPTS_DEFAULT            
             self.state.npts = self.num_points