Changeset 8b481a51 in sasview

Timestamp:

Apr 28, 2011 10:22:57 AM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

ea4dfe0

Parents:

0c975ab

Message:

add complete function for simul fit

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/console.py

@@ -54 +54 @@
             self.improvement_time = t
             
-            #wx.PostEvent(self.parent, StatusEvent(status=\
-            # "%d%% complete ..."%(p),type="progress"))
+            wx.PostEvent(self.parent, StatusEvent(status=\
+             "%d%% complete ..."%(p),type="progress"))
        
         # Update percent complete
@@ -65 +65 @@
                 self.progress_percent = p
                 self.progress_time = t
-                #wx.PostEvent(self.parent, StatusEvent(status=\
-                #                                      "%d%% complete ..."%(p),
-                #                                      type="progress"))
+                wx.PostEvent(self.parent, StatusEvent(status=\
+                                                      "%d%% complete ..."%(p),
+                                                      type="progress"))
        
             elif 2 < dp <= 5:
                 if p//5 != self.progress_percent//5:
-                    #wx.PostEvent(self.parent, StatusEvent(status=\
-                    #   "%d%% complete ..."%(5*(p//5)),type="progress"))
+                    wx.PostEvent(self.parent, StatusEvent(status=\
+                        "%d%% complete ..."%(5*(p//5)),type="progress"))
                     self.progress_percent = p
                     self.progress_time = t
@@ -79 +79 @@
                     self.progress_percent = p
                     self.progress_time = t
-                    #wx.PostEvent(self.parent, StatusEvent(status=\
-                   #"%d%% complete ..."%(10*(p//10)),type="progress"))
+                    wx.PostEvent(self.parent, StatusEvent(status=\
+                   "%d%% complete ..."%(10*(p//10)),type="progress"))
         
     def improvement(self):
@@ -95 +95 @@
         if self.isbetter:
             self.result.print_summary()
-        #message = "fit Error"
-        #message = str(msg)+ " \n %s"%self.result.__str__()
-        #wx.PostEvent(self.parent, StatusEvent(status=message,
-        #                                      info="error", type="stop"))
+        message = "fit Error"
+        message = str(msg)+ " \n %s"%self.result.__str__()
+        wx.PostEvent(self.parent, StatusEvent(status=message,
+                                   info="error", type="stop"))
             
     def finalize(self):
@@ -125 +125 @@
         """
         """
-        #wx.PostEvent(self.parent, StatusEvent(status="Starting the Fit...",
-        #                                info="info",type="progress"))
+        wx.PostEvent(self.parent, StatusEvent(status="Starting the Fit...",
+                                        info="info",type="progress"))
         
     def set_result(self, result):

sansview/perspectives/fitting/fitting.py

@@ -645 +645 @@
                                     page_id=list_page_id,
                                     updatefn=handler.update_fit,
+                                    completefn=self._simul_fit_completed,
                                     ftol=self.ftol)
         self.fit_thread_list[current_page_id] = calc_fit