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

Timestamp:

Sep 17, 2009 8:21:56 AM (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:

104f3da

Parents:

c5cd3b9

Message:

add check for plugin model

File:

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

sansview/perspectives/fitting/models.py

@@ -11 +11 @@
 import os,sys,math
 import os.path
-
+from sans.models.pluginmodel import Model1DPlugin
 (ModelEvent, EVT_MODEL) = wx.lib.newevent.NewEvent()
 from sans.guicomm.events import StatusEvent  
@@ -33 +33 @@
     return []
     
+def _check_plugin(model, name):
+    """
+        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 nothing if not valid
+    """
+    #Check is the plugin is of type Model1DPlugin
+    if not issubclass(model, Model1DPlugin):
+        msg= "Plugin %s must be of type Model1DPlugin \n"%str(name)
+        log(msg)
+        return 
+    if model.__name__!="Model":
+        msg= "Plugin %s class name must be Model \n"%str(name)
+        log(msg)
+        return 
+    try:
+        new_instance= model()
+    except:
+        msg="Plugin %s error in __init__ \n\t: %s %s\n"%(str(name),
+                                    str(sys.exc_type),sys.exc_value)
+        log(msg)
+        return
+   
+    new_instance= model() 
+    if hasattr(new_instance,"function"):
+        try:
+           value=new_instance.function()
+        except:
+           msg="Plugin %s: error writing function \n\t :%s %s\n "%(str(name),
+                                    str(sys.exc_type),sys.exc_value)
+           log(msg)
+           return
+    else:
+       msg="Plugin  %s needs a method called function \n"%str(name)
+       log(msg)
+       return 
+    return model
+  
+  
 def _findModels(dir):
     # List of plugin objects
@@ -51 +91 @@
                     if hasattr(module, "Model"):
                         try:
-                            plugins.append(module.Model)
+                            if _check_plugin(module.Model, name)!=None:
+                            #plugins.append(module.Model)
+                                plugins.append(module.Model)
                         except:
-                            log("Error accessing Model in %s\n  %s" % (name, sys.exc_value))
+                            msg="Error accessing Model"
+                            msg+="in %s\n  %s %s\n" % (name,
+                                    str(sys.exc_type), sys.exc_value)
+                            log(msg)
                 except:
-                    log("Error accessing Model in %s\n  %s" % (name, sys.exc_value))
+                    msg="Error accessing Model"
+                    msg +=" in %s\n  %s %s \n" %(name,
+                                    str(sys.exc_type), sys.exc_value)
+                    log(msg)
                 finally:
               
@@ -285 +333 @@
                                 list1= self.struct_list )
         
-        self._fill_simple_menu( menuinfo = ["Customized Models", added_models,
+        self._fill_plugin_menu( menuinfo = ["Customized Models", added_models,
                                             "List of additional models"],
                                  list1= self.plugins )
@@ -297 +345 @@
         return 0
     
+    def _fill_plugin_menu(self,menuinfo, list1):
+        """
+            fill the plugin menu with costumized models
+        """
+        if len(list1)==0:
+            id = wx.NewId() 
+            msg= "No model available check plugins.log for errors to fix problem"
+            menuinfo[1].Append(int(id),"Empty",msg)
+        self._fill_simple_menu( menuinfo,list1)
+        
+        
     def _fill_simple_menu(self,menuinfo, list1):
         """