Changeset 31469d50 in sasview

Timestamp:

Oct 5, 2011 11:00:46 AM (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:

0f17dd9

Parents:

706667b

Message:

update fitpage param on Fit in simul page

Location:

fittingview/src/sans/perspectives/fitting

Files:

• fitting.py (modified) (5 diffs)
• simfitpage.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -697 +697 @@
         :param uid: id related to the panel currently calling this fit function.
         """
+        flag = True
         ##  count the number of fitproblem schedule to fit 
         fitproblem_count = 0
@@ -702 +703 @@
             if value.get_scheduled() == 1:
                 fitproblem_count += 1
-        ## if simultaneous fit change automatically the engine to park
-        if fitproblem_count > 1:
-            self._on_change_engine(engine='park')
+                
         self.fitproblem_count = fitproblem_count  
         if self._fit_engine == "park":
@@ -749 +748 @@
                                      is2d = page._is_2D())
                     templist = page.get_param_list()
+                    flag = page._update_paramv_on_fit() 
+                    if not flag:
+                        msg = "Fitting range or parameter values are"
+                        msg += " invalid in %s"% \
+                                    page.window_caption
+                        wx.PostEvent(page.parent.parent, 
+                                     StatusEvent(status= msg, info="error",
+                                     type="stop"))
+                        return flag
                     for element in templist:
                         name = str(element[1])
@@ -777 +785 @@
                     value.clear_model_param()
             except:
-                raise
+                flag = False
                 msg= "%s error: %s" % (engineType, sys.exc_value)
                 wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",
                                                       type="stop"))
-                return 
+                return flag
         ## If a thread is already started, stop it
         #if self.calc_fit!= None and self.calc_fit.isrunning():
@@ -820 +828 @@
         
         self.ready_fit(calc_fit=calc_fit)
-        
+        return flag
+    
     def ready_fit(self, calc_fit):
         """

fittingview/src/sans/perspectives/fitting/simfitpage.py

@@ -148 +148 @@
                     self.manager.schedule_for_fit(value=1, uid=item[2]) 
             try:
-                self.manager.onFit(uid=self.uid)
+                if not self.manager.onFit(uid=self.uid):
+                    return
             except:
                 msg= "Select at least one parameter to fit in the FitPages."
                 wx.PostEvent(self.parent.parent, StatusEvent(status=msg))
         else:
-            msg= "Select at least one model to fit "
+            msg= "Select at least one model check box to fit "
             wx.PostEvent(self.parent.parent, StatusEvent(status=msg))