Changes in / [ddbac66:e64a03e] in sasview

Location:

src/sas/sasgui/perspectives/fitting

Files:

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

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

@@ -370 +370 @@
         :return: None
         """
+        if self.categorycombobox == CUSTOM_MODEL_OLD:
+            self.categorycombobox = CUSTOM_MODEL
         if self.formfactorcombobox == '':
             FIRST_FORM = {
@@ -382 +384 @@
                 'Sphere' : 'adsorbed_layer',
                 'Structure Factor' : 'hardsphere',
-                CUSTOM_MODEL_OLD : '',
                 CUSTOM_MODEL : ''
             }