Changeset 8748751 in sasview


Ignore:
Timestamp:
Oct 26, 2018 5:35:55 AM (2 weeks ago)
Author:
Piotr Rozyczko <piotr.rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_project_save
Children:
8fad50b
Parents:
c18ca00
Message:

Fit result viewer SASVIEW-274, SASVIEW-275

Location:
src/sas/qtgui
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/MainWindow/GuiManager.py

    r6bc0840 r8748751  
    2424from sas.qtgui.Utilities.PluginManager import PluginManager 
    2525from sas.qtgui.Utilities.GridPanel import BatchOutputPanel 
     26from sas.qtgui.Utilities.ResultPanel import ResultPanel 
    2627 
    2728from sas.qtgui.Utilities.ReportDialog import ReportDialog 
     
    147148        self.aboutWidget = AboutBox() 
    148149        self.categoryManagerWidget = CategoryManager(self._parent, manager=self) 
     150 
    149151        self.grid_window = None 
    150152        self.grid_window = BatchOutputPanel(parent=self) 
     
    154156        self.grid_subwindow.setVisible(False) 
    155157        self.grid_window.windowClosedSignal.connect(lambda: self.grid_subwindow.setVisible(False)) 
     158 
     159        self.results_panel = ResultPanel(parent=self._parent, manager=self) 
     160        self.results_frame = self._workspace.workspace.addSubWindow(self.results_panel) 
     161        self.results_frame.setVisible(False) 
     162        self.results_panel.windowClosedSignal.connect(lambda: self.results_frame.setVisible(False)) 
    156163 
    157164        self._workspace.toolBar.setVisible(LocalConfig.TOOLBAR_SHOW) 
     
    444451        """ 
    445452        # disable not yet fully implemented actions 
    446         #self._workspace.actionOpen_Analysis.setVisible(False) 
    447453        self._workspace.actionUndo.setVisible(False) 
    448454        self._workspace.actionRedo.setVisible(False) 
     
    451457        self._workspace.actionImage_Viewer.setVisible(False) 
    452458        self._workspace.actionCombine_Batch_Fit.setVisible(False) 
    453         self._workspace.actionFit_Results.setVisible(False) 
    454459        # orientation viewer set to invisible SASVIEW-1132 
    455460        self._workspace.actionOrientation_Viewer.setVisible(False) 
     
    526531 
    527532        self.communicate.sendDataToGridSignal.connect(self.showBatchOutput) 
     533        self.communicate.resultPlotUpdateSignal.connect(self.showFitResults) 
    528534 
    529535    #============ FILE ================= 
     
    819825        """ 
    820826        """ 
    821         print("actionFit_Results TRIGGERED") 
    822         pass 
     827        self.showFitResults(None) 
     828 
     829    def showFitResults(self, output_data): 
     830        """ 
     831        Show bumps convergence plots 
     832        """ 
     833        self.results_frame.setVisible(True) 
     834        if output_data: 
     835            self.results_panel.onPlotResults(output_data) 
    823836 
    824837    def actionAdd_Custom_Model(self): 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    rd7d55c7 r8748751  
    15581558        if param_dict is None: 
    15591559            return 
     1560        if hasattr(res, 'convergence') and len(res.convergence)>0: 
     1561            self.communicate.resultPlotUpdateSignal.emit(result[0]) 
    15601562 
    15611563        elapsed = result[1] 
  • src/sas/qtgui/Utilities/GuiUtils.py

    r63467b6 r8748751  
    285285    # Tell the data explorer to switch tabs 
    286286    changeDataExplorerTabSignal = QtCore.pyqtSignal(int) 
     287 
     288    # Plot fitting results (FittingWidget->GuiManager) 
     289    resultPlotUpdateSignal = QtCore.pyqtSignal(list) 
    287290 
    288291def updateModelItemWithPlot(item, update_data, name=""): 
Note: See TracChangeset for help on using the changeset viewer.