Changeset 71601312 in sasview for src/sas

Timestamp:

Feb 27, 2017 8:18:31 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.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

e64a03e

Parents:

7a5aedd

Message:

Put the category name change in the right place.

File:

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

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

@@ -370 +370 @@
         :return: None
         """
+        if self.categorycombobox == CUSTOM_MODEL_OLD:
+            self.categorycombobox = CUSTOM_MODEL
         if self.formfactorcombobox == '':
             FIRST_FORM = {
@@ -384 +386 @@
                 CUSTOM_MODEL : ''
             }
-            if self.categorycombobox == CUSTOM_MODEL_OLD:
-                self.categorycombobox = CUSTOM_MODEL
             if self.categorycombobox == '':
                 if len(self.parameters) == 3: