Changeset 8bd5840 in sasview

Timestamp:

Nov 3, 2016 1:49:00 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:

3d8c49a

Parents:

20cfa23

Message:

Incorporate name and parameter name conversions and fix bug involving on loading v3.x fits.

File:

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

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

@@ -1157 +1157 @@
             category_pos = int(state.categorycombobox)
         except:
+            import sasmodels.convert as convert
+            if state.formfactorcombobox is not None:
+                state.formfactorcombobox, state.parameters = \
+                    convert.convert_model(state.formfactorcombobox,
+                                          state.parameters)
             state.formfactorcombobox = state.formfactorcombobox.lower()
             state.formfactorcombobox = \
@@ -1528 +1533 @@
                         index_data = ((self.qmin_x <= self.data.x) &
                                       (self.data.x <= self.qmax_x))
-                        val = str(len(self.data.x[index_data is True]))
+                        val = str(len([index_data is True]))
                         self.Npts_fit.SetValue(val)
                     else: