Changeset 1b068256 in sasview for src/sas

Timestamp:

May 1, 2018 2:48:25 AM (7 years ago)

Author:

wojciech

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

0a5d1a8

Parents:

666454e (diff), 7d5e7da (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.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview into ticket-1084

Location:

src/sas

Files:

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

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 NavigationToolbar2Wx as Toolbar
+from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg 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)
-                               or self._check_value_enter(self.fixed_param)
-                               or self._check_value_enter(self.parameters))
+                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
 
             # Here we should check whether the boundaries have been modified.
@@ -1534 +1536 @@
                         data=[self.data])
             # Check the values
-            is_modified = (self._check_value_enter(self.fittable_param)
-                           or self._check_value_enter(self.fixed_param)
-                           or self._check_value_enter(self.parameters))
+            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
 
             # If qmin and qmax have been modified, update qmin and qmax and
@@ -2322 +2324 @@
 
             # Update value in model if it has changed
-            if value != self.model.getParam(name):
+            if (value != self.model.getParam(name) or
+                    (np.isnan(value) and np.isnan(self.model.getParam(name)))):
                 self.model.setParam(name, value)
                 is_modified = True

src/sas/sasview/sasview.py

@@ -200 +200 @@
     Prepare sasmodels for running within sasview.
     """
+    #Checking for the sasmodel compiler
+    if sys.platform == "darwin" and not os.path.exists("/Library/Developer/CommandLineTools/usr/bin/cc"):
+        raise RuntimeError("No compiler. Open Terminal.app and type 'cc' at the command prompt for more instructions.")
     # Set SAS_MODELPATH so sasmodels can find our custom models
     plugin_dir = os.path.join(sas.get_user_dir(), PLUGIN_MODEL_DIR)