Changeset 386ffe1 in sasview for src/sas/perspectives/fitting/simfitpage.py

Timestamp:

Feb 20, 2015 5:02:38 AM (9 years ago)

Author:

pkienzle

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:

cda1cf8

Parents:

018582f

Message:

remove scipy levenburg marquardt and park from ui

File:

• src/sas/perspectives/fitting/simfitpage.py (modified) (2 diffs)

src/sas/perspectives/fitting/simfitpage.py

@@ -153 +153 @@
         ## making sure all parameters content a constraint
         ## validity of the constraint expression is own by fit engine
-        if self.parent._manager._fit_engine not in ("park","bumps") and flag:
-            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 not self.batch_on and self.show_constraint.GetValue():
             if not self._set_constraint():
@@ -689 +683 @@
             text = " Fit in Parallel all Data set and model selected.\n"
         else:
-            text = "     Note: Park fitting engine will be used automatically. \n"
-            text += "     This page requires at least one FitPage with a data \n"
-            text += "       and a model set for fitting."
-            #text+= "automatically for more than 2 combinations checked"
+            text = " This page requires at least one FitPage with a data\n"
+            text = " and a model for fitting."
         text_hint = wx.StaticText(self, -1, text)