Changeset 6fbb859 in sasview


Ignore:
Timestamp:
Sep 9, 2018 5:36:13 AM (11 days ago)
Author:
Torin Cooper-Bennun <torin.cooper-bennun@…>
Branches:
ESS_GUI_iss1052
Parents:
fa3da01 (diff), daf7c9c (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_iss1052

Location:
src/sas/qtgui/Perspectives/Fitting
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    rfa3da01 r6fbb859  
    29432943        self.current_shell_displayed = index 
    29442944 
    2945         # Change 'n' in the parameter model, thereby updating the underlying model 
     2945        # Param values for existing shells were reset to default; force all changes into kernel module 
     2946        for row in new_rows: 
     2947            par = row[0].text() 
     2948            val = GuiUtils.toDouble(row[1].text()) 
     2949            self.kernel_module.setParam(par, val) 
     2950 
     2951        # Change 'n' in the parameter model; also causes recalculation 
    29462952        self._model_model.item(self._n_shells_row, 1).setText(str(index)) 
    29472953 
  • src/sas/qtgui/Perspectives/Fitting/FittingLogic.py

    r61f0c75 r5a96a72  
    220220        return plots 
    221221 
     222    def getScalarIntermediateResults(self, return_data): 
     223        """ 
     224        Returns a dict of scalar-only intermediate results from the return data. 
     225        """ 
     226        res = {} 
     227        for name, int_res in return_data["intermediate_results"].items(): 
     228            if isinstance(int_res, np.ndarray): 
     229                continue 
     230            res[name] = int_res 
     231        return res 
     232 
    222233    def computeDataRange(self): 
    223234        """ 
Note: See TracChangeset for help on using the changeset viewer.