Changeset cd10013 in sasview
- Timestamp:
- Apr 30, 2018 3:57:21 PM (7 years ago)
- Branches:
- master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload
- Children:
- 7d5e7da
- Parents:
- 1176137 (diff), c192960 (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:
- Paul Kienzle <pkienzle@…> (04/30/18 15:57:21)
- git-committer:
- GitHub <noreply@…> (04/30/18 15:57:21)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/fitting/basepage.py
r5818dae rc192960 1470 1470 # we need to check here ourselves. 1471 1471 if not is_modified: 1472 is_modified = (self._check_value_enter(self.fittable_param) 1473 or self._check_value_enter(self.fixed_param) 1474 or self._check_value_enter(self.parameters)) 1472 is_modified = self._check_value_enter(self.fittable_param) 1473 is_modified = self._check_value_enter( 1474 self.fixed_param) or is_modified 1475 is_modified = self._check_value_enter( 1476 self.parameters) or is_modified 1475 1477 1476 1478 # Here we should check whether the boundaries have been modified. … … 1534 1536 data=[self.data]) 1535 1537 # Check the values 1536 is_modified = (self._check_value_enter(self.fittable_param)1537 or self._check_value_enter(self.fixed_param)1538 or self._check_value_enter(self.parameters))1538 is_modified = self._check_value_enter(self.fittable_param) 1539 is_modified = self._check_value_enter(self.fixed_param) or is_modified 1540 is_modified = self._check_value_enter(self.parameters) or is_modified 1539 1541 1540 1542 # If qmin and qmax have been modified, update qmin and qmax and … … 2322 2324 2323 2325 # Update value in model if it has changed 2324 if value != self.model.getParam(name): 2326 if (value != self.model.getParam(name) or 2327 (np.isnan(value) and np.isnan(self.model.getParam(name)))): 2325 2328 self.model.setParam(name, value) 2326 2329 is_modified = True
Note: See TracChangeset
for help on using the changeset viewer.