Changeset 8748751 in sasview for src/sas

Timestamp:

Oct 26, 2018 5:35:55 AM (6 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:

8fad50b

Parents:

c18ca00

Message:

Fit result viewer SASVIEW-274, SASVIEW-275

Location:

src/sas/qtgui

Files:

• MainWindow/GuiManager.py (modified) (7 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• Utilities/GuiUtils.py (modified) (1 diff)
• Utilities/PlotView.py (added)
• Utilities/ResultPanel.py (added)

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)
@@ -444 +451 @@
         """
         # disable not yet fully implemented actions
-        #self._workspace.actionOpen_Analysis.setVisible(False)
         self._workspace.actionUndo.setVisible(False)
         self._workspace.actionRedo.setVisible(False)
@@ -451 +457 @@
         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)
@@ -526 +531 @@
 
         self.communicate.sendDataToGridSignal.connect(self.showBatchOutput)
+        self.communicate.resultPlotUpdateSignal.connect(self.showFitResults)
 
     #============ FILE =================
@@ -819 +825 @@
         """
         """
-        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):

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

@@ -1558 +1558 @@
         if param_dict is None:
             return
+        if hasattr(res, 'convergence') and len(res.convergence)>0:
+            self.communicate.resultPlotUpdateSignal.emit(result[0])
 
         elapsed = result[1]

src/sas/qtgui/Utilities/GuiUtils.py

@@ -285 +285 @@
     # Tell the data explorer to switch tabs
     changeDataExplorerTabSignal = QtCore.pyqtSignal(int)
+
+    # Plot fitting results (FittingWidget->GuiManager)
+    resultPlotUpdateSignal = QtCore.pyqtSignal(list)
 
 def updateModelItemWithPlot(item, update_data, name=""):