Changeset 99f3e053 in sasview for src/sas/sasgui/perspectives/fitting/basepage.py

Timestamp:

Nov 11, 2016 6:44:40 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

f845454

Parents:

3f8c7bb

Message:

Minor update to the original fix

File:

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

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

@@ -1435 +1435 @@
                     self.qmax_x = tempmax
                     is_modified = True
-                is_modified = self._validate_Npts()
+                if is_2Ddata:
+                    is_modified = self._validate_Npts()
+                else:
+                    is_modified = self._validate_Npts_1D()
             else:
                 self.fitrange = False
@@ -2166 +2169 @@
                 flag = False
             else:
-                self.Npts_fit.SetValue(str(len(index_data[index_data is True])))
+                val = index_data[index_data is True]
+                val = len(val) if isinstance(val, list) else 1
+                self.Npts_fit.SetValue(str(val))
                 self.fitrange = True