Changes in / [50f1477:09fdc89] 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
@@ -1454 +1453 @@
                 # 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
@@ -1528 +1529 @@
                         index_data = ((self.qmin_x <= self.data.x) &
                                       (self.data.x <= self.qmax_x))
-                        val = str(len([index_data is True]))
-                        self.Npts_fit.SetValue(val)
+                        val = self.data.x[index_data is True]
+                        val = len(val) if isinstance(val, list) else 1
+                        self.Npts_fit.SetValue(str(val))
+
                     else:
                         # No data in the panel
@@ -2167 +2170 @@
                 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