Changeset 996fd35 in sasview

Timestamp:

Mar 11, 2009 5:03:15 PM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

6df36b3

Parents:

c9636f7

Message:

name change from 2 model

Location:

sansmodels/src/sans/models

Files:

• MultiplicationModel.py (modified) (1 diff)
• pluginmodel.py (modified) (1 diff)

sansmodels/src/sans/models/MultiplicationModel.py

@@ -12 +12 @@
         BaseComponent.__init__(self)
 
+       
+        ## Name of the model
+        self.name=""
+        ## model description
+        self.description=""
+        if  model1.name != "NoStructure"and  model2.name != "NoStructure":
+             self.name = model1.name +" * "+ model2.name
+             self.description= self.name+"\n"
+             self.description +="see %s description and %s description"%( model1.name,
+                                                                         model2.name )
+        elif  model2.name != "NoStructure":
+            self.name = model2.name
+            self.description= model2.description
+        else :
+            self.name = model1.name
+            self.description= model1.description
+  
         
-        ## Name of the model
-        self.name = model1.name +" * "+ model2.name
-        ## model description
-        self.description= model1.name +" * "+ model2.name
-        self.description +="see %s description and %s description"%(model1.name,
-                                                                     model2.name)
+        
         self.model1= model1
         self.model2= model2

sansmodels/src/sans/models/pluginmodel.py

@@ -4 +4 @@
 class Model1DPlugin(BaseComponent):
     ## Name of the model
-    name = "Plugin Model"
-
-    def __init__(self):
+   
+    def __init__(self , name="Plugin Model" ):
         """ Initialization """
         BaseComponent.__init__(self)
+        self.name = name
         self.details = {}
         self.params  = {}