Changes in / [4c11b2a:f810eb6] in sasview

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ConstraintWidget.py (modified) (1 diff)
• FittingWidget.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

@@ -958 +958 @@
         if isBatch:
             self.chkChain.setChecked(is_chain)
+
+    def getReport(self):
+        """
+        Wrapper for non-existent functionality.
+        Tell the user to use the reporting tool
+        on separate fit pages.
+        """
+        msg = "Please use Report Results directly on fit pages"
+        msg += " involved in the Constrained and Simultaneous fitting process."
+        msgbox = QtWidgets.QMessageBox(self)
+        msgbox.setIcon(QtWidgets.QMessageBox.Warning)
+        msgbox.setText(msg)
+        msgbox.setWindowTitle("Fit Report")
+        _ = msgbox.exec_()
+        return

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -2862 +2862 @@
         self.createNewIndex(weighted_data)
 
+        # Plot residuals if actual data
+        if not self.data_is_loaded:
+            return
+
         # Calculate difference between return_data and logic.data
         self.chi2 = FittingUtilities.calculateChi2(weighted_data, self.data)
@@ -2867 +2871 @@
         chi2_repr = "---" if self.chi2 is None else GuiUtils.formatNumber(self.chi2, high=True)
         self.lblChi2Value.setText(chi2_repr)
-
-        # Plot residuals if actual data
-        if not self.data_is_loaded:
-            return
 
         residuals_plot = FittingUtilities.plotResiduals(self.data, weighted_data)