Changeset 4fbf0db in sasview


Ignore:
Timestamp:
Sep 17, 2018 8:59:58 AM (5 weeks ago)
Author:
wojciech
Branches:
ESS_GUI, ESS_GUI_Pr_fixes, ESS_GUI_image_viewer, ESS_GUI_project_save
Children:
68dc2873
Parents:
14ec7dfd
Message:

Fixes for batch fitting

Location:
src/sas/qtgui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

    r14ec7dfd r4fbf0db  
    5555 
    5656        self._manager = parent 
     57        self._parent = parent 
    5758        self.communicate = parent.communicator() 
    5859        self.communicate.dataDeletedSignal.connect(self.removeData) 
     
    657658 
    658659        pr = self._calculator.clone() 
    659         nfunc = self.getNFunc() 
    660         self.calcThread = CalcPr(pr, nfunc, 
     660        #Making sure that nfunc and alpha parameters are correctly initialized 
     661        pr.suggested_alpha = self._calculator.alpha 
     662        self.calcThread = CalcPr(pr, self.nTermsSuggested, 
    661663                                 error_func=self._threadError, 
    662664                                 completefn=self._calculateCompleted, 
  • src/sas/qtgui/Utilities/GridPanel.py

    r3c6ecd9 r4fbf0db  
    5454        # Fill in the table from input data 
    5555        self.setupTable(widget=self.tblParams, data=output_data) 
     56        #TODO: This is not what was inteded to be. 
    5657        if output_data is not None: 
    5758            # Set a table tooltip describing the model 
    58             model_name = output_data[0][0].model.id 
     59            model_name = list(output_data.keys())[0] 
    5960            self.tabWidget.setTabToolTip(0, model_name) 
    6061 
     
    418419    def __init__(self, parent = None, output_data=None): 
    419420 
    420         super(BatchInversionOutputPanel, self).__init__(parent, output_data) 
     421        super(BatchInversionOutputPanel, self).__init__(parent._parent, output_data) 
    421422        _translate = QtCore.QCoreApplication.translate 
    422423        self.setWindowTitle(_translate("GridPanelUI", "Batch P(r) Results")) 
    423424 
    424     def setupTable(self, data): 
     425    def setupTable(self, widget=None,  data=None): 
    425426        """ 
    426427        Create tablewidget items and show them, based on params 
     
    433434                      'Calc. Time [sec]'] 
    434435 
     436        if data is None: 
     437            return 
    435438        keys = data.keys() 
    436439        rows = len(keys) 
Note: See TracChangeset for help on using the changeset viewer.