Changeset 30bed93 in sasview for src/sas/qtgui/MainWindow/DataExplorer.py

Timestamp:

Sep 21, 2018 3:41:31 AM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

c928e81

Parents:

33d5956 (diff), d8d81ea (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.

git-author:

Ingo Breßler <dev@…> (09/21/18 03:41:31)

git-committer:

GitHub <noreply@…> (09/21/18 03:41:31)

Message:

Merge pull request #181 from SasView?/ESS_GUI_poly_plot2

plot polydispersity (SASVIEW-1035 and trac ticket 17)

File:

• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -579 +579 @@
             # Don't plot intermediate results, e.g. P(Q), S(Q)
             match = GuiUtils.theory_plot_ID_pattern.match(plot.id)
-            # 2nd match group contains the identifier for the intermediate result, if present (e.g. "[P(Q)]")
+            # 2nd match group contains the identifier for the intermediate
+            # result, if present (e.g. "[P(Q)]")
             if match and match.groups()[1] != None:
                 continue
-            # Don't include plots from different fitpages, but always include the original data
-            if fitpage_name in plot.name or filename in plot.name or filename == plot.filename:
+            # Don't include plots from different fitpages,
+            # but always include the original data
+            if (fitpage_name in plot.name
+                    or filename in plot.name
+                    or filename == plot.filename):
                 # Residuals get their own plot
                 if plot.plot_role == Data1D.ROLE_RESIDUAL: