Changes in / [845144e:b204004] in sasview


Ignore:
Files:
2 added
5 deleted
19 edited

Legend:

Unmodified
Added
Removed

  • LICENSE.TXT

    rb01252e r0347c89  
    1111 
    1212THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
    13  
    14 Also see https://github.com/SasView/sasview/blob/master/installers/license.txt 

  • docs/sphinx-docs/source/index.rst

    r912e645 r5a73356a  
    1010   :maxdepth: 1 
    1111 
    12    USER DOCUMENTATION <user/user> 
     12   User Documentation <user/user> 
    1313 
    14    DEVELOPER DOCUMENTATION <dev/dev> 
    15     
    16    Release Notes <user/RELEASE> 
    17     
     14   Developer Documentation <dev/dev> 

  • docs/sphinx-docs/source/user/tutorial.rst

    rbe460ce re873408  
    88.. note:: In Windows use [Alt]-[Cursor left] to return to the previous page 
    99 
    10 The following tutorial was written for Version 2.x but is still a useful overview of  
    11 much of the analysis capability in SasView (but disregard Appendix XIII if using  
    12 Version 4.2 or later) 
    13  
    14 :download:`Old Tutorial <sasview/Tutorial.pdf>` 
    15  
    16 The following tutorials have been written for Version 4.x 
    17  
    1810:download:`Getting Started with Sasview <sasview/getting_started_with_sasview.pdf>` 
    1911 
    … …  
    2214:download:`Simultaneous 1D Fitting in Sasview <sasview/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf>` 
    2315 
    24 :download:`Correlation Function Analysis in SasView <sasview/correlation_function_analysis_in_sasview_v4x.pdf>` 
     16:download:`Old Tutorial <sasview/Tutorial.pdf>` 

  • installers/license.txt

    rc6a4d143 rd3114cc  
    88Participating facilities include (in alphabetical order):  
    99the Australian National Science & Technology Centre for Neutron  
    10 Scattering, the Bundesanstalt fur Materialforschung und prufung, the  
    11 Diamond Light Source, the European Spallation Source, the Institut  
    12 Laue Langevin, the ISIS Pulsed Neutron & Muon Source, the National  
    13 Institute of Standards & Technology Center for Neutron Research,  
    14 the Oak Ridge National Laboratory Neutron Sciences Directorate,  
    15 and the Technical University Delft Reactor Institute. 
     10Scattering, the Diamond Light Source, the European Spallation Source,  
     11the Institut Laue Langevin, the ISIS Pulsed Neutron & Muon Source,  
     12the National Institute of Standards & Technology Center for Neutron  
     13Research, the Oak Ridge National Laboratory Neutron Sciences  
     14Directorate, and the Technical University Delft Reactor Institute. 
    1615 
    1716SasView is distributed under a 'Three-clause' BSD licence which you  
    … …  
    2019SasView is free to download and use, including for commercial purposes. 
    2120 
    22 © 2009-2018 UMD, UTK, NIST, ORNL, ISIS, ESS, ANSTO, ILL, TUD, DLS, BAM  
     21© 2009-2018 UMD, UTK, NIST, ORNL, ISIS, ESS, ANSTO, ILL, TUD, DLS  
    2322 
    2423 

  • src/sas/sascalc/fit/pagestate.py

    r863ac2c r59873e1  
    640640                if len(value.strip()) == 0: 
    641641                    continue 
    642                 title = (value + " [" + repo_time + "] [SasView v" + 
    643                          SASVIEW_VERSION + "]") 
     642                title = value + " [" + repo_time + "]" 
    644643                title_name = HEADER % title 
    645644            elif name == "data": 

  • src/sas/sasgui/guiframe/aboutbox.py

    r1b4cb41 rb963b20  
    108108        self.bitmap_button_tudelft = wx.BitmapButton(self, -1, wx.NullBitmap) 
    109109        self.bitmap_button_dls = wx.BitmapButton(self, -1, wx.NullBitmap) 
    110         self.bitmap_button_bam = wx.BitmapButton(self, -1, wx.NullBitmap) 
    111110 
    112111        self.static_line_3 = wx.StaticLine(self, -1) 
    … …  
    129128        self.Bind(wx.EVT_BUTTON, self.onTudelftLogo, self.bitmap_button_tudelft) 
    130129        self.Bind(wx.EVT_BUTTON, self.onDlsLogo, self.bitmap_button_dls) 
    131         self.Bind(wx.EVT_BUTTON, self.onBamLogo, self.bitmap_button_bam) 
    132130        # end wxGlade 
    133131        # fill in acknowledgements 
    … …  
    228226        logo = wx.Bitmap(image) 
    229227        self.bitmap_button_dls.SetBitmapLabel(logo) 
    230  
    231         image = file_dir + "/images/bam_logo.png" 
    232         if os.path.isfile(config._bam_logo): 
    233             image = config._bam_logo 
    234         logo = wx.Bitmap(image) 
    235         self.bitmap_button_bam.SetBitmapLabel(logo) 
    236228 
    237229        # resize dialog window to fit version number nicely 
    … …  
    266258        self.bitmap_button_tudelft.SetSize(self.bitmap_button_tudelft.GetBestSize()) 
    267259        self.bitmap_button_dls.SetSize(self.bitmap_button_dls.GetBestSize()) 
    268         self.bitmap_button_bam.SetSize(self.bitmap_button_bam.GetBestSize()) 
    269260        # end wxGlade 
    270261 
    … …  
    334325        sizer_logos.Add(self.bitmap_button_dls, 0, 
    335326                        wx.LEFT|wx.ADJUST_MINSIZE, 2) 
    336         sizer_logos.Add(self.bitmap_button_bam, 0, 
    337                         wx.LEFT|wx.ADJUST_MINSIZE, 2) 
    338327 
    339328        sizer_logos.Add((10, 50), 0, wx.ADJUST_MINSIZE, 0) 
    … …  
    441430        event.Skip() 
    442431 
    443     def onBamLogo(self, event): 
    444         """ 
    445         """ 
    446         # wxGlade: DialogAbout.<event_handler> 
    447         launchBrowser(config._bam_url) 
    448         event.Skip() 
    449  
    450432# end of class DialogAbout 
    451433 

  • src/sas/sasgui/guiframe/config.py

    r1b4cb41 r1efbc190  
    3333_do_aboutbox = True 
    3434_do_acknowledge = True 
    35 _do_release = True 
    3635_do_tutorial = True 
    3736_acknowledgement_preamble =\ 
    … …  
    5049_acknowledgement_citation = \ 
    5150'''M. Doucet et al. SasView Version 4.1.2, Zenodo, 10.5281/zenodo.825675''' 
     51 
    5252_acknowledgement =  \ 
    53 '''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, BAM and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html 
     53'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html 
    5454''' 
    5555 
    … …  
    9090_tudelft_url = "http://www.tnw.tudelft.nl/en/cooperation/facilities/reactor-instituut-delft/" 
    9191_dls_url = "http://www.diamond.ac.uk/" 
    92 _bam_url = "http://www.bam.de/" 
    9392_danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html" 
    9493_inst_url = "http://www.utk.edu" 
    9594_corner_image = os.path.join(icon_path, "angles_flat.png") 
    9695_welcome_image = os.path.join(icon_path, "SVwelcome.png") 
    97 _copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS and BAM" 
     96_copyright = "(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS" 
    9897marketplace_url = "http://marketplace.sasview.org/" 
    9998 

  • src/sas/sasgui/guiframe/gui_manager.py

    rb1ec23d rb1ec23d  
    12771277 
    12781278        wx_id = wx.NewId() 
    1279         self._help_menu.Append(wx_id, '&Documentation', 'Help documentation for SasView') 
     1279        self._help_menu.Append(wx_id, '&Documentation', '') 
    12801280        wx.EVT_MENU(self, wx_id, self._onSphinxDocs) 
    12811281 
    12821282        if config._do_tutorial and (IS_WIN or sys.platform == 'darwin'): 
    12831283            wx_id = wx.NewId() 
    1284             # Pluralised both occurences of 'Tutorial' in the line below 
    1285             # S King, Sep 2018 
    1286             self._help_menu.Append(wx_id, '&Tutorials', 'Tutorials on how to use SasView') 
     1284            self._help_menu.Append(wx_id, '&Tutorial', 'Software tutorial') 
    12871285            wx.EVT_MENU(self, wx_id, self._onTutorial) 
    1288  
    1289         if config.marketplace_url: 
    1290             wx_id = wx.NewId() 
    1291             self._help_menu.Append(wx_id, '&Model marketplace', 'Plug-in fitting models for SasView') 
    1292             wx.EVT_MENU(self, wx_id, self._on_marketplace_click) 
    1293  
    1294         if config._do_release: 
    1295             wx_id = wx.NewId() 
    1296             self._help_menu.Append(wx_id, '&Release notes', 
    1297                                    'SasView release notes and known issues') 
    1298             wx.EVT_MENU(self, wx_id, self._onRelease) 
    12991286 
    13001287        if config._do_acknowledge: 
    … …  
    13071294            logger.info("Doing help menu") 
    13081295            wx_id = wx.NewId() 
    1309             self._help_menu.Append(wx_id, '&About', 'Information about SasView') 
     1296            self._help_menu.Append(wx_id, '&About', 'Software information') 
    13101297            wx.EVT_MENU(self, wx_id, self._onAbout) 
     1298 
     1299        if config.marketplace_url: 
     1300            wx_id = wx.NewId() 
     1301            self._help_menu.Append(wx_id, '&Model marketplace', '') 
     1302            wx.EVT_MENU(self, wx_id, self._on_marketplace_click) 
    13111303 
    13121304        # Checking for updates 
    … …  
    21462138            dialog.ShowModal() 
    21472139 
    2148     def _onRelease(self, evt): 
    2149         """ 
    2150         Pop up the release notes 
     2140    def _onTutorial(self, evt): 
     2141        """ 
     2142        Pop up the tutorial dialog 
    21512143 
    21522144        :param evt: menu event 
    21532145 
    21542146        """ 
    2155         # S King, Sep 2018 
    2156  
    2157         from documentation_window import DocumentationWindow 
    2158         _TreeLocation = "user/release.html" 
    2159         DocumentationWindow(self, -1, _TreeLocation, "", 
    2160                             "SasView Documentation") 
    2161  
    2162     def _onTutorial(self, evt): 
    2163         """ 
    2164         Pop up the tutorial dialog 
    2165  
    2166         :param evt: menu event 
    2167  
    2168         """ 
    2169         # Action changed from that in 2.x/3.x/4.0.x/4.1.x 
    2170         # Help >> Tutorial used to bring up a pdf of the 
    2171         # original 2.x tutorial. 
    2172         # Code below, implemented from 4.2.0, redirects 
    2173         # action to the Tutorials page of the help  
    2174         # documentation to give access to all available 
    2175         # tutorials 
    2176         # S King, Sep 2018 
    2177  
    2178         from documentation_window import DocumentationWindow 
    2179         _TreeLocation = "user/tutorial.html" 
    2180         DocumentationWindow(self, -1, _TreeLocation, "", 
    2181                             "SasView Documentation") 
     2147        if config._do_tutorial: 
     2148            path = config.TUTORIAL_PATH 
     2149            if IS_WIN: 
     2150                try: 
     2151                    from sas.sasgui.guiframe.pdfview import PDFFrame 
     2152                    dialog = PDFFrame(None, -1, "Tutorial", path) 
     2153                    # put icon 
     2154                    self.put_icon(dialog) 
     2155                    dialog.Show(True) 
     2156                except: 
     2157                    logger.error("Error in _onTutorial: %s" % sys.exc_value) 
     2158                    try: 
     2159                        # Try an alternate method 
     2160                        logger.error( 
     2161                            "Could not open the tutorial pdf, trying xhtml2pdf") 
     2162                        from xhtml2pdf import pisa 
     2163                        pisa.startViewer(path) 
     2164                    except: 
     2165                        logger.error( 
     2166                            "Could not open the tutorial pdf with xhtml2pdf") 
     2167                        msg = "This feature requires 'PDF Viewer'\n" 
     2168                        wx.MessageBox(msg, 'Error') 
     2169            else: 
     2170                try: 
     2171                    command = "open '%s'" % path 
     2172                    os.system(command) 
     2173                except: 
     2174                    try: 
     2175                        # Try an alternate method 
     2176                        logger.error( 
     2177                            "Could not open the tutorial pdf, trying xhtml2pdf") 
     2178                        from xhtml2pdf import pisa 
     2179                        pisa.startViewer(path) 
     2180                    except: 
     2181                        logger.error( 
     2182                            "Could not open the tutorial pdf with xhtml2pdf") 
     2183                        msg = "This feature requires the Preview application\n" 
     2184                        wx.MessageBox(msg, 'Error') 
    21822185 
    21832186    def _onSphinxDocs(self, evt): 

  • src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

    r5652efc r2a399ca  
    2020 
    2121OUTPUT_STRINGS = { 
    22     'max': "Long Period (A): ", 
     22    'max': "Long Period / 2 (A): ", 
    2323    'Lc': "Average Hard Block Thickness (A): ", 
    2424    'dtr': "Average Interface Thickness (A): ", 

  • src/sas/sasgui/perspectives/corfunc/corfunc_state.py

    r5652efc r1fa4f736  
    2828# List of output parameters, used by __str__ 
    2929output_list = [ 
    30     ['max', "Long Period (A): "], 
     30    ['max', "Long Period / 2 (A): "], 
    3131    ['Lc', "Average Hard Block Thickness (A): "], 
    3232    ['dtr', "Average Interface Thickness (A): "], 

  • src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst

    r490f790 r501712f  
    3333Both analyses are performed in 3 stages: 
    3434 
    35 *  Extrapolation of the scattering curve to :math:`q = 0` and toward  
    36    :math:`q = \infty` 
     35*  Extrapolation of the scattering curve to :math:`Q = 0` and toward  
     36   :math:`Q = \infty` 
    3737*  Smoothed merging of the two extrapolations into the original data 
    3838*  Fourier / Hilbert Transform of the smoothed data to give the correlation 
    … …  
    4747------------- 
    4848 
    49 To :math:`q = 0` 
     49To :math:`Q = 0` 
    5050................ 
    5151 
    … …  
    6767the impact on any extrapolated parameters will be least significant. 
    6868 
    69 To :math:`q = \infty` 
     69To :math:`Q = \infty` 
    7070..................... 
    7171 
    … …  
    145145        - do they smoothly curve onto the ordinate at x = 0? (if not check the value  
    146146          of :math:`\sigma` is sensible) 
    147         - are there ripples at x values corresponding to (2 :math:`\pi` over) the two  
     147        - are there ripples at x values corresponding to (2 :math:`pi` over) the two  
    148148          q values at which the extrapolated and experimental data are merged? 
    149         - are there any artefacts at x values corresponding to 2 :math:`\pi` / q\ :sub:`max` in  
     149        - are there any artefacts at x values corresponding to 2 :math:`pi` / q\ :sub:`max` in  
    150150          the experimental data?  
    151151        - and lastly, do the significant features/peaks in the correlation functions  
    … …  
    158158    -q^{4} I(q) 
    159159 
    160 The IDF is proportional to the second derivative of Γ\ :sub:`1`\ (x) and represents a  
    161 superposition of thickness distributions from all the contributing lamellae.  
     160The IDF is proportional to the second derivative of Γ\ :sub:`1`\ (x). 
    162161 
    163162Hilbert 
    … …  
    193192*   Local Crystallinity :math:`= L_c/L_p` 
    194193 
    195 .. warning:: If the sample does not possess lamellar morphology then "Compute  
    196     Parameters" will return garbage! 
    197          
    198  
    199194Volume Fraction Profile 
    200195....................... 
    … …  
    218213 
    219214The reader is directed to the references for information on these parameters. 
    220  
    221215 
    222216References 
    … …  
    269263Once the Q ranges have been set, click the "Calculate Bg" button to determine the  
    270264background level. Alternatively, enter your own value into the box. If the box turns  
    271 yellow this indicates that background subtraction has created some negative intensities.  
    272 This may still be fine provided the peak intensity is very much greater than the  
    273 background level. The important point is that the extrapolated dataset must approach  
    274 zero at high-q. 
     265yellow this indicates that background subtraction has created some negative intensities. 
    275266 
    276267Now click the "Extrapolate" button to extrapolate the data. The graph window will update  
    … …  
    305296 
    306297.. note:: 
    307     This help document was last changed by Steve King, 28Sep2017 
     298    This help document was last changed by Steve King, 26Sep2017 

  • src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst

    r577460c r959eb01  
    77 
    88:download:`Fibre_Diffraction_Review_1994_3_25-29.pdf <Fibre_Diffraction_Review_1994_3_25-29.pdf>` 
    9  
    109:download:`Fibre_Diffraction_Review_2004_12_24.pdf <Fibre_Diffraction_Review_2004_12_24.pdf>` 
    11  
    1210:download:`Fibre_Diffraction_Review_2005_13_19-22.pdf <Fibre_Diffraction_Review_2005_13_19-22.pdf>` 

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

    r5323490 rb4398819  
    28842884            self.magnetic_on = True 
    28852885            button.SetLabel("Magnetic OFF") 
    2886             m_value = 1 
     2886            m_value = 1.0e-06 
    28872887            for key in self.model.magnetic_params: 
    28882888                if key.count('M0') > 0: 
    28892889                    self.model.setParam(key, m_value) 
    2890                     m_value += 0.5 
     2890                    m_value += 0.5e-06 
    28912891        else: 
    28922892            self.magnetic_on = False 

  • src/sas/sasgui/perspectives/fitting/fitpage.py

    rba1c145 rdabcaf7  
    33    fitting  a model and one data 
    44""" 
    5 from __future__ import print_function 
    6  
    75import sys 
    86import wx 
    … …  
    12571255        if saved_pars: 
    12581256            self.get_paste_params(saved_pars) 
    1259  
    1260         # Make sure the model parameters correspond to the fit parameters 
    1261         self._update_paramv_on_fit() 
    12621257 
    12631258        if event is not None: 

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

    raba4559 raf7d2e5  
    339339        Update custom model list in the fitpage combo box 
    340340        """ 
     341        custom_model = 'Plugin Models' 
    341342        try: 
    342343            # Update edit menus 
    … …  
    346347            if not new_pmodel_list: 
    347348                return 
    348  
    349             # Redraws to a page not in focus are showing up as if they are 
    350             # in the current page tab. 
    351             current_page_index = self.fit_panel.GetSelection() 
    352             current_page = self.fit_panel.GetCurrentPage() 
    353             last_drawn_page = current_page 
    354  
    355             # Set the new plugin model list for all fit pages; anticipating 
    356             # categories, the updated plugin may be in either the form factor 
    357             # or the structure factor combo boxes 
     349            # Set the new plugin model list for all fit pages 
    358350            for uid, page in self.fit_panel.opened_pages.iteritems(): 
    359                 pbox = getattr(page, "formfactorbox", None) 
    360                 sbox = getattr(page, "structurebox", None) 
    361                 if pbox is None: 
    362                     continue 
    363  
    364                 # Set the new model list for the page 
    365                 page.model_list_box = new_pmodel_list 
    366  
    367                 # Grab names of the P and S models from the page.  Need to do 
    368                 # this before resetting the form factor box since that clears 
    369                 # the structure factor box. 
    370                 old_struct = old_form = None 
    371                 form_name = pbox.GetValue() 
    372                 struct_name = sbox.GetStringSelection() 
    373                 if form_name: 
    374                     old_form = pbox.GetClientData(pbox.GetCurrentSelection()) 
    375                 if struct_name: 
    376                     old_struct = sbox.GetClientData(sbox.GetCurrentSelection()) 
    377  
    378                 # Reset form factor combo box.  We are doing this for all 
    379                 # categories not just plugins since eventually the category 
    380                 # manager will allow plugin models to be anywhere. 
    381                 page._show_combox_helper() 
    382                 form_index = pbox.FindString(form_name) 
    383                 pbox.SetSelection(form_index) 
    384                 new_form = (pbox.GetClientData(form_index) 
    385                             if form_index != wx.NOT_FOUND else None) 
    386                 #print("form: %r"%form_name, old_form, new_form) 
    387  
    388                 # Reset structure factor combo box; even if the model list 
    389                 # hasn't changed, the model may have.  Show the structure 
    390                 # factor combobox if the selected model is a form factor. 
    391                 sbox.Clear() 
    392                 page.initialize_combox() 
    393                 if new_form is not None and getattr(new_form, 'is_form_factor', False): 
    394                     sbox.Show() 
    395                     sbox.Enable() 
    396                     page.text2.Show() 
    397                     page.text2.Enable() 
    398                 struct_index = sbox.FindString(struct_name) 
    399                 sbox.SetSelection(struct_index) 
    400                 new_struct = (sbox.GetClientData(struct_index) 
    401                               if struct_index != wx.NOT_FOUND else None) 
    402                 #print("struct: %r"%struct_name, old_struct, new_struct) 
    403  
    404                 # Update the page if P or S has changed 
    405                 if old_form != new_form or old_struct != new_struct: 
    406                     #print("triggering model update") 
    407                     page._on_select_model(keep_pars=True) 
    408                     last_drawn_page = page 
    409  
    410             # If last drawn is not the current, then switch the current to the 
    411             # last drawn then switch back.  Very ugly. 
    412             if last_drawn_page != current_page: 
    413                 for page_index in range(self.fit_panel.PageCount): 
    414                     if self.fit_panel.GetPage(page_index) == last_drawn_page: 
    415                         self.fit_panel.SetSelection(page_index) 
    416                         break 
    417                 self.fit_panel.SetSelection(current_page_index) 
    418  
     351                if hasattr(page, "formfactorbox"): 
     352                    page.model_list_box = new_pmodel_list 
     353                    mod_cat = page.categorybox.GetStringSelection() 
     354                    if mod_cat == custom_model: 
     355                        box = page.formfactorbox 
     356                        model_name = box.GetValue() 
     357                        model = (box.GetClientData(box.GetCurrentSelection()) 
     358                                 if model_name else None) 
     359                        page._show_combox_helper() 
     360                        new_index = box.FindString(model_name) 
     361                        new_model = (box.GetClientData(new_index) 
     362                                     if new_index >= 0 else None) 
     363                        if new_index >= 0: 
     364                            box.SetStringSelection(model_name) 
     365                        else: 
     366                            box.SetStringSelection('') 
     367                        if model and new_model != model: 
     368                            page._on_select_model(keep_pars=True) 
     369                    if hasattr(page, "structurebox"): 
     370                        selected_name = page.structurebox.GetStringSelection() 
     371 
     372                        page.structurebox.Clear() 
     373                        page.initialize_combox() 
     374 
     375                        index = page.structurebox.FindString(selected_name) 
     376                        if index == -1: 
     377                            index = 0 
     378                        page.structurebox.SetSelection(index) 
     379                        page._on_select_model() 
    419380        except Exception: 
    420381            logger.error("update_custom_combo: %s", sys.exc_value) 

  • src/sas/sasgui/perspectives/invariant/invariant_state.py

    re9920cd rfa412df  
    130130        my_time, date = self.timestamp 
    131131        file_name = self.file 
    132         from sas.sasview.__init__ import __version__ as sasview_version 
    133132 
    134133        state_num = int(self.saved_state['state_num']) 
    135134        state = "\n[Invariant computation for %s: " % file_name 
    136         state += "performed at %s on %s] " % (my_time, date) 
    137         state += "[SasView v%s]\n" % (sasview_version) 
     135        state += "performed at %s on %s] \n" % (my_time, date) 
    138136        state += "State No.: %d \n" % state_num 
    139137        state += "\n=== Inputs ===\n" 

  • src/sas/sasview/local_config.py

    r1b4cb41 rb229a3b  
    3333_do_aboutbox = True 
    3434_do_acknowledge = True 
    35 _do_release = True 
    3635_do_tutorial = True 
    3736_acknowledgement_preamble =\ 
    … …  
    5049_acknowledgement_citation = \ 
    5150'''M. Doucet et al. SasView Version 4.2, Zenodo, 10.5281/zenodo.1412041''' 
     51 
    5252_acknowledgement =  \ 
    53 '''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, BAM and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html 
     53'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html 
    5454''' 
    5555 
    … …  
    7676_tudelft_logo = os.path.join(icon_path, "tudelft_logo.png") 
    7777_dls_logo = os.path.join(icon_path, "dls_logo.png") 
    78 _bam_logo = os.path.join(icon_path, "bam_logo.png") 
    7978_nsf_logo = os.path.join(icon_path, "nsf_logo.png") 
    8079_danse_logo = os.path.join(icon_path, "danse_logo.png") 
    … …  
    9594_corner_image = os.path.join(icon_path, "angles_flat.png") 
    9695_welcome_image = os.path.join(icon_path, "SVwelcome.png") 
    97 _copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS and BAM" 
     96_copyright = "(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS" 
    9897marketplace_url = "http://marketplace.sasview.org/" 
    9998 
Note: See TracChangeset for help on using the changeset viewer.