Changeset 9e6aeaf in sasview for src/sas/sasview

Timestamp:

Sep 25, 2017 3:35:29 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3cb3a51

Parents:

9efdb29 (diff), 0315b63 (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 'ticket-853-fit-gui-to-calc' into py3

Location:

src/sas/sasview

Files:

• sasview.py (modified) (1 diff)
• test/convertible_files/SANS2D_100254_merged_ISIS2D.txt (moved) (moved from src/sas/sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt)
• test/convertible_files/YBCO_12685__ISIS2D.txt (moved) (moved from src/sas/sasview/test/2d_data/YBCO_12685__ISIS2D.txt)

src/sas/sasview/sasview.py

@@ -183 +183 @@
     # we are running may not actually need it; also, putting as little on the
     # path as we can
-    os.environ['MPLBACKEND'] = backend
+    if backend:
+        os.environ['MPLBACKEND'] = backend
 
     # TODO: ... so much for not importing matplotlib unless we need it...