Changeset 49e000b in sasview


Ignore:
Timestamp:
Oct 10, 2016 6:43:16 PM (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:
278178b
Parents:
3e1c9e5
Message:

Added TU Delft logo to About box aswell, and Acknowledgement. Closes
#692

Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • sasview/local_config.py

    radb0851 r49e000b  
    4343_acknowledgement_publications = \ 
    4444'''This work benefited from the use of the SasView application, originally developed under NSF Award  
    45 DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 research  
    46 and innovation programme under the SINE2020 project Grant No 654000 and by Adam Washington.''' 
     45DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme  
     46under the SINE2020 project Grant No 654000, and by Patrick O'Brien & Adam Washington.''' 
    4747 
    4848_acknowledgement =  \ 
    49 '''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547, but is currently maintained by a  
    50 collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL and ANSTO. SasView also contains code developed with funding from the EU Horizon 2020  
    51 research and innovation programme under the SINE2020 project (Grant No 654000) and by Adam Washington (corfunc-py).''' 
     49'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547, but is currently maintained  
     50by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft. SasView also contains code developed with funding from the  
     51EU Horizon 2020 programme under the SINE2020 project (Grant No 654000), and by Patrick O'Brien (pycrust) and Adam Washington (corfunc-py).''' 
    5252 
    5353_homepage = "http://www.sasview.org" 
    … …  
    7171_ill_logo = os.path.join(icon_path, "ill_logo.png") 
    7272_ansto_logo = os.path.join(icon_path, "ansto_logo.png") 
     73_tudelft_logo = os.path.join(icon_path, "tudelft_logo.png") 
    7374_nsf_logo = os.path.join(icon_path, "nsf_logo.png") 
    7475_danse_logo = os.path.join(icon_path, "danse_logo.png") 
    … …  
    8384_ill_url = "http://www.ill.eu/" 
    8485_ansto_url = "http://www.ansto.gov.au/" 
     86_tudelft_url = "http://www.tnw.tudelft.nl/en/cooperation/facilities/reactor-instituut-delft/" 
    8587_danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html" 
    8688_inst_url = "http://www.utk.edu" 
    8789_corner_image = os.path.join(icon_path, "angles_flat.png") 
    8890_welcome_image = os.path.join(icon_path, "SVwelcome.png") 
    89 _copyright = "(c) 2009 - 2016, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL and ANSTO" 
     91_copyright = "(c) 2009 - 2016, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft" 
    9092marketplace_url = "http://marketplace.sasview.org/" 
    9193 

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

    re0f28e6 r49e000b  
    117117        self.bitmap_button_ill = wx.BitmapButton(self, -1, wx.NullBitmap) 
    118118        self.bitmap_button_ansto = wx.BitmapButton(self, -1, wx.NullBitmap) 
     119        self.bitmap_button_tudelft = wx.BitmapButton(self, -1, wx.NullBitmap) 
    119120         
    120121        self.static_line_3 = wx.StaticLine(self, -1) 
    … …  
    135136        self.Bind(wx.EVT_BUTTON, self.onIllLogo, self.bitmap_button_ill) 
    136137        self.Bind(wx.EVT_BUTTON, self.onAnstoLogo, self.bitmap_button_ansto) 
     138        self.Bind(wx.EVT_BUTTON, self.onTudelftLogo, self.bitmap_button_tudelft) 
    137139        # end wxGlade 
    138140        # fill in acknowledgements 
    … …  
    221223        logo = wx.Bitmap(image) 
    222224        self.bitmap_button_ansto.SetBitmapLabel(logo) 
     225         
     226        image = file_dir + "/images/tudelft_logo.png" 
     227        if os.path.isfile(config._tudelft_logo): 
     228            image = config._tudelft_logo 
     229        logo = wx.Bitmap(image) 
     230        self.bitmap_button_tudelft.SetBitmapLabel(logo) 
    223231                 
    224232        # resize dialog window to fit version number nicely 
    … …  
    251259        self.bitmap_button_ill.SetSize(self.bitmap_button_ill.GetBestSize()) 
    252260        self.bitmap_button_ansto.SetSize(self.bitmap_button_ansto.GetBestSize()) 
     261        self.bitmap_button_tudelft.SetSize(self.bitmap_button_tudelft.GetBestSize()) 
    253262        # end wxGlade 
    254263 
    … …  
    314323        sizer_logos.Add(self.bitmap_button_ansto, 0,  
    315324                        wx.LEFT|wx.ADJUST_MINSIZE, 2) 
     325        sizer_logos.Add(self.bitmap_button_tudelft, 0,  
     326                        wx.LEFT|wx.ADJUST_MINSIZE, 2) 
    316327                 
    317328        sizer_logos.Add((10, 50), 0, wx.ADJUST_MINSIZE, 0) 
    … …  
    405416        event.Skip() 
    406417 
     418    def onTudelftLogo(self, event): 
     419        """ 
     420        """  
     421        # wxGlade: DialogAbout.<event_handler> 
     422        launchBrowser(config._tudelft_url) 
     423        event.Skip() 
     424 
    407425# end of class DialogAbout 
    408426 
Note: See TracChangeset for help on using the changeset viewer.