Changeset f810eb6 in sasview


Ignore:
Timestamp:
Mar 25, 2019 12:37:22 PM (4 months ago)
Author:
awashington
Branches:
ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl
Children:
bad4a52
Parents:
4c11b2a (diff), 13ee4d9 (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' of github.com:SasView/SasView into Sasview-1127

Location:
src/sas/qtgui
Files:
3 edited

Legend:

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

    r33c0561 r13ee4d9  
    958958        if isBatch: 
    959959            self.chkChain.setChecked(is_chain) 
     960 
     961    def getReport(self): 
     962        """ 
     963        Wrapper for non-existent functionality. 
     964        Tell the user to use the reporting tool 
     965        on separate fit pages. 
     966        """ 
     967        msg = "Please use Report Results directly on fit pages" 
     968        msg += " involved in the Constrained and Simultaneous fitting process." 
     969        msgbox = QtWidgets.QMessageBox(self) 
     970        msgbox.setIcon(QtWidgets.QMessageBox.Warning) 
     971        msgbox.setText(msg) 
     972        msgbox.setWindowTitle("Fit Report") 
     973        _ = msgbox.exec_() 
     974        return 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    r17e6a2b rd4c9242  
    28622862        self.createNewIndex(weighted_data) 
    28632863 
     2864        # Plot residuals if actual data 
     2865        if not self.data_is_loaded: 
     2866            return 
     2867 
    28642868        # Calculate difference between return_data and logic.data 
    28652869        self.chi2 = FittingUtilities.calculateChi2(weighted_data, self.data) 
     
    28672871        chi2_repr = "---" if self.chi2 is None else GuiUtils.formatNumber(self.chi2, high=True) 
    28682872        self.lblChi2Value.setText(chi2_repr) 
    2869  
    2870         # Plot residuals if actual data 
    2871         if not self.data_is_loaded: 
    2872             return 
    28732873 
    28742874        residuals_plot = FittingUtilities.plotResiduals(self.data, weighted_data) 
  • src/sas/qtgui/Plotting/Plotter.py

    rd9e7792 r4c11b2a  
    420420        This effectlvely refreshes the chart with changes to one of its plots 
    421421        """ 
     422 
     423        # Pull the current transform settings from the old plot 
     424        selected_plot = self.plot_dict[id] 
     425        new_plot.xtransform = selected_plot.xtransform 
     426        new_plot.ytransform = selected_plot.ytransform 
     427 
    422428        self.removePlot(id) 
    423429        self.plot(data=new_plot) 
Note: See TracChangeset for help on using the changeset viewer.