Changeset ecfe6b6 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Aug 13, 2018 10:02:02 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:

799963c

Parents:

4e255d1 (diff), e752ab8 (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 'ESS_GUI_iss976' into ESS_GUI.

SASVIEW-976: Make intermediate data from product models (i.e. P(Q) and S(Q)) plottable.

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (3 diffs)
• DataManager.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.
+
+    # This matches the ID of a plot created using FittingLogic._create1DPlot, e.g.
+    # "5 [P(Q)] modelname"
+    # or
+    # "4 modelname".
+    # Useful for determining whether the plot in question is for an intermediate result, such as P(Q) or S(Q) in the
+    # case of a product model; the identifier for this is held in square brackets, as in the example above.
+    theory_plot_ID_pattern = re.compile(r"^([0-9]+)\s+(\[(.*)\]\s+)?(.*)$")
 
     def __init__(self, parent=None, guimanager=None, manager=None):
@@ -525 +534 @@
                 self.active_plots[plot_id].replacePlot(plot_id, plot)
             else:
+                # Don't plot intermediate results, e.g. P(Q), S(Q)
+                match = self.theory_plot_ID_pattern.match(plot_id)
+                # 2nd match group contains the identifier for the intermediate result, if present (e.g. "[P(Q)]")
+                if match and match.groups()[1] != None:
+                    continue
                 # 'sophisticated' test to generate standalone plot for residuals
                 if 'esiduals' in plot.title:

src/sas/qtgui/MainWindow/DataManager.py

@@ -24 +24 @@
 import json
 import time
-from io import StringIO
+from io import BytesIO
 import numpy as np
 
@@ -368 +368 @@
             # ndarray
             if isinstance(o, np.ndarray):
-                buffer = StringIO()
+                buffer = BytesIO()
                 np.save(buffer, o)
                 buffer.seek(0)
@@ -435 +435 @@
             # ndarray
             if cls == np.ndarray:
-                buffer = StringIO()
+                buffer = BytesIO()
                 buffer.write(data['data'].encode('latin-1'))
                 buffer.seek(0)