Changeset f810eb6 in sasview for src/sas

Timestamp:

Mar 25, 2019 12:37:22 PM (6 years 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:

• Perspectives/Fitting/ConstraintWidget.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (2 diffs)
• Plotting/Plotter.py (modified) (1 diff)

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)

src/sas/qtgui/Plotting/Plotter.py

@@ -420 +420 @@
         This effectlvely refreshes the chart with changes to one of its plots
         """
+
+        # Pull the current transform settings from the old plot
+        selected_plot = self.plot_dict[id]
+        new_plot.xtransform = selected_plot.xtransform
+        new_plot.ytransform = selected_plot.ytransform
+
         self.removePlot(id)
         self.plot(data=new_plot)