Changeset 7a5aedd in sasview for src/sas

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:

• basepage.py (modified) (2 diffs)
• pagestate.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -54 +54 @@
 
 CUSTOM_MODEL = 'Plugin Models'
-CUSTOM_MODEL_OLD = 'Customized Models'
 
 class BasicPage(ScrolledPanel, PanelBase):
@@ -1159 +1158 @@
         # select the current model
         state._convert_to_sasmodels()
-        if state.categorycombobox == CUSTOM_MODEL_OLD:
-            state.categorycombobox = CUSTOM_MODEL
         state.categorycombobox = unicode(state.categorycombobox)
         if state.categorycombobox in self.categorybox.Items:

src/sas/sasgui/perspectives/fitting/pagestate.py

@@ -382 +382 @@
                 'Sphere' : 'adsorbed_layer',
                 'Structure Factor' : 'hardsphere',
-                CUSTOM_MODEL_OLD : '',
                 CUSTOM_MODEL : ''
             }
+            if self.categorycombobox == CUSTOM_MODEL_OLD:
+                self.categorycombobox = CUSTOM_MODEL
             if self.categorycombobox == '':
                 if len(self.parameters) == 3: