Changeset acdf0d1 in sasview for src/sas/sasgui


Ignore:
Timestamp:
Sep 27, 2018 12:37:09 PM (6 years ago)
Author:
GitHub <noreply@…>
Branches:
master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload
Children:
490f790
Parents:
dcca58d (diff), 9c7e2b8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Paul Butler <butlerpd@…> (09/27/18 12:37:09)
git-committer:
GitHub <noreply@…> (09/27/18 12:37:09)
Message:

Merge pull request #183 from SasView?/bad_file_loader_fix

Continue loading data files if a single file cannot be loaded.

Tested and works "perfectly"

Location:
src/sas/sasgui
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

    r2924532 r9c7e2b8  
    182182                file_errors[basename] = [log_msg] 
    183183                continue 
    184  
    185184            try: 
    186185                message = "Loading {}...\n".format(p_file) 
    … …  
    204203                self.load_update(message="Loaded {}\n".format(p_file), 
    205204                                 info="info") 
    206  
    207205            except NoKnownLoaderException as e: 
    208206                exception_occurred = True 
    209                 error_message = "Loading data failed!\n" + e.message 
    210                 self.load_complete(output=None, 
    211                                    message=error_message, 
    212                                    info="warning") 
    213  
     207                error_message = "Loading data failed!" + e.message 
     208                file_errors[basename] = [error_message] 
    214209            except Exception as e: 
    215210                exception_occurred = True 
    … …  
    220215                file_err += " following:\n" 
    221216                file_err += e.message 
    222                 self.load_complete(output=None, 
    223                                    message=file_err, 
    224                                    info="error") 
     217                file_errors[basename] = [file_err] 
    225218 
    226219        if len(file_errors) > 0: 
    … …  
    231224                for message in error_array: 
    232225                    error_message += message + "\n" 
    233                 error_message = error_message[:-1] 
    234226            self.load_complete(output=output, 
    235227                               message=error_message, 

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

    r1efbc190 r8ac05a5  
    3333_do_aboutbox = True 
    3434_do_acknowledge = True 
     35_do_release = True 
    3536_do_tutorial = True 
    3637_acknowledgement_preamble =\ 
    … …  
    4950_acknowledgement_citation = \ 
    5051'''M. Doucet et al. SasView Version 4.1.2, Zenodo, 10.5281/zenodo.825675''' 
    51  
    5252_acknowledgement =  \ 
    5353'''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 
    … …  
    9494_corner_image = os.path.join(icon_path, "angles_flat.png") 
    9595_welcome_image = os.path.join(icon_path, "SVwelcome.png") 
    96 _copyright = "(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS" 
     96_copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS" 
    9797marketplace_url = "http://marketplace.sasview.org/" 
    9898 

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

    r5f08251 r8ac05a5  
    12761276 
    12771277        wx_id = wx.NewId() 
    1278         self._help_menu.Append(wx_id, '&Documentation', '') 
     1278        self._help_menu.Append(wx_id, '&Documentation', 'Help documentation for SasView') 
    12791279        wx.EVT_MENU(self, wx_id, self._onSphinxDocs) 
    12801280 
    … …  
    12831283            # Pluralised both occurences of 'Tutorial' in the line below 
    12841284            # S King, Sep 2018 
    1285             self._help_menu.Append(wx_id, '&Tutorials', 'Software tutorials') 
     1285            self._help_menu.Append(wx_id, '&Tutorials', 'Tutorials on how to use SasView') 
    12861286            wx.EVT_MENU(self, wx_id, self._onTutorial) 
     1287 
     1288        if config.marketplace_url: 
     1289            wx_id = wx.NewId() 
     1290            self._help_menu.Append(wx_id, '&Model marketplace', 'Plug-in fitting models for SasView') 
     1291            wx.EVT_MENU(self, wx_id, self._on_marketplace_click) 
     1292 
     1293        if config._do_release: 
     1294            wx_id = wx.NewId() 
     1295            self._help_menu.Append(wx_id, '&Release notes', 
     1296                                   'SasView release notes and known issues') 
     1297            wx.EVT_MENU(self, wx_id, self._onRelease) 
    12871298 
    12881299        if config._do_acknowledge: 
    … …  
    12951306            logger.info("Doing help menu") 
    12961307            wx_id = wx.NewId() 
    1297             self._help_menu.Append(wx_id, '&About', 'Software information') 
     1308            self._help_menu.Append(wx_id, '&About', 'Information about SasView') 
    12981309            wx.EVT_MENU(self, wx_id, self._onAbout) 
    1299  
    1300         if config.marketplace_url: 
    1301             wx_id = wx.NewId() 
    1302             self._help_menu.Append(wx_id, '&Model marketplace', '') 
    1303             wx.EVT_MENU(self, wx_id, self._on_marketplace_click) 
    13041310 
    13051311        # Checking for updates 
    … …  
    21382144            dialog = AboutBox.DialogAbout(None, -1, "") 
    21392145            dialog.ShowModal() 
     2146 
     2147    def _onRelease(self, evt): 
     2148        """ 
     2149        Pop up the release notes 
     2150 
     2151        :param evt: menu event 
     2152 
     2153        """ 
     2154        # S King, Sep 2018 
     2155 
     2156        from documentation_window import DocumentationWindow 
     2157        _TreeLocation = "user/release.html" 
     2158        DocumentationWindow(self, -1, _TreeLocation, "", 
     2159                            "SasView Documentation") 
    21402160 
    21412161    def _onTutorial(self, evt): 

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

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

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

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

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

    r959eb01 r577460c  
    77 
    88:download:`Fibre_Diffraction_Review_1994_3_25-29.pdf <Fibre_Diffraction_Review_1994_3_25-29.pdf>` 
     9 
    910:download:`Fibre_Diffraction_Review_2004_12_24.pdf <Fibre_Diffraction_Review_2004_12_24.pdf>` 
     11 
    1012:download:`Fibre_Diffraction_Review_2005_13_19-22.pdf <Fibre_Diffraction_Review_2005_13_19-22.pdf>` 
Note: See TracChangeset for help on using the changeset viewer.