Changeset d00475d in sasview for src/sas/qtgui/MainWindow/GuiManager.py

Timestamp:

Oct 26, 2018 6:44:15 AM (5 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

b1b71ad

Parents:

a3c59503 (diff), 75906a1 (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.

Message:

Merge branch 'ESS_GUI' into ESS_GUI_project_save

File:

• src/sas/qtgui/MainWindow/GuiManager.py (modified) (9 diffs)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -24 +24 @@
 from sas.qtgui.Utilities.PluginManager import PluginManager
 from sas.qtgui.Utilities.GridPanel import BatchOutputPanel
+from sas.qtgui.Utilities.ResultPanel import ResultPanel
 
 from sas.qtgui.Utilities.ReportDialog import ReportDialog
@@ -147 +148 @@
         self.aboutWidget = AboutBox()
         self.categoryManagerWidget = CategoryManager(self._parent, manager=self)
+
         self.grid_window = None
         self.grid_window = BatchOutputPanel(parent=self)
@@ -154 +156 @@
         self.grid_subwindow.setVisible(False)
         self.grid_window.windowClosedSignal.connect(lambda: self.grid_subwindow.setVisible(False))
+
+        self.results_panel = ResultPanel(parent=self._parent, manager=self)
+        self.results_frame = self._workspace.workspace.addSubWindow(self.results_panel)
+        self.results_frame.setVisible(False)
+        self.results_panel.windowClosedSignal.connect(lambda: self.results_frame.setVisible(False))
 
         self._workspace.toolBar.setVisible(LocalConfig.TOOLBAR_SHOW)
@@ -443 +450 @@
         """
         # disable not yet fully implemented actions
-        #self._workspace.actionOpen_Analysis.setVisible(False)
         self._workspace.actionUndo.setVisible(False)
         self._workspace.actionRedo.setVisible(False)
@@ -450 +456 @@
         self._workspace.actionImage_Viewer.setVisible(False)
         self._workspace.actionCombine_Batch_Fit.setVisible(False)
-        self._workspace.actionFit_Results.setVisible(False)
         # orientation viewer set to invisible SASVIEW-1132
         self._workspace.actionOrientation_Viewer.setVisible(False)
@@ -510 +515 @@
         self._workspace.actionNext.triggered.connect(self.actionNext)
         self._workspace.actionPrevious.triggered.connect(self.actionPrevious)
+        self._workspace.actionClosePlots.triggered.connect(self.actionClosePlots)
         # Analysis
         self._workspace.actionFitting.triggered.connect(self.actionFitting)
@@ -524 +530 @@
 
         self.communicate.sendDataToGridSignal.connect(self.showBatchOutput)
+        self.communicate.resultPlotUpdateSignal.connect(self.showFitResults)
 
     #============ FILE =================
@@ -853 +860 @@
         """
         """
-        print("actionFit_Results TRIGGERED")
-        pass
+        self.showFitResults(None)
+
+    def showFitResults(self, output_data):
+        """
+        Show bumps convergence plots
+        """
+        self.results_frame.setVisible(True)
+        if output_data:
+            self.results_panel.onPlotResults(output_data)
 
     def actionAdd_Custom_Model(self):
@@ -945 +959 @@
         """
         self._workspace.workspace.activatePreviousSubWindow()
+
+    def actionClosePlots(self):
+        """
+        Closes all Plotters and Plotter2Ds.
+        """
+        self.filesWidget.closeAllPlots()
+        pass
 
     #============ HELP =================