Changeset f9be147 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Sep 20, 2018 10:25:53 AM (6 years ago)

Author:

ibressler

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:

33d5956

Parents:

114c29f

git-author:

Ingo Breßler <dev@…> (09/20/18 10:24:59)

git-committer:

Ingo Breßler <dev@…> (09/20/18 10:25:53)

Message:

FittingWidget?.showTheoryPlot() should plot all matching items instead just one SASVIEW-1099

• FittingWidget?._requestPlots() to handle basic behaviour of showPlot() and showTheoryPlot(), avoiding duplicate code

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -1860 +1860 @@
         """
         # Show the chart if ready
-        data_to_show = self.model_data
         if self.theory_item is None:
             self.recalculatePlotData()
-        else:
-            self.communicate.plotRequestedSignal.emit([self.theory_item, data_to_show], self.tab_id)
+            return
+        if self.model_data:
+            self._requestPlots(self.model_data.filename, self.theory_item.model())
 
     def showPlot(self):
@@ -1874 +1874 @@
         # Any models for this page
         current_index = self.all_data[self.data_index]
-        fitpage_name = "" if id is None else "M"+str(self.tab_id)
-        plots = GuiUtils.plotsFromFilename(self.data.filename, current_index.model())
+        item = self._requestPlots(self.data.filename, current_index.model())
+        if item:
+            # fit+data has not been shown - show just data
+            self.communicate.plotRequestedSignal.emit([item, data_to_show], self.tab_id)
+
+    def _requestPlots(self, item_name, item_model):
+        """
+        Emits plotRequestedSignal for all plots found in the given model under the provided item name.
+        """
+        fitpage_name = "" if self.tab_id is None else "M"+str(self.tab_id)
+        plots = GuiUtils.plotsFromFilename(item_name, item_model)
         # Has the fitted data been shown?
         data_shown = False
-        #for plot in plots:
+        item = None
         for item, plot in plots.items():
             if fitpage_name in plot.name:
                 data_shown = True
                 self.communicate.plotRequestedSignal.emit([item, plot], self.tab_id)
-        if not data_shown:
-            # fit+data has not been shown - show just data
-            self.communicate.plotRequestedSignal.emit([item, data_to_show], self.tab_id)
+        # return the last data item seen, if nothing was plotted; supposed to be just data)
+        return None if data_shown else item
 
     def onOptionsUpdate(self):