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

Timestamp:

Aug 13, 2018 9:48:38 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:

e752ab8

Parents:

6b3a231

Message:

allow for only P(Q) or S(Q) to be present in intermediate results; improve comments

File:

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

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -37 +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+)?(.*)$")
 
@@ -506 +513 @@
                 self.active_plots[plot_id].replacePlot(plot_id, plot)
             else:
-                # Don't plot intermediate data e.g. P(Q), S(Q)
+                # 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