Changeset f810eb6 in sasview
- Timestamp:
- Mar 25, 2019 10:37:22 AM (6 years ago)
- 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. - Location:
- src/sas/qtgui
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py
r33c0561 r13ee4d9 958 958 if isBatch: 959 959 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 2862 2862 self.createNewIndex(weighted_data) 2863 2863 2864 # Plot residuals if actual data 2865 if not self.data_is_loaded: 2866 return 2867 2864 2868 # Calculate difference between return_data and logic.data 2865 2869 self.chi2 = FittingUtilities.calculateChi2(weighted_data, self.data) … … 2867 2871 chi2_repr = "---" if self.chi2 is None else GuiUtils.formatNumber(self.chi2, high=True) 2868 2872 self.lblChi2Value.setText(chi2_repr) 2869 2870 # Plot residuals if actual data2871 if not self.data_is_loaded:2872 return2873 2873 2874 2874 residuals_plot = FittingUtilities.plotResiduals(self.data, weighted_data) -
src/sas/qtgui/Plotting/Plotter.py
rd9e7792 r4c11b2a 420 420 This effectlvely refreshes the chart with changes to one of its plots 421 421 """ 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 422 428 self.removePlot(id) 423 429 self.plot(data=new_plot)
Note: See TracChangeset
for help on using the changeset viewer.