Changeset 09fdc89 in sasview

Timestamp:

Dec 19, 2016 1:52:35 PM (8 years ago)

Author:

GitHub <noreply@…>

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:

b61bd57, 06a4306

Parents:

50f1477 (diff), f845454 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jeff Krzywon <krzywon@…> (12/19/16 13:52:35)

git-committer:

GitHub <noreply@…> (12/19/16 13:52:35)

Message:

Merge pull request #18 from SasView?/ticket-753

Enforce callbacks for the Fitting group box. Fixes #753

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