Changeset e87f9fc in sasview for theoryview/perspectives/theory

Timestamp:

Sep 17, 2010 3:13:37 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

5d57267

Parents:

e096270

Message:

added a new model

Location:

theoryview/perspectives/theory

Files:

• basepage.py (modified) (1 diff)
• models.py (modified) (4 diffs)

theoryview/perspectives/theory/basepage.py

@@ -1467 +1467 @@
         if form_factor != None:    
             # set multifactor for Mutifunctional models    
-            if form_factor().name == 'CoreMultiShellModel':
+            if form_factor().__class__ in self.model_list_box["Multi-Functions"]:
                 self._show_multfactor_combobox()
                 m_id = self.multifactorbox.GetCurrentSelection()

theoryview/perspectives/theory/models.py

@@ -165 +165 @@
     ##list of model allowing multiplication
     multiplication_factor=[]
+    ##list of multifunctional shapes
+    multi_func_list =[]
     ## list of added models
     plugins=[]
@@ -182 +184 @@
         self.shape_list.append(SphereModel)
         self.multiplication_factor.append(SphereModel)
+        
+        from sans.models.SphereExpShellModel import SphereExpShellModel
+        self.shape_list.append(SphereExpShellModel)
+        self.multiplication_factor.append(SphereExpShellModel)
+        self.multi_func_list.append(SphereExpShellModel)
         
         from sans.models.FuzzySphereModel import FuzzySphereModel
@@ -194 +201 @@
         self.shape_list.append(CoreMultiShellModel)
         self.multiplication_factor.append(CoreMultiShellModel)
+        self.multi_func_list.append(CoreMultiShellModel)
 
         from sans.models.VesicleModel import VesicleModel
@@ -337 +345 @@
         self.model_combobox.set_list("P(Q)*S(Q)", self.multiplication_factor)
         self.model_combobox.set_list("multiplication", self.multiplication_factor)
+        self.model_combobox.set_list("Multi-Functions", self.multi_func_list)
         return self.model_combobox