Changeset 83eff66 in sasview for src/sas/guiframe

Timestamp:

Feb 19, 2015 4:09:00 AM (10 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:

66f21cd, 27ab091

Parents:

f53cd30 (diff), 5e326a6 (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.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview/

Location:

src/sas/guiframe

Files:

• media/graph_help.rst (modified) (1 diff)
• report_dialog.py (added)
• acknowledgebox.py (added)
• config.py (modified) (1 diff)
• gui_manager.py (modified) (2 diffs)

src/sas/guiframe/media/graph_help.rst

@@ -286 +286 @@
 
 1D data can be saved in either ASCII text (.TXT) or CanSAS/SASXML (.XML) 
-formats (see 1D_Formats_). 2D data can only be saved in the NIST 2D format 
-(.DAT) (see 2D_Formats_).
+formats (see :ref:`1D_Formats`).
+
+2D data can only be saved in the NIST 2D format (.DAT) (see :ref:`2D_Formats`).
 
 .. _Linear_Fit:

src/sas/guiframe/config.py

@@ -26 +26 @@
 # About box info
 _do_aboutbox = True
+_do_acknowledge = True
 _do_tutorial = True
+_acknowledgement_preamble =\
+'''If you found this software useful to your work please remember to acknowledge 
+its use in your publications as suggested below and reference the SasView website: 
+http://www.sasview.org/index.html. Please also consider letting us know by sending us the 
+reference to your work. This will help us to ensure the long term support and 
+development of the software.
+'''
+_acknowledgement_publications = \
+'''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.
+'''
 _acknowledgement =  \
 '''This software was developed by the University of Tennessee as part of the

src/sas/guiframe/gui_manager.py

@@ -1351 +1351 @@
             wx.EVT_MENU(self, id, self._onTutorial)
             
+        if config._do_acknowledge:
+            self._help_menu.AppendSeparator()
+            self._help_menu.Append(id, '&Acknowledge', 'Acknowledging SasView')
+            wx.EVT_MENU(self, id, self._onAcknowledge)
+        
         if config._do_aboutbox:
             self._help_menu.AppendSeparator()
@@ -2098 +2103 @@
                 self.SetStatusText(msg)
                     
+    def _onAcknowledge(self, evt):
+        """
+        Pop up the acknowledge dialog
+        
+        :param evt: menu event
+        
+        """
+        if config._do_acknowledge:
+            import sas.guiframe.acknowledgebox as AcknowledgeBox
+            dialog = AcknowledgeBox.DialogAcknowledge(None, -1, "")
+            dialog.ShowModal()
+                     
     def _onAbout(self, evt):
         """