Changeset 82d88d5 in sasview for src/sas/sasview

Timestamp:

Mar 6, 2019 4:18:09 PM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

f923967

Parents:

cb64d86 (diff), f205d3a (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' into py37-sasgui

Location:

src/sas/sasview

Files:

• __init__.py (modified) (1 diff)
• local_config.py (modified) (4 diffs)
• test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (deleted)
• test/1d_data/FK403_0006_Nika.hdf (added)
• test/1d_data/Lew_Sa3_DSM_QinA.h5 (added)
• test/1d_data/VTMA.h5 (added)
• test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (deleted)
• test/2d_data/BAM_2D.h5 (added)
• sasview.py (modified) (2 diffs)
• welcome_panel.py (modified) (2 diffs)
• wxcruft.py (modified) (2 diffs)

src/sas/sasview/__init__.py

@@ -1 @@
-__version__ = "4.2.0"
+from distutils.version import StrictVersion
+__version__ = "4.2.1"
+StrictVersion(__version__)
+__DOI__ = "Zenodo, 10.5281/zenodo.2561236"
+__release_date__ = "2019"
 __build__ = "GIT_COMMIT"

src/sas/sasview/local_config.py

@@ -16 +16 @@
 __appname__ = "SasView"
 __version__ = sas.sasview.__version__
+__DOI__ = sas.sasview.__DOI__
+__release_date__ = sas.sasview.__release_date__
 __build__ = sas.sasview.__build__
 __download_page__ = 'https://github.com/SasView/sasview/releases'
@@ -36 +38 @@
 _do_tutorial = True
 _acknowledgement_preamble =\
-'''To ensure the long term support and development of this software please''' +\
-''' remember to:'''
+'''To ensure the long term support and development of this software please
+remember to:'''
 _acknowledgement_preamble_bullet1 =\
 '''Acknowledge its use in your publications as :'''
@@ -47 +49 @@
 '''Send us your reference for our records: developers@sasview.org'''
 _acknowledgement_publications = \
-'''This work benefited from the use of the SasView application, originally developed under NSF Award DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project Grant No 654000.'''
+("This work benefited from the use of the SasView application, originally"
+"developed under NSF Award DMR-0520547. SasView also contains code developed"
+"with funding from the EU Horizon 2020 programme under the SINE2020 project"
+"Grant No 654000.")
 _acknowledgement_citation = \
-'''M. Doucet et al. SasView Version 4.2, Zenodo, 10.5281/zenodo.1412041'''
+'''M. Doucet et al. SasView Version %s, %s''' % (__version__, __DOI__)
 _acknowledgement =  \
-'''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, BAM 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
-'''
+("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, BAM 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")
 
 _homepage = "http://www.sasview.org"
@@ -95 +105 @@
 _corner_image = os.path.join(icon_path, "angles_flat.png")
 _welcome_image = os.path.join(icon_path, "SVwelcome.png")
-_copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS and BAM"
+_copyright = ("(c) 2009 - %s, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO,"
+              "TU Delft, DLS and BAM") % __release_date__
 marketplace_url = "http://marketplace.sasview.org/"
 

src/sas/sasview/sasview.py

@@ -42 +42 @@
 
         from sas.sasgui.guiframe.gui_manager import SasViewApp
+        from sas.sasgui.guiframe.gui_style import GUIFRAME_ICON
         self.gui = SasViewApp(0)
+        GUIFRAME_ICON.load_icons()
         if sys.platform == "darwin":
             self.check_sasmodels_compiler()
@@ -228 +230 @@
         logger.error("Wx version: error reading version")
 
-    from . import wxcruft
-    wxcruft.call_later_fix()
+    # TODO: Do we need the call later fix for wx 3? Or is it wx < 3 only?
+    if "phoenix" in wx.PlatformInfo:
+        #wx.NewId = wx.Window.NewControlId
+        pass
+    else:
+        from . import wxcruft
+        wxcruft.call_later_fix()
     #wxcruft.trace_new_id()
     #Always use private .matplotlib setup to avoid conflicts with other

src/sas/sasview/welcome_panel.py

@@ -2 +2 @@
     Welcome page
 """
-import wx
-import wx.aui
-import wx.lib.hyperlink
 import os.path
 import os, sys
 
+import wx
+import wx.aui
+try:
+    # CRUFT: wx 4 moved hyperlink to wx.lib.agw
+    from wx.lib import hyperlink
+except ImportError:
+    from wx.lib.agw import hyperlink
 from wx.lib.scrolledpanel import ScrolledPanel
 
@@ -115 +119 @@
         send_ticket += "help@sasview.org"
         self.hyperlink_paper = \
-            wx.lib.hyperlink.HyperLinkCtrl(self, -1,
+            hyperlink.HyperLinkCtrl(self, -1,
                                            send_ticket, URL=config._license)
 

src/sas/sasview/wxcruft.py

@@ -4 +4 @@
 import wx
 from wx import Timer
-import wx._misc
 
 def call_later_fix():
@@ -16 +15 @@
 
 def NewId():
+    import wx._misc
     id = wx._misc.NewId()
     path, line, function = _get_caller()