Changeset 61184df in sasview

Timestamp:

Apr 13, 2012 7:20:25 AM (13 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:

6d8bad4

Parents:

14cd6b92

Message:

Fixing code style problems and bugs

File:

• fittingview/src/sans/perspectives/fitting/models.py (modified) (9 diffs)

fittingview/src/sans/perspectives/fitting/models.py

@@ -1 @@
-
+"""
+    Utilities to manage models
+"""
 import wx
 import wx.lib.newevent
@@ -22 +24 @@
 def log(message):
     """
-    """
-    dir = os.path.join(os.path.expanduser("~"),'.sansview', PLUGIN_DIR)
+        Log a message in a file located in the user's home directory
+    """
+    dir = os.path.join(os.path.expanduser("~"), '.sansview', PLUGIN_DIR)
     out = open(os.path.join(dir, "plugins.log"), 'a')
     out.write("%10g:  %s\n" % (time.clock(), message))
@@ -41 +44 @@
     #Check is the plugin is of type Model1DPlugin
     if not issubclass(model, Model1DPlugin):
-        msg = "Plugin %s must be of type Model1DPlugin \n"%str(name)
+        msg = "Plugin %s must be of type Model1DPlugin \n" % str(name)
         log(msg)
         return None
     if model.__name__!="Model":
-        msg= "Plugin %s class name must be Model \n"%str(name)
+        msg= "Plugin %s class name must be Model \n" % str(name)
         log(msg)
         return None
@@ -51 +54 @@
         new_instance= model()
     except:
-        msg="Plugin %s error in __init__ \n\t: %s %s\n"%(str(name),
-                                    str(sys.exc_type),sys.exc_value)
+        msg="Plugin %s error in __init__ \n\t: %s %s\n" % (str(name),
+                                    str(sys.exc_type), sys.exc_value)
         log(msg)
         return None
@@ -61 +64 @@
            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)
+           msg="Plugin %s: error writing function \n\t :%s %s\n " % (str(name),
+                                    str(sys.exc_type), sys.exc_value)
            log(msg)
            return None
     else:
-       msg="Plugin  %s needs a method called function \n"%str(name)
+       msg="Plugin  %s needs a method called function \n" % str(name)
        log(msg)
        return None
@@ -76 +79 @@
         The plugin directory is located in the user's home directory.
     """
-    dir = os.path.join(os.path.expanduser("~"),'.sansview', PLUGIN_DIR)
+    dir = os.path.join(os.path.expanduser("~"), '.sansview', PLUGIN_DIR)
     
     # If the plugin directory doesn't exist, create it
@@ -144 +147 @@
     # Go through files in plug-in directory
     #always recompile the folder plugin
-    import compileall
     dir = find_plugins_dir()
     if not os.path.isdir(dir):
@@ -225 +227 @@
 class ModelManagerBase:
     """
+        Base class for the model manager
     """
     ## external dict for models
@@ -768 +771 @@
         else:
             model= self.struct_factor_dict[str(evt.GetId())]()
-        evt = ModelEvent(model=model)
-        wx.PostEvent(self.event_owner, evt)
+        
+        #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):