Changeset 9463ca2 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Aug 30, 2018 8:47:39 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

eef298d4

Parents:

b8080e1

Message:

plotting fixes: appended plots now update; Show Plot no longer breaks if file's plot(s) have been appended to

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (3 diffs)

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

@@ -2275 +2275 @@
             pq_data.symbol = "Line"
             self.createNewIndex(pq_data)
+            # self.communicate.plotUpdateSignal.emit([pq_data])
             new_plots.append(pq_data)
         if sq_data is not None:
             sq_data.symbol = "Line"
             self.createNewIndex(sq_data)
+            # self.communicate.plotUpdateSignal.emit([sq_data])
             new_plots.append(sq_data)
 
         if self.data_is_loaded:
             GuiUtils.deleteRedundantPlots(self.all_data[self.data_index], new_plots)
+
+        for plot in new_plots:
+            if hasattr(plot, "id") and "esidual" in plot.id:
+                # TODO: fix updates to residuals plot
+                pass
+            else:
+                self.communicate.plotUpdateSignal.emit([plot])
 
     def complete2D(self, return_data):
@@ -2294 +2303 @@
     def calculateResiduals(self, fitted_data):
         """
-        Calculate and print Chi2 and display chart of residuals
+        Calculate and print Chi2 and display chart of residuals. Returns residuals plot object.
         """
         # Create a new index for holding data
@@ -2309 +2318 @@
         self.lblChi2Value.setText(chi2_repr)
 
-        self.communicate.plotUpdateSignal.emit([fitted_data])
+        # self.communicate.plotUpdateSignal.emit([fitted_data])
 
         # Plot residuals if actual data