Changeset 0ea31ca in sasview


Ignore:
Timestamp:
Mar 18, 2015 9:18:11 AM (9 years ago)
Author:
krzywon
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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
2eeca83
Parents:
682c432
Message:

Changed the version number to 3.1.0and reworked the acknowledge panel
for a better look and feel.

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • sasview.latestversion

    r79492222 r0ea31ca  
    1 3.0.0 
     13.1.0 
  • sasview/__init__.py

    rd859737 r0ea31ca  
    1 __version__ = "3.0.0" 
     1__version__ = "3.1.0" 
    22__build__ = "1" 
    33try: 
  • sasview/local_config.py

    r418e59f r0ea31ca  
    3232_do_tutorial = True 
    3333_acknowledgement_preamble =\ 
    34 '''If you found this software useful to your work please remember to acknowledge  
    35 its use in your publications as suggested below and reference the SasView website:  
    36 http://www.sasview.org/. Please also consider letting us know by sending us the  
    37 reference to your work. This will help us to ensure the long term support and  
    38 development of the software. 
    39 ''' 
     34'''To ensure the long term support and development of this software please''' +\ 
     35''' remember to do the following.''' 
     36_acknowledgement_preamble_bullet1 =\ 
     37'''Acknowledge its use in your publications as suggested below''' 
     38_acknowledgement_preamble_bullet2 =\ 
     39'''Reference the following website: http://www.sasview.org''' 
     40_acknowledgement_preamble_bullet3 =\ 
     41'''Send us your reference for our records: sansdanse@gmail.com''' 
    4042_acknowledgement_publications = \ 
    41 '''This work benefited from software developed by the DANSE project under NSF  
    42 award DMR-0520547 and currently maintained by NIST, UMD, ORNL, ISIS, ESS  
    43 and ILL. 
     43'''This work benefited from the use of the SasView application, originally  
     44developed under NSF award DMR-0520547. 
    4445''' 
    4546_acknowledgement =  \ 
  • src/sas/guiframe/acknowledgebox.py

    rf53cd30 r0ea31ca  
    99 
    1010import wx 
     11import wx.richtext 
    1112import wx.lib.hyperlink 
    1213import random 
     
    4445         
    4546        self.ack = wx.TextCtrl(self, style=wx.TE_LEFT|wx.TE_MULTILINE|wx.TE_BESTWRAP|wx.TE_READONLY|wx.TE_NO_VSCROLL) 
    46         self.ack.SetBackgroundColour(wx.NullColour) 
    4747        self.ack.SetValue(config._acknowledgement_publications) 
    48         self.ack.SetMinSize((-1,60)) 
     48        self.ack.SetMinSize((-1,55)) 
    4949        self.preamble = wx.StaticText(self, -1, config._acknowledgement_preamble) 
     50        items = [config._acknowledgement_preamble_bullet1, 
     51                 config._acknowledgement_preamble_bullet2, 
     52                 config._acknowledgement_preamble_bullet3] 
     53        self.list1 = wx.StaticText(self, -1, "\t(1) " + items[0]) 
     54        self.list2 = wx.StaticText(self, -1, "\t(2) " + items[1]) 
     55        self.list3 = wx.StaticText(self, -1, "\t(3) " + items[2]) 
    5056        self.static_line = wx.StaticLine(self, 0) 
    51          
    5257        self.__set_properties() 
    5358        self.__do_layout() 
     
    5762        """ 
    5863        # begin wxGlade: DialogAbout.__set_properties 
     64        self.preamble.SetFont(wx.Font(11, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) 
     65        self.preamble.SetFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) 
    5966        self.SetTitle("Acknowledging SasView") 
    60         self.SetSize((500, 225)) 
     67        self.SetSize((525, 225)) 
    6168        # end wxGlade 
    6269 
     
    6774        sizer_main = wx.BoxSizer(wx.VERTICAL) 
    6875        sizer_titles = wx.BoxSizer(wx.VERTICAL) 
    69         sizer_titles.Add(self.preamble, 0, wx.ALL|wx.EXPAND, 0) 
    70         sizer_titles.Add(self.static_line, 0, wx.EXPAND, 0) 
    71         sizer_titles.Add(self.ack, 0, wx.ALL|wx.EXPAND, 0) 
     76        sizer_titles.Add(self.preamble, 0, wx.ALL|wx.EXPAND, 5) 
     77        sizer_titles.Add(self.list1, 0, wx.ALL|wx.EXPAND, 5) 
     78        sizer_titles.Add(self.list2, 0, wx.ALL|wx.EXPAND, 5) 
     79        sizer_titles.Add(self.list3, 0, wx.ALL|wx.EXPAND, 5) 
     80        sizer_titles.Add(self.static_line, 0, wx.ALL|wx.EXPAND, 0) 
     81        sizer_titles.Add(self.ack, 0, wx.ALL|wx.EXPAND, 5) 
    7282        sizer_main.Add(sizer_titles, -1, wx.ALL|wx.EXPAND, 5) 
    7383        self.SetAutoLayout(True) 
  • src/sas/guiframe/config.py

    r4bf54044 r0ea31ca  
    2929_do_tutorial = True 
    3030_acknowledgement_preamble =\ 
    31 '''If you found this software useful to your work please remember to acknowledge  
    32 its use in your publications as suggested below and reference the SasView website:  
    33 http://www.sasview.org/. Please also consider letting us know by sending us the  
    34 reference to your work. This will help us to ensure the long term support and  
    35 development of the software. 
    36 ''' 
     31'''To ensure the long term support and development of this software please''' +\ 
     32''' remember to do the following.''' 
     33_acknowledgement_preamble_bullet1 =\ 
     34'''Acknowledge its use in your publications as suggested below''' 
     35_acknowledgement_preamble_bullet2 =\ 
     36'''Reference the following website: http://www.sasview.org''' 
     37_acknowledgement_preamble_bullet3 =\ 
     38'''Send us your reference for our records: sansdanse@gmail.com''' 
    3739_acknowledgement_publications = \ 
    38 '''This work benefited from software developed by the DANSE project under NSF  
    39 award DMR-0520547 and currently maintained by NIST, UMD, ORNL, ISIS, ESS  
    40 and ILL. 
     40'''This work benefited from the use of the SasView application, originally  
     41developed under NSF award DMR-0520547. 
    4142''' 
    4243_acknowledgement =  \ 
    43 '''This software was developed by the University of Tennessee as part of the 
    44 Distributed Data Analysis of Neutron Scattering Experiments (DANSE) 
    45 project funded by the US National Science Foundation.  
     44'''This work originally developed as part of the DANSE project funded by the NSF 
     45under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS  
     46and ILL. 
    4647 
    4748''' 
Note: See TracChangeset for help on using the changeset viewer.