Changeset bd5ac39 in sasview

Timestamp:

Apr 28, 2011 1:29:56 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:

5e8e615

Parents:

7c488ef5

Message:

added progress bar and passed the park NameError? that we can not handle

Files:

• park_integration/ParkFitting.py (modified) (2 diffs)
• sansview/perspectives/fitting/fitting.py (modified) (1 diff)

park_integration/ParkFitting.py

@@ -26 +26 @@
         Assembly.__init__(self, models)
         self.curr_thread = curr_thread
+        self.chisq = None
+        self._cancel = False
         
     def eval(self):
@@ -43 +45 @@
 
         # Evaluate the computed parameters
-        self._fitexpression()
+        try:
+            self._fitexpression()
+        except NameError:
+            pass
 
         # Check that the resulting parameters are in a feasible region.

sansview/perspectives/fitting/fitting.py

@@ -649 +649 @@
         self.fit_thread_list[current_page_id] = calc_fit
         calc_fit.queue()
+        msg = "Fitting is in progress..."
+        wx.PostEvent( self.parent, StatusEvent(status=msg, type="progress" ))
+        
         self.ready_fit(calc_fit=calc_fit)