Changeset 26c8be3 in sasview for src/sas/sasgui/perspectives


Ignore:
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

Location:
src/sas/sasgui/perspectives
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/calculator/model_editor.py

    rf80b8a9f r26c8be3  
    632632        self.reader = None 
    633633        self.name = 'untitled' 
    634         self.overwrite_name = False 
     634        self.overwrite_name = True 
    635635        self.is_2d = False 
    636636        self.fname = None 
     
    683683        #title name [string] 
    684684        name_txt = wx.StaticText(self, -1, 'Function Name : ') 
    685         overwrite_cb = wx.CheckBox(self, -1, "Overwrite?", (10, 10)) 
    686         overwrite_cb.SetValue(False) 
     685        overwrite_cb = wx.CheckBox(self, -1, "Overwrite existing plugin model of this name?", (10, 10)) 
     686        overwrite_cb.SetValue(True) 
    687687        overwrite_cb.SetToolTipString("Overwrite it if already exists?") 
    688688        wx.EVT_CHECKBOX(self, overwrite_cb.GetId(), self.on_over_cb) 
     
    11511151 
    11521152        _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html" 
    1153         _PageAnchor = "#custom-model-editor" 
     1153        _PageAnchor = "#New_Plugin_Model" 
    11541154        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, _PageAnchor, 
    1155                                           "Custom Model Editor Help") 
     1155                                          "Plugin Model Editor Help") 
    11561156 
    11571157    def on_close(self, event): 
  • src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

    r3e1c9e5 r26c8be3  
    163163^^^^^^^^^^^^^^^^ 
    164164 
     165Relatively straightforward models can be programmed directly from the SasView GUI  
     166using the *New Plugin Model Function*. 
     167 
    165168.. image:: new_model.bmp 
    166169 
    167 A model template generated by this option can be viewed and further modified using 
     170When using this feature, be aware that even if your code has errors, including  
     171syntax errors, a model file is still generated. When you then correct the errors  
     172and click 'Apply' again to re-compile you will get an error informing you that  
     173the model already exists if the 'Overwrite' box is not checked. In this case you  
     174will need to supply a new model function name. By default the 'Overwrite' box is  
     175*checked*\ . 
     176 
     177Also note that the 'Fit Parameters' have been split into two sections: those which  
     178can be polydisperse (shape and orientation parameters) and those which are not 
     179(eg, scattering length densities). 
     180 
     181A model file generated by this option can be viewed and further modified using 
    168182the :ref:`Advanced_Plugin_Editor` . 
    169  
    170 *NB: "Fit Parameters" has been split into two sections, those which can be 
    171 polydisperse (shape and orientation parameters) and those which are not 
    172 (scattering length densities, for example).* 
    173183 
    174184Sum|Multi(p1,p2) 
Note: See TracChangeset for help on using the changeset viewer.