Changes in src/sas/sasgui/perspectives/fitting/basepage.py [99f3e053:345e7e4] in sasview

File:

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

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

@@ -1435 +1435 @@
                     self.qmax_x = tempmax
                     is_modified = True
+
                 if is_2Ddata:
+                    # set mask
                     is_modified = self._validate_Npts()
-                else:
-                    is_modified = self._validate_Npts_1D()
+
             else:
                 self.fitrange = False
@@ -1453 +1454 @@
                 # Theory case: need to get npts value to draw
                 self.npts_x = float(self.Npts_total.GetValue())
-                self.Npts_fit.SetValue(str(self.Npts_total.GetValue()))
-                self._save_plotting_range()
                 self.create_default_data()
                 self.state_change = True
@@ -1529 +1528 @@
                         index_data = ((self.qmin_x <= self.data.x) &
                                       (self.data.x <= self.qmax_x))
-                        val = self.data.x[index_data is True]
-                        val = len(val) if isinstance(val, list) else 1
-                        self.Npts_fit.SetValue(str(val))
+                        val = str(len([index_data is True]))
+                        self.Npts_fit.SetValue(val)
                     else:
                         # No data in the panel
@@ -2169 +2167 @@
                 flag = False
             else:
-                val = index_data[index_data is True]
-                val = len(val) if isinstance(val, list) else 1
-                self.Npts_fit.SetValue(str(val))
+                self.Npts_fit.SetValue(str(len(index_data[index_data is True])))
                 self.fitrange = True