Changeset 00561739 in sasview for sansview/perspectives/fitting/models.py

Timestamp:

Sep 29, 2008 9:37:15 AM (16 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:

fa9674b

Parents:

4ab1c91

Message:

constraint fitting is not working yet

File:

• sansview/perspectives/fitting/models.py (modified) (3 diffs)

sansview/perspectives/fitting/models.py

@@ -5 +5 @@
 
 (ModelEvent, EVT_MODEL) = wx.lib.newevent.NewEvent()
+
 class ModelInfo(object):
+    """
+         this class contains description for a given model
+    """
     def __init__(self,model,description=None):
         self.model=model
         self.description=description
+        
     def set_description(self, descrition):
         self.description =str(description)
+        
     def get_description(self):
         return self.description
+    
+    
 def log(message):
     print message
@@ -179 +187 @@
         if len(self.indep_model_list) == 0:
             for item in self.indep_model:
-                if item not in self.indep_model_list.values():
-                    self.indep_model_list[str(id)] = item
-                    self.model_list[str(id)]=item
-                    if hasattr(item, "name"):
-                        name = item.model.name
-                    else:
-                        name = item.model.__name__
-                    indep_submenu.Append(id,name, name)
-                    self.model_list_box[name] =item.model
-                    wx.EVT_MENU(event_owner, int(id), self._on_model)
-                    id = wx.NewId()         
+                #if item not in self.indep_model_list.values():
+                    #self.indep_model_list[str(id)] = item
+                self.model_list[str(id)]=item
+                name = item.model.__name__
+                if hasattr(item, "name"):
+                    name = item.model.name
+                indep_submenu.Append(id,name, name)
+                self.model_list_box[name] =item.model
+                wx.EVT_MENU(event_owner, int(id), self._on_model)
+                id = wx.NewId()         
         modelmenu.AppendMenu(wx.NewId(), "Shape-independent...", indep_submenu, "List of shape-independent models")
         
@@ -198 +205 @@
         if len(self.custom_models) == 0:
             for item in self.plugins:
-                if item not in self.custom_models.values():
-                    self.custom_models[str(id)] = item
-                    
-                    self.model_list[str(id)]=ModelInfo(item,model_info)
-                    if hasattr(item, "name"):
-                        name = item.name
-                    else:
-                        name = item.__name__
-                    added_models.Append(id, name, name)
-                    self.model_list_box[name] =item
-                    wx.EVT_MENU(event_owner, int(id), self._on_model)
-                    id = wx.NewId()
+                #if item not in self.custom_models.values():
+                    #self.custom_models[str(id)] = item
+                self.model_list[str(id)]=ModelInfo(item,model_info)
+                name = item.__name__
+                if hasattr(item, "name"):
+                    name = item.name
+                added_models.Append(id, name, name)
+                self.model_list_box[name] =item
+                wx.EVT_MENU(event_owner, int(id), self._on_model)
+                id = wx.NewId()
         modelmenu.AppendMenu(wx.NewId(),"Added models...", added_models, "List of additional models")
         return 0