Changeset 1452132 in sasview

Timestamp:

Aug 23, 2012 4:13:24 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

f9d8cd5

Parents:

754c436

Message:

About menu: added nist umd sns logos

Files:

• sansguiframe/src/sans/guiframe/aboutbox.py (modified) (6 diffs)
• sansview/images/nist_logo.png (added)
• sansview/images/sns_logo.png (added)
• sansview/images/umd_logo.png (added)
• sansview/local_config.py (modified) (4 diffs)

sansguiframe/src/sans/guiframe/aboutbox.py

@@ -104 +104 @@
                                                    config._acknowledgement)
         self.static_line_2 = wx.StaticLine(self, -1)
+        self.bitmap_button_nist = wx.BitmapButton(self, -1, wx.NullBitmap)
+        self.bitmap_button_umd = wx.BitmapButton(self, -1, wx.NullBitmap)
+        self.bitmap_button_sns = wx.BitmapButton(self, -1, wx.NullBitmap)
         self.bitmap_button_nsf = wx.BitmapButton(self, -1,
                                                  wx.NullBitmap)
@@ -113 +116 @@
         self.__set_properties()
         self.__do_layout()
-
+        
+        self.Bind(wx.EVT_BUTTON, self.onNistLogo, self.bitmap_button_nist)
+        self.Bind(wx.EVT_BUTTON, self.onUmdLogo, self.bitmap_button_umd)
+        self.Bind(wx.EVT_BUTTON, self.onSnsLogo, self.bitmap_button_sns)
         self.Bind(wx.EVT_BUTTON, self.onNsfLogo, self.bitmap_button_nsf)
         self.Bind(wx.EVT_BUTTON, self.onDanseLogo, self.bitmap_button_danse)
@@ -137 +143 @@
         
         # set bitmaps for logo buttons
+        image = file_dir + "/images/nist_logo.png"
+        if os.path.isfile(config._nist_logo):
+            image = config._nist_logo
+        logo = wx.Bitmap(image)        
+        self.bitmap_button_nist.SetBitmapLabel(logo)
+        
+        image = file_dir + "/images/umd_logo.png"
+        if os.path.isfile(config._umd_logo):
+            image = config._umd_logo
+        logo = wx.Bitmap(image)        
+        self.bitmap_button_umd.SetBitmapLabel(logo)
+
+        
+        image = file_dir + "/images/sns_logo.png"
+        if os.path.isfile(config._sns_logo):
+            image = config._sns_logo
+        logo = wx.Bitmap(image)        
+        self.bitmap_button_sns.SetBitmapLabel(logo)
+        
         image = file_dir + "/images/nsf_logo.png"
         if os.path.isfile(config._nsf_logo):
@@ -173 +198 @@
                                            wx.NORMAL, 0, ""))
         self.hyperlink_paper.Enable(True)
+        self.bitmap_button_nist.SetSize(self.bitmap_button_nist.GetBestSize())
+        self.bitmap_button_umd.SetSize(self.bitmap_button_umd.GetBestSize())
+        self.bitmap_button_sns.SetSize(self.bitmap_button_sns.GetBestSize())
         self.bitmap_button_nsf.SetSize(self.bitmap_button_nsf.GetBestSize())
         self.bitmap_button_danse.SetSize(self.bitmap_button_danse.GetBestSize())
@@ -216 +244 @@
                        wx.LEFT|wx.TOP|wx.BOTTOM|wx.ADJUST_MINSIZE, 7)
         sizer_main.Add(self.static_line_2, 0, wx.EXPAND, 0)
+        sizer_logos.Add(self.bitmap_button_nist, 0, wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        sizer_logos.Add(self.bitmap_button_umd, 0, wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        sizer_logos.Add(self.bitmap_button_sns, 0, wx.LEFT|wx.ADJUST_MINSIZE, 2)
         sizer_logos.Add(self.bitmap_button_nsf, 0, wx.LEFT|wx.ADJUST_MINSIZE, 2)
         sizer_logos.Add(self.bitmap_button_danse, 0,
@@ -233 +264 @@
         # end wxGlade
 
+    def onNistLogo(self, event): 
+        """
+        """
+        # wxGlade: DialogAbout.<event_handler>
+        launchBrowser(config._nist_url)
+        event.Skip()
+        
+    def onUmdLogo(self, event): 
+        """
+        """
+        # wxGlade: DialogAbout.<event_handler>
+        launchBrowser(config._umd_url)
+        event.Skip()
+        
+    def onSnsLogo(self, event): 
+        """
+        """
+        # wxGlade: DialogAbout.<event_handler>
+        launchBrowser(config._sns_url)
+        event.Skip()
+                
     def onNsfLogo(self, event): 
         """

sansview/local_config.py

@@ -30 +30 @@
 _do_tutorial = True
 _acknowledgement =  \
-'''This software was developed by the University of Tennessee as part of the
-Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
-project funded by the US National Science Foundation. 
+'''This work originally developed as part of the DANSE project funded by the NSF
+under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS 
+and ILL.
 
 '''
@@ -38 +38 @@
 _download = "https://sourceforge.net/projects/sansviewproject/"
 _authors = []
-_paper = "http://danse.us/trac/sans/newticket"
-_license = "mailto:sansdanse@gmail.com"
+_paper = "http://sourceforge.net/apps/trac/sansviewproject/report"
+_license = "mailto:sansviewproject-developers@lists.sourceforge.net"
 
 
@@ -47 +47 @@
 test_path =  os.path.abspath(os.path.join(os.path.dirname(__file__), "test"))
 
+_nist_logo = "images/nist_logo.png"
+_umd_logo = "images/umd_logo.png"
+_sns_logo = "images/sns_logo.png"
 _nsf_logo = os.path.join(icon_path, "nsf_logo.png")
 _danse_logo = os.path.join(icon_path, "danse_logo.png")
 _inst_logo = os.path.join(icon_path, "utlogo.gif")
+_nist_url = "http://www.nist.gov/"
+_umd_url = "http://www.umd.edu/"
+_sns_url = "http://neutrons.ornl.gov/"
 _nsf_url = "http://www.nsf.gov"
 _danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html"
@@ -55 +61 @@
 _corner_image = os.path.join(icon_path, "angles_flat.png")
 _welcome_image = os.path.join(icon_path, "SVwelcome.png")
-_copyright = "(c) 2009 - 2012, University of Tennessee"
+_copyright = "(c) 2009 - 2011, University of Tennessee \n"
+_copyright += "(c) 2012, UMD, NIST, ORNL, ISIS, ESS and ILL"