Changeset 2c6b224 in sasview

Timestamp:

Jun 28, 2011 2:18:48 PM (13 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:

d8c54ead

Parents:

07c8630

Message:

added a menu item : Ftol setup

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (2 diffs)
• fitting.py (modified) (4 diffs)
• ftol_dialog.py (modified) (6 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -2875 +2875 @@
         # Figuring out key combo: Cmd for copy, Alt for paste
         if event.AltDown() and event.ShiftDown():
-            self._show_ftol_dialog()
+            self._manager.show_ftol_dialog()
             flag = True
         elif event.AltDown() or event.ShiftDown():
@@ -2892 +2892 @@
                           StatusEvent(status= msg, info=infor))
 
-
-    def _show_ftol_dialog(self):
-        """
-        Dialog to select ftol for Scipy
-        """
-        from ftol_dialog import ChangeFtol
-        panel = ChangeFtol(self)
-        panel.ShowModal()
         
     def _onModel2D(self, event):

sansview/perspectives/fitting/fitting.py

@@ -46 +46 @@
 DEFAULT_NPTS = 50
 MAX_NBR_DATA = 4
-
+SANS_F_TOL = 5e-05
 
 (PageInfoEvent, EVT_PAGE_INFO)   = wx.lib.newevent.NewEvent()
@@ -84 +84 @@
         self._fit_engine = 'scipy'
         ## Relative error desired in the sum of squares (float); scipy only
-        self.ftol=1.49012e-08
+        self.ftol = SANS_F_TOL
         #List of selected data
         self.selected_data_list = []
@@ -133 +133 @@
         
         scipy_help= "Scipy Engine: Perform Simple fit. More in Help window...."
-        self.menu1.AppendCheckItem(self.scipy_id, "Simple FitEngine  [LeastSq]",scipy_help) 
+        self.menu1.AppendCheckItem(self.scipy_id, "Simple FitEngine [LeastSq]",
+                                   scipy_help) 
         wx.EVT_MENU(owner, self.scipy_id,  self._onset_engine_scipy)
         
         park_help = "Park Engine: Perform Complex fit. More in Help window...."
-        self.menu1.AppendCheckItem(self.park_id, "Complex FitEngine [ParkMC]",park_help) 
+        self.menu1.AppendCheckItem(self.park_id, "Complex FitEngine [ParkMC]",
+                                   park_help) 
         wx.EVT_MENU(owner, self.park_id,  self._onset_engine_park)
         
         self.menu1.FindItemById(self.scipy_id).Check(True)
         self.menu1.FindItemById(self.park_id).Check(False)
+        self.menu1.AppendSeparator()
+        self.id_tol = wx.NewId()
+        ftol_help = "Change the current FTolerance (=%s) " % str(self.ftol)
+        ftol_help += "of Simple FitEngine..." 
+        self.menu1.Append(self.id_tol, "Change FTolerance [LeastSq Only]", 
+                                   ftol_help) 
+        wx.EVT_MENU(owner, self.id_tol,  self.show_ftol_dialog)
+        
+        
         #create  menubar items
         return [(self.menu1, self.sub_menu)]
@@ -462 +473 @@
         except:
             # default
-            f_tol = 1.49012e-08
+            f_tol = SANS_F_TOL
             
         self.ftol = f_tol
-              
+        # update ftol menu help strings
+        ftol_help = "Change the current FTolerance (=%s) " % str(self.ftol)
+        ftol_help += "of Simple FitEngine..." 
+        self.menu1.SetHelpString(self.id_tol, ftol_help)
+        
+    def show_ftol_dialog(self, event=None):
+        """
+        Dialog to select ftol for Scipy
+        """
+        #if event != None:
+        #    event.Skip()
+        from ftol_dialog import ChangeFtol
+        panel = ChangeFtol(self.parent, self)
+        panel.ShowModal()
+                  
     def stop_fit(self, uid):
         """

sansview/perspectives/fitting/ftol_dialog.py

@@ -14 +14 @@
 # default ftol
 F_TOL = 1.49012e-08 
+SANS_F_TOL = 5e-05
 
 if sys.platform.count("win32") > 0:
     PANEL_WIDTH = 270 
-    PANEL_HEIGHT = 250
+    PANEL_HEIGHT = 265
     FONT_VARIANT = 0
 else:
     PANEL_WIDTH = 285
-    PANEL_HEIGHT = 255
+    PANEL_HEIGHT = 265
     FONT_VARIANT = 1
     
@@ -33 +34 @@
     Dialog to select ftol
     """
-    def __init__(self, parent, id=-1, title="FTolerance"):
+    def __init__(self, parent, base, id=-1, title="FTolerance"):
         wx.Dialog.__init__(self, parent, id, title, 
                            size=(PANEL_WIDTH, PANEL_HEIGHT))
         # parent
-        self.parent = parent
+        self.parent = base
         # default ftol
-        self.ftol = F_TOL
+        self.ftol = SANS_F_TOL
                 # font size 
         self.SetWindowVariant(variant=FONT_VARIANT)
@@ -45 +46 @@
         panel = wx.Panel(self, -1)
         vbox = wx.BoxSizer(wx.VERTICAL)
-        wx.StaticBox(panel, -1, 'ftol selection (Scipy)', (5, 5),
-                      (PANEL_WIDTH*0.9, PANEL_HEIGHT*0.65))
-        default_bt = wx.RadioButton(panel, -1, 'Default', (15, 30), 
+        wx.StaticBox(panel, -1, 'FTol selection (Leastsq)', (5, 6),
+                      (PANEL_WIDTH*0.9, PANEL_HEIGHT*0.7))
+        default_bt = wx.RadioButton(panel, -1, 'SansView Default (5e-05)', 
+                                    (15, 30), 
                                     style=wx.RB_GROUP)
+        default_bt.SetValue(True)
         default_bt.Bind(wx.EVT_RADIOBUTTON, self.OnFtolSelection)
-        default_bt.SetValue(True)
-        high_bt = wx.RadioButton(panel, -1, '1e-06', (15, 55))
+        sci_default_bt = wx.RadioButton(panel, -1, 
+                                    'Scipy Default (1.49012e-08)', (15, 55))
+        sci_default_bt.SetValue(False)
+        sci_default_bt.Bind(wx.EVT_RADIOBUTTON, self.OnFtolSelection)
+        high_bt = wx.RadioButton(panel, -1, '1e-06', (15, 80))
         high_bt.SetValue(False)
         high_bt.Bind(wx.EVT_RADIOBUTTON, self.OnFtolSelection)
-        mid_bt = wx.RadioButton(panel, -1, '1e-05', (15, 80))
+        mid_bt = wx.RadioButton(panel, -1, '1e-05', (15, 105))
         mid_bt.SetValue(False)
         mid_bt.Bind(wx.EVT_RADIOBUTTON, self.OnFtolSelection)
-        low_bt = wx.RadioButton(panel, -1, '1e-04', (15, 105))
+        low_bt = wx.RadioButton(panel, -1, '1e-04', (15, 130))
         low_bt.SetValue(False)
         low_bt.Bind(wx.EVT_RADIOBUTTON, self.OnFtolSelection)
-        self.custom_bt = wx.RadioButton(panel, -1, 'Custom', (15, 130))
+        self.custom_bt = wx.RadioButton(panel, -1, 'Custom', (15, 155))
         self.custom_bt.SetValue(False)
         self.custom_bt.Bind(wx.EVT_RADIOBUTTON, self.OnFtolSelection)
-        self.custombox = wx.TextCtrl(panel, -1, '', (95, 130))
+        self.custombox = wx.TextCtrl(panel, -1, '', (95, 155))
         self.custombox.Disable()
         hbox = wx.BoxSizer(wx.HORIZONTAL)
@@ -73 +79 @@
         # set sizer
         self.SetSizer(vbox)
- 
+
     def OnFtolSelection(self, event=None):
         """
@@ -83 +89 @@
         selection = button.GetLabel()
         # get float value 
-        if selection == 'Default':
+        if selection.count('SansView') > 0:
+            ftol = SANS_F_TOL   
+            self.custombox.Disable() 
+        elif selection.count('Scipy') > 0:
             ftol = F_TOL   
             self.custombox.Disable()     
@@ -111 +120 @@
         if flag:
             # set ftol in fitting
-            self.parent.parent._manager.set_ftol(self.ftol) 
-            msg = "The ftol (Scipy) is set to %s." % self.ftol
+            self.parent.set_ftol(self.ftol) 
+            msg = "The ftol (LeastSq) is set to %s." % self.ftol
         else:
            msg = "Error in the selection... No changes in ftol."
         # post event for info
-        wx.PostEvent( self.parent.parent._manager.parent, 
+        wx.PostEvent( self.parent.parent, 
                       StatusEvent(status= msg, info='warning'))