Changeset f80b8a9f in sasview

Timestamp:

Oct 11, 2016 9:03:53 AM (8 years ago)

Author:

mathieu

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

01cfd13

Parents:

46dfee9

Message:

Make sure the copy module is available regardless of how the model is loaded. Fixes #766

File:

• src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (6 diffs)

src/sas/sasgui/perspectives/calculator/model_editor.py

@@ -28 +28 @@
 import math
 import re
+import logging
 from wx.py.editwindow import EditWindow
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
@@ -388 +389 @@
             wx.PostEvent(self.parent.parent, StatusEvent(status=msg,
                                                          info=info))
-        else:
-            raise
 
     def on_help(self, event):
@@ -966 +965 @@
                         result, msg = None, "error building model"
                         check_err = "\n"+traceback.format_exc(limit=2)
-
-                    # Modified compiling test, as it will fail for sasmodels.sasview_model class
-                    # Should add a test to check that the class is correctly built 
-                    # by sasview_model.make_class_from_file?
-#                    try: 
-#                        tr_msg = _compile_file(self.fname)
-#                        msg = str(tr_msg.__str__())
-#                        # Compile error
-#                        if msg:
-#                            msg.replace("  ", "\n")
-#                            msg += "\nCompiling Failed"
-#                            try:
-#                                # try to remove pyc file if exists
-#                                _delete_file(self.fname)
-#                                _delete_file(self.fname + "c")
-#                            except:
-#                                pass
-#                    except:
-#                        pass
                 else:
                     msg = "Error: The func(x) must 'return' a value at least.\n"
@@ -1002 +982 @@
                 exec "from %s import Model" % name
             except:
-                pass
-#            except:
-#                msg = 'new model fails to import in python'
-#                try:
-#                    # try to remove pyc file if exists
-#                    _delete_file(self.fname + "c")
-#                except:
-#                    pass
-#
-# And also need to test if model runs            
-#        if self.base != None and not msg:
-#            try:
-#                Model().run(0.01)
-#            except:
-#                msg = "new model fails on run method:"
-#                _, value, _ = sys.exc_info()
-#                msg += "in %s:\n%s\n" % (name, value)
-#                try:
-#                    # try to remove pyc file if exists
-#                    _delete_file(self.fname + "c")
-#                except:
-#                    pass
+                logging.error(sys.exc_value)
+
         # Prepare the messagebox
         if msg:
@@ -1230 +1190 @@
 
 ## Templates for custom models
-#CUSTOM_TEMPLATE = """
-#from sas.models.pluginmodel import Model1DPlugin
-#from math import *
-#import os
-#import sys
-#import numpy
-##import scipy?
-#class Model(Model1DPlugin):
-#    name = basename without extension of __file__
-#    def __init__(self):
-#        Model1DPlugin.__init__(self, name=self.name)
-#        #set name same as file name
-#        #self.params here
-#        self.description = "%s"
-#        self.set_details()
-#    def function(self, x=0.0%s):
-#        #local params here
-#        #function here
-#"""
 
 CUSTOM_TEMPLATE = """
@@ -1419 +1360 @@
 
     def _clone(self, obj):
+        import copy
         obj.params     = copy.deepcopy(self.params)
         obj.description     = copy.deepcopy(self.description)