Changeset d3b0c77 in sasview for src/sas/sascalc/fit/models.py

Timestamp:

Sep 23, 2017 4:24:27 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:

b963b20, fca1f50

Parents:

9706d88 (diff), dba8557 (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-887-reorg' into ticket-853-fit-gui-to-calc

File:

• src/sas/sascalc/fit/models.py (modified) (2 diffs)

src/sas/sascalc/fit/models.py

@@ -4 +4 @@
 from __future__ import print_function
 
-import traceback
 import os
 import sys
-import os.path
-# Time is needed by the log method
 import time
 import datetime
 import logging
+import traceback
 import py_compile
 import shutil
-#?? from copy import copy
 
 from sasmodels.sasview_model import load_custom_model, load_standard_models
-from sasmodels.sasview_model import MultiplicationModel
-#?? from sas.sasgui.perspectives.fitting.fitpage import CUSTOM_MODEL
+
+from sas.sasgui import get_user_dir
 
 # Explicitly import from the pluginmodel module so that py2exe
@@ -29 +26 @@
 
 PLUGIN_DIR = 'plugin_models'
-PLUGIN_LOG = os.path.join(os.path.expanduser("~"), '.sasview', PLUGIN_DIR,
-                          "plugins.log")
+PLUGIN_LOG = os.path.join(get_user_dir(), PLUGIN_DIR, "plugins.log")
 PLUGIN_NAME_BASE = '[plug-in] '