Changeset 82ce1d0 in sasview for src/sas/sasgui

Timestamp:

Apr 10, 2017 3:02:12 AM (7 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:

3f75203

Parents:

88188b4

git-author:

Jeff Krzywon <krzywon@…> (04/10/17 03:02:12)

git-committer:

krzywon <krzywon@…> (04/10/17 03:02:12)

Message:

Sending to fitting and batch fitting is now working as expected. see #467

File:

• src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) (1 diff)

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

@@ -447 +447 @@
                                                      check_value=True)
             # TODO: Batch fitting
-            # # Switch to batch mode if selected
-            # if fit == FIT_OPTIONS[2]:
-            #     datapanel.rb_single_mode.SetValue(False)
-            #     datapanel.rb_batch_mode.SetValue(True)
-            #     evt = wx.PyCommandEvent(wx.EVT_RADIOBUTTON.typeId,
-            #                             datapanel.rb_batch_mode.GetId())
-            #     wx.PostEvent(datapanel, evt)
-            # else:
-            #     datapanel.rb_single_mode.SetValue(True)
-            #     datapanel.rb_batch_mode.SetValue(False)
-            #     evt = wx.PyCommandEvent(wx.EVT_RADIOBUTTON.typeId,
-            #                             datapanel.rb_single_mode.GetId())
-            #     wx.PostEvent(datapanel, evt)
+            # Switch to batch mode if selected
+            if fit == FIT_OPTIONS[2]:
+                datapanel.rb_single_mode.SetValue(False)
+                datapanel.rb_batch_mode.SetValue(True)
+                datapanel.on_batch_mode(None)
+            else:
+                datapanel.rb_single_mode.SetValue(True)
+                datapanel.rb_batch_mode.SetValue(False)
+                datapanel.on_single_mode(None)
 
             # Post button click event to send data to fitting