Changeset 1153d0e in sasview

Timestamp:

Oct 6, 2011 9:56:24 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:

7d12951

Parents:

90ddcdb

Message:

removed incorrect dialog msg

Location:

fittingview/src/sans/perspectives/fitting

Files:

• fitpage.py (modified) (1 diff)
• simfitpage.py (modified) (1 diff)

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

@@ -1072 +1072 @@
             event.Skip()
         if len(self.parent._manager.fit_thread_list)>0 and\
-                    self.parent._manager._fit_engine != "park":
+                    self.parent._manager._fit_engine != "park" and\
+                    self._manager.sim_page.uid == self.uid: 
             msg = "The FitEnging will be set to 'ParkMC'\n"
             msg += " to fit with more than one data set..."

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

@@ -138 +138 @@
         ## making sure all parameters content a constraint
         ## validity of the constraint expression is own by fit engine
+        if self.parent._manager._fit_engine != "park" and\
+                    self._manager.sim_page.uid == self.uid: 
+            msg = "The FitEnging will be set to 'Park' fit engine\n"
+            msg += " for the simultaneous fit..."
+            #wx.MessageBox(msg, 'Info')
+            wx.PostEvent(self._manager.parent, StatusEvent(status=\
+                            "Fitting: %s"%msg, info="info"))
         if self.show_constraint.GetValue():
             if not self._set_constraint():