-                      r6f82ba1
+                      r2f4b430
 from sas.models.BaseComponent import BaseComponent
 from sas.guiframe.CategoryInstaller import CategoryInstaller
 PLUGIN_DIR = 'plugin_models'
 …
     """
     Do some checking before model adding plugins in the list
     :param model: class model to add into the plugin list
     :param name:name of the module plugin
     :return model: model if valid model or None if not valid
     """
     #Check if the plugin is of type Model1DPlugin
 …
         log(msg)
         return None
     if hasattr(new_instance, "function"):
         try:
 …
         return None
     return model
 def find_plugins_dir():
     """
 …
     """
     dir = os.path.join(os.path.expanduser("~"), '.sasview', PLUGIN_DIR)
     # If the plugin directory doesn't exist, create it
     if not os.path.isdir(dir):
         os.makedirs(dir)
     # Find paths needed
     try:
 …
             raise type, value, traceback
         return 1
 report_problem = ReportProblem()
 …
             if toks[1] == '.py' and not toks[0] == '__init__':
                 name = toks[0]
                 path = [os.path.abspath(dir)]
                 file = None
 …
                     log(msg)
                 finally:
                     if not file == None:
                         file.close()
 …
         """
         self.mydict = {}
     def set_list(self, name, mylist):
         """
         :param name: the type of the list
         :param mylist: the list to add
         """
         if name not in self.mydict.keys():
             self.reset_list(name, mylist)
     def reset_list(self, name, mylist):
         """
 …
         """
         self.mydict[name] = mylist
     def get_list(self):
         """
 …
         """
         return self.mydict
 class ModelManagerBase:
     """
 …
     event_owner = None
     last_time_dir_modified = 0
     def __init__(self):
         """
 …
         self.stored_plugins = {}
         self._getModelList()
     def findModels(self):
         """
 …
         logging.info("pluging model : %s\n" % str(temp))
         return temp
     def _getModelList(self):
         """
         List of models we want to make available by default
         for this application
         :return: the next free event ID following the new menu events
         """
 …
             #        self.shape_indep_list.append(BEPolyelectrolyte)
             self.model_name_list.append(BEPolyelectrolyte.__name__)
             self.form_factor_dict[str(wx.NewId())] =  [SphereModel]
+            self.form_factor_dict[str(wx.NewId())] = [SphereModel]
         except:
             pass
 …
         #self.shape_indep_list.append(FractalO_Z)
         #self.model_name_list.append(FractalO_Z.__name__)
         #Looking for plugins
         self.stored_plugins = self.findModels()
 …
         for name, plug in self.stored_plugins.iteritems():
             self.model_dictionary[name] = plug
         self._get_multifunc_models()
         return 0
 …
                 is_modified = True
                 self.last_time_dir_modified = temp
         return is_modified
     def update(self):
         """
 …
         else:
             return {}
     def pulgins_reset(self):
         """
 …
         self.model_combobox.reset_list("Customized Models", self.plugins)
         return self.model_combobox.get_list()
 ##   I believe the next four methods are for the old form factor GUI
 ##   where the dropdown showed a list of categories which then rolled out
 …
         ## guiframe reference
 #        self.event_owner = event_owner
 #        shape_submenu = wx.Menu()
 #        shape_indep_submenu = wx.Menu()
 …
 #                                         " simple shape"],
 #                         list1=self.shape_list)
 #        self._fill_simple_menu(menuinfo=["Shape-Independent",
 #                                         shape_indep_submenu,
 #                                         "List of shape-independent models"],
 #                         list1=self.shape_indep_list)
 #        self._fill_simple_menu(menuinfo=["Structure Factors",
 #                                         structure_factor,
 #                                         "List of Structure factors models"],
 #                                list1=self.struct_list)
 #        self._fill_plugin_menu(menuinfo=["Customized Models", added_models,
 #                                            "List of additional models"],
 #                                 list1=self.plugins)
 #        self._fill_menu(menuinfo=["P(Q)*S(Q)", multip_models,
 #                                  "mulplication of 2 models"],
 …
 #                                   list2=self.struct_list)
 #        return 0
 #    def _fill_plugin_menu(self, menuinfo, list1):
 #        """
 …
 #            menuinfo[1].Append(int(id), "Empty", msg)
 #        self._fill_simple_menu(menuinfo, list1)
 #   def _fill_simple_menu(self, menuinfo, list1):
 #       """
 …
 #       if len(list1) > 0:
 #           self.model_combobox.set_list(menuinfo[0], list1)
 #            for item in list1:
 #                try:
 …
 #        id = wx.NewId()
 #        self.modelmenu.AppendMenu(id, menuinfo[0], menuinfo[1], menuinfo[2])
     def _on_model(self, evt):
         """
         React to a model menu event
         :param event: wx menu event
         """
         if int(evt.GetId()) in self.form_factor_dict.keys():
 …
         else:
             model = self.struct_factor_dict[str(evt.GetId())]()
         #TODO: investigate why the following two lines were left in the code
         #      even though the ModelEvent class doesn't exist
         #evt = ModelEvent(model=model)
         #wx.PostEvent(self.event_owner, evt)
     def _get_multifunc_models(self):
         """
 …
                 # pass to other items
                 pass
     def get_model_list(self):
         """
         return dictionary of models for fitpanel use
         """
         ## Model_list now only contains attribute lists not category list.
 …
         ##
         ## -PDB   April 26, 2014
 #        self.model_combobox.set_list("Shapes", self.shape_list)
 #        self.model_combobox.set_list("Shape-Independent",
 …
         self.model_combobox.set_list("Multi-Functions", self.multi_func_list)
         return self.model_combobox.get_list()
     def get_model_name_list(self):
         """
 …
         """
         return self.model_dictionary
 class ModelManager(object):
     """
 …
     def findModels(self):
         return self.__modelmanager.findModels()
     def _getModelList(self):
         return self.__modelmanager._getModelList()
     def is_changed(self):
         return self.__modelmanager.is_changed()
     def update(self):
         return self.__modelmanager.update()
     def pulgins_reset(self):
         return self.__modelmanager.pulgins_reset()
     def populate_menu(self, modelmenu, event_owner):
         return self.__modelmanager.populate_menu(modelmenu, event_owner)
     def _on_model(self, evt):
         return self.__modelmanager._on_model(evt)
     def _get_multifunc_models(self):
         return self.__modelmanager._get_multifunc_models()
     def get_model_list(self):
         return self.__modelmanager.get_model_list()
     def get_model_name_list(self):
         return self.__modelmanager.get_model_name_list()

Note: See TracChangeset for help on using the changeset viewer.

SasView

Changeset 2f4b430 in sasview for src/sas/perspectives/fitting/models.py

Legend:

src/sas/perspectives/fitting/models.py

Download in other formats: