Changeset 284f6fe in sasview for fittingview/src/sans/perspectives/fitting

Timestamp:

Oct 4, 2011 12:49:12 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:

5cf1e5b

Parents:

e2160ab

Message:

support simul. fit with one data set

Location:

fittingview/src/sans/perspectives/fitting

Files:

• fitting.py (modified) (2 diffs)
• simfitpage.py (modified) (6 diffs)

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

@@ -712 +712 @@
         fitter_list = []        
         sim_fitter = None     
+        is_single_fit = True
         if self.sim_page is not None and self.sim_page.uid == uid:
-            #simulatanous fit only one engine need to be created    
+            #simulatanous fit only one engine need to be created 
+            ## if simultaneous fit change automatically the engine to park
+            self._on_change_engine(engine='park')   
             sim_fitter = Fit(self._fit_engine)  
             fitter_list.append(sim_fitter) 
+            is_single_fit = False
+
+        self.fitproblem_count = fitproblem_count  
+        if self._fit_engine == "park":
+            engineType = "Simultaneous Fit"
+        else:
+            engineType = "Single Fit"
         
         self.current_pg = None
@@ -784 +794 @@
         self._mac_sleep(0.2)
         ## perform single fit
-        if fitproblem_count == 1:
+        if is_single_fit:
             calc_fit = FitThread(handler = handler,
                                     fn=fitter_list,

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

@@ -205 +205 @@
         
         ## display constraint fields
-        if len(self.model_toFit)==2:
+        if len(self.model_toFit)==1:
             self._store_model()
             if self.show_constraint.GetValue() and\
@@ -211 +211 @@
                 self._show_all_constraint() 
                 self._show_constraint()
-        elif len(self.model_toFit)< 2:
+        elif len(self.model_toFit)< 1:
             ##constraint info
             self._hide_constraint()              
@@ -281 +281 @@
          Store selected model
         """
-        if len(self.model_toFit) < 2:
+        if len(self.model_toFit) < 1:
             return
         for item in self.model_toFit:
@@ -292 +292 @@
         Show fields to add constraint
         """
-        if len(self.model_toFit)< 2:
+        if len(self.model_toFit)< 1:
             msg= "Select at least 2 models to add constraint "
             wx.PostEvent(self.parent.parent, StatusEvent(status= msg ))
@@ -447 +447 @@
                 #self.SetScrollbars(20,20,25,65)
                 return
-        if len(self.model_toFit) < 2 :
-            msg= "Select at least 2 model to add constraint "
+        if len(self.model_toFit) < 1 :
+            msg= "Select at least 1 model to add constraint "
             wx.PostEvent(self.parent.parent, StatusEvent(status= msg ))
             self.sizer_constraints.Layout()
@@ -614 +614 @@
         self.btFit.SetToolTipString("Perform fit.")
         
-        text= "Hint: Park fitting engine will be selected \n"
-        text+= "automatically for more than 2 combinations checked"
+        text= "Hint: Park fitting engine will be selected automatically. \n"
+        #text+= "automatically for more than 2 combinations checked"
         text_hint = wx.StaticText(self,-1,text)