Changeset 3ae9179 in sasview for src/sas/qtgui/MainWindow/DataExplorer.py

Timestamp:

Aug 10, 2018 6:17:13 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

44777ee

Parents:

a2cc8b97

Message:

intermediate P(Q), S(Q) values are now saved in Data Explorer and are plottable

File:

• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -4 +4 @@
 import time
 import logging
+import re
 
 from PyQt5 import QtCore
@@ -36 +37 @@
     # The controller which is responsible for managing signal slots connections
     # for the gui and providing an interface to the data model.
+    theory_plot_ID_pattern = re.compile(r"^([0-9]+)\s+(\[(.*)\]\s+)?(.*)$")
 
     def __init__(self, parent=None, guimanager=None, manager=None):
@@ -504 +506 @@
                 self.active_plots[plot_id].replacePlot(plot_id, plot)
             else:
+                # Don't plot intermediate data e.g. P(Q), S(Q)
+                match = self.theory_plot_ID_pattern.match(plot_id)
+                if match and match.groups()[1] != None:
+                    continue
                 # 'sophisticated' test to generate standalone plot for residuals
                 if 'esiduals' in plot.title: