Changeset b2d9826 in sasview for sansview/perspectives/fitting

Timestamp:

Mar 11, 2011 12:14:57 PM (14 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:

a3149c5

Parents:

aae7a8d

Message:

update plugin

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• fitpage.py (modified) (1 diff)
• fitpanel.py (modified) (2 diffs)
• fitting.py (modified) (3 diffs)
• models.py (modified) (6 diffs)

sansview/perspectives/fitting/basepage.py

@@ -1712 +1712 @@
         Fill panel's combo box according to the type of model selected
         """
+        self.model_list_box = self.parent.update_model_list()
         if self.shape_rbutton.GetValue():
             ##fill the combobox with form factor list
@@ -1762 +1763 @@
             item must model class
         """
-        st = time.time()
         for models in list:
             model= models()

sansview/perspectives/fitting/fitpage.py

@@ -1053 +1053 @@
             event = PageInfoEvent(page = self)
             wx.PostEvent(self.parent, event) 
+        #
       
       

sansview/perspectives/fitting/fitpanel.py

@@ -42 +42 @@
         #dictionary of miodel {model class name, model class}
         self.menu_mng = models.ModelManager()
-        self.model_list_box = self.menu_mng.get_model_list().get_list()
+        self.model_list_box = self.menu_mng.get_model_list()
         #pageClosedEvent = fnb.EVT_FLATNOTEBOOK_PAGE_CLOSING 
         self.Bind(fnb.EVT_FLATNOTEBOOK_PAGE_CLOSING , self.on_close_page)
@@ -60 +60 @@
         self.add_default_pages()
     
+    def update_model_list(self):
+        """
+        """
+        self.model_list_box = self.menu_mng.update()
+        return self.model_list_box
+        
+        
     def get_page_by_id(self, id):  
         """

sansview/perspectives/fitting/fitting.py

@@ -256 +256 @@
         return True
     
-    def set_data(self, data_list):
+    def set_data(self, data_list=None, theory_list=None):
         """
         receive a list of data to fit
         """
+        if data_list is None:
+            data_list = []
         selected_data_list = []
         if len(data_list) > MAX_NBR_DATA :
@@ -1163 +1165 @@
             if data is None:
                 theory_data = self.page_finder[id].get_theory_data()
-                self.parent.add_data_helper(data_list=[theory_data])
+                self.parent.add_data_helper({theory_data.id:theory_data})
                 data_id = theory_data.id
             else:
@@ -1249 +1251 @@
         if data is None:
             theory_data = self.page_finder[id].get_theory_data()
-            self.parent.add_data_helper(data_list=[theory_data])
+            self.parent.add_data_helper({theory_data.id:theory_data})
             data_id = theory_data.id
         else:

sansview/perspectives/fitting/models.py

@@ -78 +78 @@
     """
     # List of plugin objects
-    plugins = []
+    plugins = {}
     # Go through files in plug-in directory
     try:
@@ -95 +95 @@
                         try:
                             if _check_plugin(module.Model, name)!=None:
-                                plugins.append(module.Model)
+                                plugins[name] = module.Model
                         except:
                             msg="Error accessing Model"
@@ -150 +150 @@
     struct_factor_dict = {}
     ##list of form factors
-    shape_list =[]
+    shape_list = []
     ## independent shape model list
     shape_indep_list = []
     ##list of structure factors 
-    struct_list= []
+    struct_list = []
     ##list of model allowing multiplication
-    multiplication_factor=[]
+    multiplication_factor = []
     ##list of multifunctional shapes
-    multi_func_list =[]
+    multi_func_list = []
     ## list of added models
-    plugins=[]
+    plugins = []
     ## Event owner (guiframe)
     event_owner = None
@@ -166 +166 @@
         """
         """
+        self.stored_plugins = {}
         self._getModelList()
         
@@ -388 +389 @@
     
         #Looking for plugins
-        self.plugins = findModels()
-        self._get_multifunc_models()
+        self.stored_plugins = findModels()
+        self.plugins = self.stored_plugins.values()
         self.plugins.append(ReflectivityModel)
         self.plugins.append(ReflectivityIIModel)
+        self._get_multifunc_models()
+       
         return 0
 
     
+    def update(self):
+        """
+        """
+        new_plugins = findModels()
+        for name, plug in  new_plugins.iteritems():
+            if name not in self.stored_plugins.keys():
+                self.stored_plugins[name] = plug
+                self.plugins.append(plug)
+        self.model_combobox.set_list("Customized Models", self.plugins)
+        return self.model_combobox.get_list()
+        
     def populate_menu(self, modelmenu, event_owner):
         """
@@ -563 +577 @@
         self.model_combobox.set_list("multiplication", self.multiplication_factor)
         self.model_combobox.set_list("Multi-Functions", self.multi_func_list)
-        return self.model_combobox
+        return self.model_combobox.get_list()