Changeset b30f001 in sasview for sansview

Timestamp:

Sep 10, 2008 3:49:53 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:

49b7efa

Parents:

aa92772

Message:

working on model menu

Location:

sansview

Files:

• docs/note2.txt (added)
• perspectives/fitting/models.py (modified) (9 diffs)
• plugins/testmodel.py (modified) (2 diffs)
• setup_exe.py (added)

sansview/perspectives/fitting/models.py

@@ -1 +1 @@
 import wx
-import os
+import imp
+import os,sys
 import os.path
 
 (ModelEvent, EVT_MODEL) = wx.lib.newevent.NewEvent()
+def log(message):
+    print message
+    out = open("plugins.log", 'a')
+    out.write("%10g:  %s\n" % (time.clock(), message))
+    out.close()
+
 def findModels():
     print "looking for models"
-    try:
-        cwd= os.path.split(__file__)[0]
-    except:
-        cwd= os.getcwd()
-    print "models cwd",cwd
-    dir=os.path.join(cwd,'plugins')
-    print "models: find plugins",dir
-    if os.path.isdir(dir):
-        return _findModels(dir)
-    else:
-        return []
-    
-    
+    if os.path.isdir('plugins'):
+        return _findModels('plugins')
+    return []
     
 def _findModels(dir):
@@ -27 +24 @@
         list = os.listdir(dir)
         for item in list:
-            print "models: _findModels:",item
             toks = os.path.splitext(os.path.basename(item))
-            print "models: toks:",toks
             if toks[1]=='.py' and not toks[0]=='__init__':
                 name = toks[0]
@@ -37 +32 @@
                 try:
                     (file, path, info) = imp.find_module(name, path)
+                    print "models:module ",file
                     module = imp.load_module( name, file, item, info )
+                    print "models:module ",module
                     if hasattr(module, "Model"):
                         try:
@@ -44 +41 @@
                             log("Error accessing Model in %s\n  %s" % (name, sys.exc_value))
                 except:
-                    pass
+                    log("Error accessing Model in %s\n  %s" % (name, sys.exc_value))
                 finally:
                     if not file==None:
@@ -51 +48 @@
         pass
     return plugins
-    
-
-
 class ModelManager:
     
@@ -59 +53 @@
     model_list = {}
     model_list_box = {}
+    custom_models={}
+    plugins=[]
     ## Event owner
     event_owner = None
@@ -80 +76 @@
         from sans.guitools.LineModel import LineModel
         self.model_list[str(wx.NewId())]  = LineModel
-      
+        self.plugins =findModels()
+        
+        print "models: plugings",self.plugins
         return 0
 
@@ -96 +94 @@
         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]
@@ -105 +105 @@
                 
             self.model_list_box[name] =value
-            
-            modelmenu.Append(int(id_str), name, name)
-            wx.EVT_MENU(event_owner, int(id_str), self._on_model)       
-        plugings=findModels()
-        print "models: plugings",plugings
+
+               
+            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.custom_models) == 0:
+            print self.plugins
+            for item in self.plugins:
+                if item not in self.custom_models.keys():
+                    self.custom_models[str(id)] = item
+                    self.model_list[str(id)]=item
+                    added_models.Append(id, item.name, item.name)
+                    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
     

sansview/plugins/testmodel.py

@@ -2 +2 @@
     Test plug-in model
 """
-try:
-    from DataPlugin import *
-except:
-    import sys, os
-    print os.path.abspath('..')
-    sys.path.insert(1,os.path.abspath('..'))
-    from DataPlugin import *
-    print "Running independently"
+#try:
+#    from DataPlugin import *
+#except:
+#    import sys, os
+#    print os.path.abspath('..')
+#    sys.path.insert(1,os.path.abspath('..'))
+#    from DataPlugin import *
+#    print "Running independently"
+#
+import math
+from sans.models.BaseComponent import BaseComponent
+import math
+class Model1DPlugin(BaseComponent):
+    ## Name of the model
+    name = "Plugin Model"
 
-import math
+    def __init__(self):
+        """ Initialization """
+        self.details = {}
+        self.params  = {}
+        
+    def function(self, x):
+        """
+            Function to be implemented by the plug-in writer
+        """
+        return x
+        
+    def run(self, x = 0.0):
+        """ Evaluate the model
+            @param x: input x, or [x, phi] [radian]
+            @return: function value
+        """
+        if x.__class__.__name__ == 'list':
+            x_val = x[0]*math.cos(x[1])
+            y_val = x[0]*math.sin(x[1])
+            return self.function(x_val)*self.function(y_val)
+        elif x.__class__.__name__ == 'tuple':
+            raise ValueError, "Tuples are not allowed as input to BaseComponent models"
+        else:
+            return self.function(x)
+   
+    def runXY(self, x = 0.0):
+        """ Evaluate the model
+            @param x: input x, or [x, y] 
+            @return: function value
+        """
+        if x.__class__.__name__ == 'list':
+            return self.function(x[0])*self.function(x[1])
+        elif x.__class__.__name__ == 'tuple':
+            raise ValueError, "Tuples are not allowed as input to BaseComponent models"
+        else:
+            return self.function(x)
 
 # Your model HAS to be called Model
@@ -23 +65 @@
     def __init__(self):
         """ Initialization """
-        
-        Model1DPlugin.__init__(self)
+      
         
         ## Parameters definition and defaults