Changeset ecfcef6 in sasview for sansview/perspectives/fitting/fitpage.py

Timestamp:

Apr 27, 2011 1:07:22 PM (14 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:

6c62407

Parents:

56d5562

Message:

set check on fit params as a default

File:

• sansview/perspectives/fitting/fitpage.py (modified) (5 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -938 +938 @@
         """
         if self.data is None:
-            msg = "Please select a Data first..."
+            msg = "Please get Data first..."
             wx.MessageBox(msg, 'Info')
             wx.PostEvent(self._manager.parent, StatusEvent(status=\
@@ -949 +949 @@
                             "Fit: %s"%msg, type="stop"))
             return
-
+        
+        if len(self.param_toFit) <= 0:
+            msg= "Select at least one parameter to fit"
+            wx.MessageBox(msg, 'Info')
+            wx.PostEvent(self._manager.parent, StatusEvent(status= msg, 
+                                                         type="stop" ))
+            return 
+        
         flag = self._update_paramv_on_fit() 
                 
@@ -957 +964 @@
                                                          type="stop"))
             return 
-        
-        if len(self.param_toFit) <= 0:
-            msg= "Select at least one parameter to fit"
-            wx.PostEvent(self.parent.parent, StatusEvent(status= msg, 
-                                                         type="stop" ))
-            return 
-      
+              
         self.select_param(event =None)
         
@@ -1021 +1022 @@
         self._on_select_model_helper() 
         self.set_model_param_sizer(self.model)                   
-        
         if self.model is None:
             self._set_bookmark_flag(False)
@@ -2524 +2524 @@
         wx.EVT_CHECKBOX(self, self.cb1.GetId(), self.select_all_param)
         self.cb1.SetToolTipString("To check/uncheck all the boxes below.")
-        #self.cb1.SetValue(True)
+        self.cb1.SetValue(True)
         
         sizer.Add(self.cb1,(iy, ix),(1,1),\