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

Timestamp:

May 2, 2017 9:04:48 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

02ddfb4

Parents:

0a6e097

Message:

Compute/Show? Plot button logic: SASVIEW-271
Unit tests for plotting in fitting: SASVIEW-501

Location:

src/sas/qtgui/MainWindow

Files:

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

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -433 +433 @@
         self.chkBatch.setEnabled(self.parent.perspective().allowBatch())
 
+    def displayData(self, data_list):
+        """
+        Forces display of charts for the given filename
+        """
+        # Assure no multiple plots for the same ID
+        plot_to_show = data_list[0]
+        for plot in PlotHelper.currentPlots():
+            if plot == plot_to_show.id:
+                return
+
+        new_plot = Plotter(self)
+        # Now query the model item for available plots
+        filename = plot_to_show.filename
+        model = self.model if plot_to_show.is_data else self.theory_model
+        plots = GuiUtils.plotsFromFilename(filename, model)
+        for plot in plots:
+            new_plot.plot(plot)
+        self.plotAdd(new_plot)
+
     def newPlot(self):
         """

src/sas/qtgui/MainWindow/GuiManager.py

@@ -335 +335 @@
         self.communicate.perspectiveChangedSignal.connect(self.perspectiveChanged)
         self.communicate.updateTheoryFromPerspectiveSignal.connect(self.updateTheoryFromPerspective)
+        self.communicate.plotRequestedSignal.connect(self.showPlot)
 
     def addTriggers(self):
@@ -727 +728 @@
         self.filesWidget.updateTheoryFromPerspective(index)
 
-
-
+    def showPlot(self, plot):
+        """
+        Pass the show plot request to the data explorer
+        """
+        if hasattr(self, "filesWidget"):
+            self.filesWidget.displayData(plot)
+