Changeset 7a5aedd in sasview


Ignore:
Timestamp:
Feb 27, 2017 10:10:28 AM (8 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:
71601312
Parents:
4387385
Message:

Move 'Custom Models' to 'Plugin Models' to name conversion.

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

Legend:

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

    r4387385 r7a5aedd  
    5454 
    5555CUSTOM_MODEL = 'Plugin Models' 
    56 CUSTOM_MODEL_OLD = 'Customized Models' 
    5756 
    5857class BasicPage(ScrolledPanel, PanelBase): 
     
    11591158        # select the current model 
    11601159        state._convert_to_sasmodels() 
    1161         if state.categorycombobox == CUSTOM_MODEL_OLD: 
    1162             state.categorycombobox = CUSTOM_MODEL 
    11631160        state.categorycombobox = unicode(state.categorycombobox) 
    11641161        if state.categorycombobox in self.categorybox.Items: 
  • TabularUnified src/sas/sasgui/perspectives/fitting/pagestate.py

    r4387385 r7a5aedd  
    382382                'Sphere' : 'adsorbed_layer', 
    383383                'Structure Factor' : 'hardsphere', 
    384                 CUSTOM_MODEL_OLD : '', 
    385384                CUSTOM_MODEL : '' 
    386385            } 
     386            if self.categorycombobox == CUSTOM_MODEL_OLD: 
     387                self.categorycombobox = CUSTOM_MODEL 
    387388            if self.categorycombobox == '': 
    388389                if len(self.parameters) == 3: 
Note: See TracChangeset for help on using the changeset viewer.