Changeset 8d78399 in sasview for sansview/perspectives/fitting

Timestamp:

Sep 17, 2009 4:41:16 PM (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:

09fe12d

Parents:

2051cbe

Message:

sansview: minor cosmetics

Location:

sansview/perspectives/fitting

Files:

• gui_thread.py (modified) (2 diffs)
• models.py (modified) (6 diffs)

sansview/perspectives/fitting/gui_thread.py

@@ -78 +78 @@
             # Thread was interrupted, just proceed and re-raise.
             # Real code should not print, but this is an example...
-            raise KeyboardInterrupt
+            raise
       
         
@@ -148 +148 @@
             # Thread was interrupted, just proceed and re-raise.
             # Real code should not print, but this is an example...
-            raise KeyboardInterrupt
+            raise 
        

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  
@@ -38 +38 @@
         @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
+        @return model: model if valid model or None if not valid
     """
     #Check is the plugin is of type Model1DPlugin
@@ -44 +44 @@
         msg= "Plugin %s must be of type Model1DPlugin \n"%str(name)
         log(msg)
-        return 
+        return None
     if model.__name__!="Model":
         msg= "Plugin %s class name must be Model \n"%str(name)
         log(msg)
-        return 
+        return None
     try:
         new_instance= model()
@@ -55 +55 @@
                                     str(sys.exc_type),sys.exc_value)
         log(msg)
-        return
+        return None
    
     new_instance= model() 
@@ -65 +65 @@
                                     str(sys.exc_type),sys.exc_value)
            log(msg)
-           return
+           return None
     else:
        msg="Plugin  %s needs a method called function \n"%str(name)
        log(msg)
-       return 
+       return None
     return model
   
@@ -92 +92 @@
                         try:
                             if _check_plugin(module.Model, name)!=None:
-                            #plugins.append(module.Model)
                                 plugins.append(module.Model)
                         except: