Changeset a06ee7e in sasview for src/sas/sasgui/perspectives/calculator/pyconsole.py

Timestamp:

Aug 17, 2017 9:42:30 AM (7 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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fca1f50, 0b6f83c, 7b15990, f001bc9

Parents:

fcfaf52 (diff), 07ec714 (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@…> (08/17/17 09:42:30)

git-committer:

GitHub <noreply@…> (08/17/17 09:42:30)

Message:

Merge pull request #96 from lewisodriscoll/ticket-864

Bug Fixes and Improvements

File:

• src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) (2 diffs)

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

@@ -37 +37 @@
     Iqxy = model.evalDistribution([qx, qy])
 
-    result = """
-    Iq(%s) = %s
-    Iqxy(%s, %s) = %s
-    """%(q, Iq, qx, qy, Iqxy)
+    # check the model's unit tests run
+    from sasmodels.model_test import run_one
+    result = run_one(path)
 
     return result
@@ -89 +88 @@
         ok = wx.Button(self, wx.ID_OK, "OK")
 
-        # Mysterious constraint layouts from 
+        # Mysterious constraint layouts from
         # https://www.wxpython.org/docs/api/wx.lib.layoutf.Layoutf-class.html
         lc = layoutf.Layoutf('t=t5#1;b=t5#2;l=l5#1;r=r5#1', (self,ok))