Changeset 33afff7 in sasview for sansview/perspectives/fitting/models.py

Timestamp:

Feb 21, 2009 10:42:25 AM (15 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

353041d

Parents:

858f2ae5

Message:

Fixed plug-in model import for windows executable (py2exe) and added clean-up to-do list

File:

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

sansview/perspectives/fitting/models.py

@@ +1 @@
+#TODO: add comments to document this module
+#TODO: clean-up the exception handling.
+#TODO: clean-up existing comments/documentation. 
+#      For example, the _getModelList method advertises 
+#      an 'id' parameter that is not part of the method's signature.
+#      It also advertises an ID as return value but it always returns zero.
+#TODO: clean-up the FractalAbsModel and PowerLawAbsModel menu items. Those
+#      model definitions do not belong here. They belong with the rest of the
+#      models.
+
 import wx
 import imp
@@ -6 +16 @@
 (ModelEvent, EVT_MODEL) = wx.lib.newevent.NewEvent()
 
-
-    
+# Time is needed by the log method
+import time
+
+# Explicitly import from the pluginmodel module so that py2exe
+# places it in the distribution. The Model1DPlugin class is used
+# as the base class of plug-in models.
+from sans.models.pluginmodel import Model1DPlugin
     
 def log(message):
-    print message
     out = open("plugins.log", 'a')
     out.write("%10g:  %s\n" % (time.clock(), message))
@@ -16 +30 @@
 
 def findModels():
-    print "looking for models"
+    log("looking for models in: %s/plugins" % os.getcwd())
     if os.path.isdir('plugins'):
         return _findModels('plugins')
@@ -49 +63 @@
                         file.close()
     except:
+        # Don't deal with bad plug-in imports. Just skip.
         pass
     return plugins