Changeset 706bb4e in sasview for src/sas/sasview/sasview.py

Timestamp:

Sep 18, 2017 8:20:29 AM (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:

60a7820

Parents:

460d3a1 (diff), cfd27dd (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' into ticket-887-reorg

File:

• src/sas/sasview/sasview.py (modified) (1 diff)

src/sas/sasview/sasview.py

@@ -23 +23 @@
 PLUGIN_MODEL_DIR = 'plugin_models'
 APP_NAME = 'SasView'
+
+# Set SAS_MODELPATH so sasmodels can find our custom models
+os.environ['SAS_MODELPATH'] = os.path.join(sasdir, PLUGIN_MODEL_DIR)
+
+from matplotlib import backend_bases
+backend_bases.FigureCanvasBase.filetypes.pop('pgf', None)
 
 class SasView():