Changeset de995e5b in sasview for src/sas/sasgui/perspectives


Ignore:
Timestamp:
Jun 19, 2017 5:38:08 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:
6b7d3c2
Parents:
7df0ccd (diff), bc04647 (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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/fitting/models.py

    r8cec26b r7df0ccd  
    1414import py_compile 
    1515import shutil 
     16from sasmodels.sasview_model import load_custom_model, load_standard_models 
    1617# Explicitly import from the pluginmodel module so that py2exe 
    1718# places it in the distribution. The Model1DPlugin class is used 
    1819# as the base class of plug-in models. 
     20from sas.sasgui import get_user_dir 
    1921from sas.sascalc.fit.pluginmodel import Model1DPlugin 
    2022from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller 
    21 from sasmodels.sasview_model import load_custom_model, load_standard_models 
    2223 
    2324logger = logging.getLogger(__name__) 
     
    2526 
    2627PLUGIN_DIR = 'plugin_models' 
    27 PLUGIN_LOG = os.path.join(os.path.expanduser("~"), '.sasview', PLUGIN_DIR, 
    28                           "plugins.log") 
     28PLUGIN_LOG = os.path.join(get_user_dir(), PLUGIN_DIR, "plugins.log") 
    2929PLUGIN_NAME_BASE = '[plug-in] ' 
    3030 
     
    297297        for name, plug in self.stored_plugins.iteritems(): 
    298298            self.model_dictionary[name] = plug 
    299          
     299 
    300300        self._get_multifunc_models() 
    301301 
Note: See TracChangeset for help on using the changeset viewer.