Changes in / [1b068256:666454e] in sasview

Location:

src/sas/sasgui/perspectives

Files:

• calculator/resolution_calculator_panel.py (modified) (1 diff)
• fitting/basepage.py (modified) (3 diffs)

src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py

@@ -18 +18 @@
 matplotlib.use('WXAgg')
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
-from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as Toolbar
+from matplotlib.backends.backend_wxagg import NavigationToolbar2Wx as Toolbar
 from matplotlib.backend_bases import FigureManagerBase
 # Wx-Pylab magic for displaying plots within an application's window.

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

@@ -1470 +1470 @@
             # we need to check here ourselves.
             if not is_modified:
-                is_modified = self._check_value_enter(self.fittable_param)
-                is_modified = self._check_value_enter(
-                    self.fixed_param) or is_modified
-                is_modified = self._check_value_enter(
-                    self.parameters) or is_modified
+                is_modified = (self._check_value_enter(self.fittable_param)
+                               or self._check_value_enter(self.fixed_param)
+                               or self._check_value_enter(self.parameters))
 
             # Here we should check whether the boundaries have been modified.
@@ -1536 +1534 @@
                         data=[self.data])
             # Check the values
-            is_modified = self._check_value_enter(self.fittable_param)
-            is_modified = self._check_value_enter(self.fixed_param) or is_modified
-            is_modified = self._check_value_enter(self.parameters) or is_modified
+            is_modified = (self._check_value_enter(self.fittable_param)
+                           or self._check_value_enter(self.fixed_param)
+                           or self._check_value_enter(self.parameters))
 
             # If qmin and qmax have been modified, update qmin and qmax and
@@ -2324 +2322 @@
 
             # Update value in model if it has changed
-            if (value != self.model.getParam(name) or
-                    (np.isnan(value) and np.isnan(self.model.getParam(name)))):
+            if value != self.model.getParam(name):
                 self.model.setParam(name, value)
                 is_modified = True