Changes in / [7949dcf7:9087214] in sasview

Files:

• .pydevproject (modified) (1 diff)
• sasview/setup_exe.py (modified) (1 diff)
• src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (10 diffs)
• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (2 diffs)
• src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/models.py (modified) (1 diff)
• src/sas/sasgui/perspectives/pr/pr.py (modified) (1 diff)

.pydevproject

@@ -4 +4 @@
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/sasview4/src</path>
+<path>/sasview/src</path>
 </pydev_pathproperty>
 </pydev_project>

sasview/setup_exe.py

@@ -372 +372 @@
     )
 
-# bundle_option = 2
-bundle_option = 3
+bundle_option = 2
 if is_64bits:
     bundle_option = 3

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
@@ -389 +388 @@
             wx.PostEvent(self.parent.parent, StatusEvent(status=msg,
                                                          info=info))
+        else:
+            raise
 
     def on_help(self, event):
@@ -632 +633 @@
         self.reader = None
         self.name = 'untitled'
-        self.overwrite_name = True
+        self.overwrite_name = False
         self.is_2d = False
         self.fname = None
@@ -683 +684 @@
         #title name [string]
         name_txt = wx.StaticText(self, -1, 'Function Name : ')
-        overwrite_cb = wx.CheckBox(self, -1, "Overwrite existing plugin model of this name?", (10, 10))
-        overwrite_cb.SetValue(True)
+        overwrite_cb = wx.CheckBox(self, -1, "Overwrite?", (10, 10))
+        overwrite_cb.SetValue(False)
         overwrite_cb.SetToolTipString("Overwrite it if already exists?")
         wx.EVT_CHECKBOX(self, overwrite_cb.GetId(), self.on_over_cb)
@@ -946 +947 @@
         # Sort out the errors if occur
         # First check for valid python name then if the name already exists
-        if not name or not bool(re.match('^[A-Za-z0-9_]*$', name)):
-            msg = "is not a valid python name. Name must not be empty and \n"
-            msg += "may include only alpha numeric or underline characters \n"
-            msg += "and no spaces"
+        if not re.match('^[A-Za-z0-9_]*$', name):
+            msg = "not a valid python name. Name must include only alpha \n"
+            msg += "numeric or underline characters and no spaces"
         elif self.check_name():
             description = self.desc_tcl.GetValue()
@@ -966 +966 @@
                         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"
@@ -983 +1002 @@
                 exec "from %s import Model" % name
             except:
-                logging.error(sys.exc_value)
-
+                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
         # Prepare the messagebox
         if msg:
@@ -1152 +1191 @@
 
         _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html"
-        _PageAnchor = "#New_Plugin_Model"
+        _PageAnchor = "#custom-model-editor"
         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, _PageAnchor,
-                                          "Plugin Model Editor Help")
+                                          "Custom Model Editor Help")
 
     def on_close(self, event):
@@ -1191 +1230 @@
 
 ## 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 = """
@@ -1361 +1419 @@
 
     def _clone(self, obj):
-        import copy
         obj.params     = copy.deepcopy(self.params)
         obj.description     = copy.deepcopy(self.description)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -2057 +2057 @@
 
         if  struct_factor != None:
-            from sasmodels.sasview_model import MultiplicationModel
+            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
             self.model = MultiplicationModel(form_factor(self.multi_factor),
                                              struct_factor())
@@ -3344 +3344 @@
                             item[0].SetValue(is_true)
 
-        self.select_param(event=None)
-        self.Refresh()
-
     def _paste_poly_help(self, item, value):
         """

src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

@@ -163 +163 @@
 ^^^^^^^^^^^^^^^^
 
-Relatively straightforward models can be programmed directly from the SasView GUI 
-using the *New Plugin Model Function*.
-
 .. image:: new_model.bmp
 
-When using this feature, be aware that even if your code has errors, including 
-syntax errors, a model file is still generated. When you then correct the errors 
-and click 'Apply' again to re-compile you will get an error informing you that 
-the model already exists if the 'Overwrite' box is not checked. In this case you 
-will need to supply a new model function name. By default the 'Overwrite' box is 
-*checked*\ .
-
-Also note that the 'Fit Parameters' have been split into two sections: those which 
-can be polydisperse (shape and orientation parameters) and those which are not
-(eg, scattering length densities).
-
-A model file generated by this option can be viewed and further modified using
+A model template generated by this option can be viewed and further modified using
 the :ref:`Advanced_Plugin_Editor` .
+
+*NB: "Fit Parameters" has been split into two sections, those which can be
+polydisperse (shape and orientation parameters) and those which are not
+(scattering length densities, for example).*
 
 Sum|Multi(p1,p2)

src/sas/sasgui/perspectives/fitting/models.py

@@ -356 +356 @@
         """
         if int(evt.GetId()) in self.form_factor_dict.keys():
-            from sasmodels.sasview_model import MultiplicationModel
+            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
             self.model_dictionary[MultiplicationModel.__name__] = MultiplicationModel
             model1, model2 = self.form_factor_dict[int(evt.GetId())]

src/sas/sasgui/perspectives/pr/pr.py

@@ -1276 +1276 @@
                     wx.PostEvent(self.parent, StatusEvent(status=msg, info='error'))
                     return
-                msg = "Prview does not allow multiple data!\n"
+                msg += "Prview does not allow multiple data!\n"
                 msg += "Please select one.\n"
                 if len(data_list) > 1: