Changeset 88188b4 in sasview

Timestamp:

Apr 10, 2017 2:55:48 AM (8 years ago)

Author:

krzywon

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

82ce1d0

Parents:

ac0578c

git-author:

Jeff Krzywon <krzywon@…> (04/10/17 02:55:48)

git-committer:

krzywon <krzywon@…> (04/10/17 02:55:48)

Message:

Remove simultaneous fitting as an option.

File:

• src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) (2 diffs)

src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py

@@ -12 +12 @@
 auto_save, EVT_AUTO_SAVE = wx.lib.newevent.NewEvent()
 
-FIT_OPTIONS = ["No fitting", "Fitting"]
+FIT_OPTIONS = ["No fitting", "Fitting", "Batch Fitting"]
 CONVERT_DICT = {"SectorInteractor": "SectorQ",
                 "AnnulusInteractor": "AnnulusPhi",
@@ -466 +466 @@
             wx.PostEvent(datapanel, evt)
 
-            # TODO: Simultaneous/Constrained fitting
-            # # Create event to open simfitpage if selected
-            # if fit == FIT_OPTIONS[3]:
-            #     fit_pers = main_window._current_perspective
-            #     evt = wx.PyCommandEvent(wx.EVT_MENU.typeId,
-            #                         fit_pers.id_simfit)
-            #     wx.PostEvent(datapanel, evt)
-
     def on_auto_save_checked(self, evt=None):
         """