Changeset 26c8be3 in sasview

Timestamp:

Oct 11, 2016 11:49:02 AM (8 years ago)

Author:

smk78

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:

ad1ac45

Parents:

01cfd13

Message:

Changed default behaviour of New Plugin Model

modified: src/sas/sasgui/perspectives/calculator/model_editor.py
modified: src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

Files:

• .pydevproject (modified) (1 diff)
• src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (3 diffs)
• src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (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>/sasview/src</path>
+<path>/sasview4/src</path>
 </pydev_pathproperty>
 </pydev_project>

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

@@ -632 +632 @@
         self.reader = None
         self.name = 'untitled'
-        self.overwrite_name = False
+        self.overwrite_name = True
         self.is_2d = False
         self.fname = None
@@ -683 +683 @@
         #title name [string]
         name_txt = wx.StaticText(self, -1, 'Function Name : ')
-        overwrite_cb = wx.CheckBox(self, -1, "Overwrite?", (10, 10))
-        overwrite_cb.SetValue(False)
+        overwrite_cb = wx.CheckBox(self, -1, "Overwrite existing plugin model of this name?", (10, 10))
+        overwrite_cb.SetValue(True)
         overwrite_cb.SetToolTipString("Overwrite it if already exists?")
         wx.EVT_CHECKBOX(self, overwrite_cb.GetId(), self.on_over_cb)
@@ -1151 +1151 @@
 
         _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html"
-        _PageAnchor = "#custom-model-editor"
+        _PageAnchor = "#New_Plugin_Model"
         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, _PageAnchor,
-                                          "Custom Model Editor Help")
+                                          "Plugin Model Editor Help")
 
     def on_close(self, event):

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
 
-A model template generated by this option can be viewed and further modified using
+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
 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)