Changeset 49b7efa in sasview for sansview/perspectives/fitting/models.py

Timestamp:

Sep 11, 2008 3:13:32 PM (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:

388309d

Parents:

b30f001

Message:

working on model window display

File:

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

sansview/perspectives/fitting/models.py

@@ -5 +5 @@
 
 (ModelEvent, EVT_MODEL) = wx.lib.newevent.NewEvent()
+class ModelInfo(object):
+    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
@@ -52 +60 @@
     ## Dictionary of models
     model_list = {}
+    indep_model_list = {}
     model_list_box = {}
     custom_models={}
     plugins=[]
+    indep_model=[]
     ## Event owner
     event_owner = None
@@ -68 +78 @@
         self.model_list = {}
         self.model_list_box = {}
+        model_info="shape-based models"
         from sans.models.CylinderModel import CylinderModel
-        self.model_list[str(wx.NewId())] = CylinderModel 
+        self.model_list[str(wx.NewId())] = ModelInfo(CylinderModel , model_info)
       
         from sans.models.SphereModel import SphereModel
-        self.model_list[str(wx.NewId())] = SphereModel
+        self.model_list[str(wx.NewId())] =  ModelInfo(SphereModel , model_info)
    
         from sans.guitools.LineModel import LineModel
-        self.model_list[str(wx.NewId())]  = LineModel
-        self.plugins =findModels()
+        self.model_list[str(wx.NewId())]  = ModelInfo(LineModel , model_info)
+        model_info="shape-independent models"
+        from sans.models.Lorentzian import Lorentzian
+        self.indep_model.append( ModelInfo(Lorentzian , model_info) )
         
-        print "models: plugings",self.plugins
+        #Looking for plugins
+        self.plugins = findModels()
+       
         return 0
 
@@ -91 +106 @@
             @return: the next free event ID following the new menu events
         """
-        
         self._getModelList()
         self.event_owner = event_owner
+        
         shape_submenu= wx.Menu() 
         indep_submenu = wx.Menu()
         added_models = wx.Menu()
+        
         for id_str,value in self.model_list.iteritems():
             item = self.model_list[id_str]
-            
-            name = item.__name__
+            name = item.model.__name__
             if hasattr(item, "name"):
-                name = item.name
-                
-            self.model_list_box[name] =value
-
-               
+                name = item.model.name
+            self.model_list_box[name] =value.model
             shape_submenu.Append(int(id_str), name, name)
             wx.EVT_MENU(event_owner, int(id_str), self._on_model)
         modelmenu.AppendMenu(wx.NewId(), "Shapes...", shape_submenu, "List of shape-based models")
-        modelmenu.AppendMenu(wx.NewId(), "Shape-independent...", indep_submenu, "List of shape-independent models")
         
         id = wx.NewId()
+        if len(self.indep_model_list) == 0:
+            print "models: self.indep_model",self.indep_model
+            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()         
+        modelmenu.AppendMenu(wx.NewId(), "Shape-independent...", indep_submenu, "List of shape-independent models")
+        model_info="additional models"
+        id = wx.NewId()
         if len(self.custom_models) == 0:
-            print self.plugins
             for item in self.plugins:
-                if item not in self.custom_models.keys():
+                if item not in self.custom_models.values():
                     self.custom_models[str(id)] = item
-                    self.model_list[str(id)]=item
-                    added_models.Append(id, item.name, item.name)
+                    
+                    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()
-       
-           
         modelmenu.AppendMenu(wx.NewId(),"Added models...", added_models, "List of additional models")
-        
         
         
@@ -142 +172 @@
             #evt = ModelEvent(model=self.model_list[str(evt.GetId())]())
            
-            model = self.model_list[str(evt.GetId())]()
-            evt = ModelEvent(model=model)
+            model = self.model_list[str(evt.GetId())]
+            evt = ModelEvent(modelinfo=model)
             wx.PostEvent(self.event_owner, evt)