Changeset 6d62b7f in sasview for src/sas/sasgui/guiframe

Timestamp:

Sep 17, 2017 11:52:57 PM (7 years ago)

Author:

butler

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

13374be

Parents:

ae69c690 (diff), cfd27dd (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 remote-tracking branch 'origin/master' into 4_1_issues

Location:

src/sas/sasgui/guiframe

Files:

• images/angles.png (deleted)
• images/angles_flat.png (deleted)
• images/ansto_logo.png (deleted)
• images/danse_logo.png (deleted)
• images/ess_logo.png (deleted)
• images/ill_logo.png (deleted)
• images/isis_logo.png (deleted)
• images/nist_logo.png (deleted)
• images/nsf_logo.png (deleted)
• images/ornl_logo.png (deleted)
• images/sns_logo.png (deleted)
• images/tudelft_logo.png (deleted)
• images/umd_logo.png (deleted)
• images/utlogo.gif (deleted)
• config.py (modified) (1 diff)
• documentation_window.py (modified) (1 diff)

src/sas/sasgui/guiframe/config.py

@@ -48 +48 @@
 '''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.1, Zenodo, 10.5281/zenodo.438138'''
+'''M. Doucet et al. SasView Version 4.1.2, Zenodo, 10.5281/zenodo.825675'''
 
 _acknowledgement =  \

src/sas/sasgui/guiframe/documentation_window.py

@@ -75 +75 @@
             logger.error("Could not find Sphinx documentation at %s \
             -- has it been built?", file_path)
-        elif WX_SUPPORTS_HTML2:
-            # Complete HTML/CSS support!
-            self.view = html.WebView.New(self)
-            self.view.LoadURL(url)
-            self.Show()
+        #Commenting following 5 lines, so default browser is forced
+        #This is due to CDN mathjax discontinuation of service, intenal help
+        #browser should be back with qt version
+        #Note added by Wojtek Potrzebowski, July 4th 2017
+        # elif WX_SUPPORTS_HTML2:
+        #     # Complete HTML/CSS support!
+        #     self.view = html.WebView.New(self)
+        #     self.view.LoadURL(url)
+        #     self.Show()
         else:
             logger.error("No html2 support, popping up a web browser")