Changeset 1c6bad0 in sasview for src/sas/sasgui/perspectives/fitting/basepage.py

Timestamp:

Dec 5, 2016 12:30:29 PM (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.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:

7ede832

Parents:

6fb6592

Message:

Added patch to handle formfactor and category names that aren't saved in v4.0.1 and earlier. Start on loading str_parameters, but not finished.

File:

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

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

@@ -1160 +1160 @@
             category_pos = int(state.categorycombobox)
         except:
-            if state.formfactorcombobox is not None \
-                    and not state._is_sasmodels():
+            if not state._is_sasmodels():
                 state._convert_to_sasmodels()
             state.categorycombobox = unicode(state.categorycombobox)