Changeset 66acafe in sasview for src/sas/sasgui/perspectives/fitting/fitting.py

Timestamp:

Sep 19, 2017 9:28:58 AM (7 years ago)

Author:

GitHub <noreply@…>

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

Children:

b22e23e

Parents:

8c945ec (diff), 632fda9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Butler <butlerpd@…> (09/19/17 09:28:58)

git-committer:

GitHub <noreply@…> (09/19/17 09:28:58)

Message:

Merge pull request #104 from lewisodriscoll/ticket-861

Ticket 861

File:

• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -357 +357 @@
                             else:
                                 page.formfactorbox.SetLabel(current_val)
+                        if hasattr(page, 'structurebox'):
+                            selected_name = page.structurebox.GetStringSelection()
+
+                            page.structurebox.Clear()
+                            page.initialize_combox()
+
+                            index = page.structurebox.FindString(selected_name)
+                            if index == -1:
+                                index = 0
+                            page.structurebox.SetSelection(index)
+                            page._on_select_model()
         except:
             logger.error("update_custom_combo: %s", sys.exc_value)