Changeset e56f335 in sasview for src/sas/sasgui/guiframe

Timestamp:

Sep 14, 2017 2:28:11 PM (7 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

590b5c2

Parents:

4660990 (diff), 7b3f154 (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 4_1_issues

Location:

src/sas/sasgui/guiframe

Files:

• local_perspectives/plotting/plotting.py (modified) (2 diffs)
• config.py (modified) (1 diff)
• documentation_window.py (modified) (1 diff)

src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py

@@ -14 +14 @@
 import wx
 import sys
+from copy import deepcopy
 from sas.sasgui.guiframe.events import EVT_NEW_PLOT
 from sas.sasgui.guiframe.events import EVT_PLOT_QRANGE
@@ -275 +276 @@
                 action_check = True
             else:
+                if action_string == 'update':
+                    # Update all existing plots of data with this ID
+                    for data in event.plots:
+                        for panel in self.plot_panels.values():
+                            if data.id in panel.plots.keys():
+                                plot_exists = True
+                                # Pass each panel it's own copy of the data
+                                # that's being updated, otherwise things like
+                                # colour and line thickness are unintentionally
+                                # synced across panels
+                                self.update_panel(deepcopy(data), panel)
+                    return
+                    
                 group_id = event.group_id
-                if group_id in self.plot_panels.keys():
+                if group_id in self.plot_panels:
                     #remove data from panel
                     if action_string == 'remove':

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")