Changeset 8898558b in sasview for src/sas/sasgui/perspectives/fitting/basepage.py

Timestamp:

Nov 17, 2016 11:54:41 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:

db5294e

Parents:

377c19a2

Message:

#795: Added a check to see if model names are from sasmodels in SasView? v4+ or from v3.x.y. Conversion tool is skipped if from v4 or later.

File:

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

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

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