Changeset 0de74af in sasview for src/sas/sasgui/perspectives


Ignore:
Timestamp:
Dec 20, 2016 10:05:17 AM (7 years ago)
Author:
krzywon
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.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
9e0aa69a
Parents:
ca224b1
Message:

Added a constant for "[plug-in] " to maintain consistency across multiple classes, modified the documentation on a method to be clearer, and changed the exception handling for calcthread back to its original state.

Location:
src/sas/sasgui/perspectives/fitting
Files:
3 edited

Legend:

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

    r8aec639 r0de74af  
    11671167        self.categorybox.Select(category_pos) 
    11681168        self._show_combox(None) 
     1169        from models import PLUGIN_NAME_BASE 
    11691170        if self.categorybox.GetValue() == 'Customized Models' \ 
    1170                 and '[plug-in]' not in state.formfactorcombobox: 
     1171                and PLUGIN_NAME_BASE not in state.formfactorcombobox: 
    11711172            state.formfactorcombobox = \ 
    1172                 '[plug-in] ' + state.formfactorcombobox 
     1173                PLUGIN_NAME_BASE + state.formfactorcombobox 
    11731174        formfactor_pos = 0 
    11741175        for ind_form in range(self.formfactorbox.GetCount()): 
  • src/sas/sasgui/perspectives/fitting/models.py

    r313c5c9 r0de74af  
    2323PLUGIN_LOG = os.path.join(os.path.expanduser("~"), '.sasview', PLUGIN_DIR, 
    2424                          "plugins.log") 
     25PLUGIN_NAME_BASE = '[plug-in] ' 
    2526 
    2627def get_model_python_path(): 
     
    181182            try: 
    182183                model = load_custom_model(path) 
    183                 model.name = "[plug-in] "+model.name 
     184                model.name = PLUGIN_NAME_BASE + model.name 
    184185                plugins[model.name] = model 
    185186            except Exception: 
  • src/sas/sasgui/perspectives/fitting/pagestate.py

    rca224b1 r0de74af  
    359359    def _old_first_model(self): 
    360360        """ 
    361         A check to see if the loaded save state was saved in SasView v4_0+ 
     361        Handle save states from 4.0.1 and before where the first item in the 
     362        selection boxes of category, formfactor and structurefactor were not 
     363        saved. 
    362364        :return: None 
    363365        """ 
Note: See TracChangeset for help on using the changeset viewer.