Changeset 1c66bc5 in sasview for sansview

Timestamp:

Sep 8, 2008 5:16:37 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:

aa92772

Parents:

bee885e

Message:

working on pluging model

Location:

sansview/perspectives

Files:

• fitting/fitpanel.py (modified) (3 diffs)
• fitting/models.py (modified) (1 diff)
• plugins/testmodel.py (added)

sansview/perspectives/fitting/fitpanel.py

@@ -90 +90 @@
             self.fit_page_name = page_title
             return panel
+        
+        
     def add_model_page(self,model,page_title):
-        print "fitpanel: self.draw_model_name",self.draw_model_name
+        """
+            Add a model page only one  to display any model selected from the menu or the page combo box.
+            when this page is closed than the user will be able to open a new one
+            @param model: the model for which paramters will be changed
+            @param page_title: the name of the page
+        """
         if  page_title !=self.draw_model_name or self.draw_model_name ==None: 
-            print "went here"
             from modelpage import ModelPage
             panel = ModelPage(self.nb,model, -1)
@@ -102 +108 @@
             self.draw_model_name=page_title
         else:
-            print "fitpanel: a page was added already "
             for i in range(self.nb.GetPageCount()):
                 if self.nb.GetPageText(i)==self.page_name:
@@ -110 +115 @@
                 
            
-  
     def get_notebook(self):
         """

sansview/perspectives/fitting/models.py

@@ -4 +4 @@
 
 (ModelEvent, EVT_MODEL) = wx.lib.newevent.NewEvent()
-
+def _findModels(dir):
+    # List of plugin objects
+    plugins = []
+    # Go through files in plug-in directory
+    try:
+        list = os.listdir(dir)
+        for item in list:
+            toks = os.path.splitext(os.path.basename(item))
+            if toks[1]=='.py' and not toks[0]=='__init__':
+                name = toks[0]
+            
+                path = [os.path.abspath(dir)]
+                file = None
+                try:
+                    (file, path, info) = imp.find_module(name, path)
+                    module = imp.load_module( name, file, item, info )
+                    if hasattr(module, "Model"):
+                        try:
+                            plugins.append(module.Model)
+                        except:
+                            log("Error accessing Model in %s\n  %s" % (name, sys.exc_value))
+                except:
+                    pass
+                finally:
+                    if not file==None:
+                        file.close()
+    except:
+        pass
+    return plugins