Changeset 5b144c6 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Sep 8, 2018 4:23:48 PM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

5d28d6b

Parents:

685602a

git-author:

Piotr Rozyczko <rozyczko@…> (09/08/18 16:21:23)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/08/18 16:23:48)

Message:

Clumsy fix to the single-data, multi-fitpage plotting issue SASVIEW-1018.
Fixed tests after replacing plot_dict indexing from .id to .name

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (4 diffs)
• GuiManager.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -553 +553 @@
         return item
 
-    def displayFile(self, filename=None, is_data=True):
+    def displayFile(self, filename=None, is_data=True, id=None):
         """
         Forces display of charts for the given filename
@@ -560 +560 @@
         # Now query the model item for available plots
         plots = GuiUtils.plotsFromFilename(filename, model)
-
+        # Each fitpage contains the name based on fit widget number
+        fitpage_name = "" if id is None else "M"+str(id)
         new_plots = []
         for item, plot in plots.items():
-            if not self.updatePlot(plot):
-                # 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)]")
-                if match and match.groups()[1] != None:
-                    continue
+            if self.updatePlot(plot) and filename != plot.name:
+                continue
+            # 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)]")
+            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 == plot.name:
                 # 'sophisticated' test to generate standalone plot for residuals
                 if 'esiduals' in plot.title:
@@ -579 +583 @@
             self.plotData(new_plots)
 
-    def displayData(self, data_list):
+    def displayData(self, data_list, id):
         """
         Forces display of charts for the given data set
@@ -588 +592 @@
         # the data explorer indices.
         filename = plot_to_show.filename
-        self.displayFile(filename=filename, is_data=plot_to_show.is_data)
+        self.displayFile(filename=filename, is_data=plot_to_show.is_data, id=id)
 
     def addDataPlot2D(self, plot_set, item):

src/sas/qtgui/MainWindow/GuiManager.py

@@ -921 +921 @@
             self.filesWidget.displayFile(filename=filename, is_data=True)
 
-    def showPlot(self, plot):
+    def showPlot(self, plot, id):
         """
         Pass the show plot request to the data explorer
         """
         if hasattr(self, "filesWidget"):
-            self.filesWidget.displayData(plot)
+            self.filesWidget.displayData(plot, id)
 
     def uncheckAllMenuItems(self, menuObject):