Changes in src/sas/sasgui/perspectives/fitting/basepage.py [cb4ef58:08959b8] in sasview

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (7 diffs)

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

@@ -1896 +1896 @@
                 for model in self.model_list_box[mod_cat]:
                     if 'sasmodels.sasview_model.' in str(model):
-                        str_m = model.id
+                        str_m = model._model_info['id']
                     else:
                         str_m = str(model).split(".")[0]
@@ -1945 +1945 @@
         mlist = []
         for models in list:
-            if models.name != "NoStructure":
-                mlist.append((models.name, models))
+            model = models()
+            name = model.__class__.__name__
+            if models.__name__ != "NoStructure":
+                name = model.name
+                mlist.append((name, models))
 
         # Sort the models
@@ -2096 +2099 @@
         if form_factor != None:
             # set multifactor for Mutifunctional models
-            if form_factor.is_multiplicity_model:
+            if form_factor().__class__ in \
+                                        self.model_list_box["Multi-Functions"]:
                 m_id = self.multifactorbox.GetCurrentSelection()
-                multiplicity = form_factor.multiplicity_info[0]
+                multiplicity = form_factor().multiplicity_info[0]
                 self.multifactorbox.Clear()
                 self._set_multfactor_combobox(multiplicity)
                 self._show_multfactor_combobox()
                 #ToDo:  this info should be called directly from the model
-                text = form_factor.multiplicity_info[1]  # 'No. of Shells: '
+                text = form_factor().multiplicity_info[1]  # 'No. of Shells: '
 
                 self.mutifactor_text.SetLabel(text)
@@ -2113 +2117 @@
                 if self.multi_factor == None:
                     self.multi_factor = 0
+                form_factor = form_factor(int(self.multi_factor))
                 self.multifactorbox.SetSelection(m_id)
                 # Check len of the text1 and max_multiplicity
@@ -2126 +2131 @@
                 else:
                     self.sld_axes = ""
+
             else:
                 self._hide_multfactor_combobox()
                 self.show_sld_button.Hide()
+                form_factor = form_factor()
                 self.multi_factor = None
         else:
@@ -2140 +2147 @@
         if  struct_factor != None:
             from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
-            self.model = MultiplicationModel(form_factor(self.multi_factor),
-                                             struct_factor())
+            self.model = MultiplicationModel(form_factor, struct_factor())
             # multifunctional form factor
             if len(form_factor.non_fittable) > 0:
                 self.temp_multi_functional = True
-        elif form_factor != None:
-            self.model = form_factor(self.multi_factor)
         else:
-            self.model = None
-            return
-
+            if form_factor != None:
+                self.model = form_factor
+            else:
+                self.model = None
+                return self.model
         # check if model has magnetic parameters
         if len(self.model.magnetic_params) > 0:
@@ -2280 +2286 @@
                 parameter's error of fit,
                 parameter's minimum value,
-                parameter's maximum value ,
+                parrameter's maximum value ,
                 parameter's units]
         """