Changeset 085409e3 in sasview for src

Timestamp:

Sep 25, 2018 6:21:53 AM (6 years ago)

Author:

Laura Forster <Awork@…>

Branches:

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

Children:

9b9ec10

Parents:

2dce1d8

Message:

Fixed Copy and Paste bugs

There were several problems caused by the FittingWidget? being able to access all the open FitPage? tabs, meaning when Copy or Paste was used it was accessing multiple sets of params and models.

The functions are now being passed the currently open tab, not all open tabs.

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

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

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

@@ -63 +63 @@
         self.fittingStoppedSignal.connect(self.onFittingStopped)
 
+        self.communicate.copyFitParamsSignal.connect(self.onParamCopy)
+        self.communicate.pasteFitParamsSignal.connect(self.onParamPaste)
+
         # Perspective window not allowed to close by default
         self._allow_close = False
@@ -94 +97 @@
 
         self._allow_close = value
+
+    def onParamCopy(self):
+        self.currentTab.onParameterCopy("")
+
+    def onParamPaste(self):
+        self.currentTab.onParameterPaste()
 
     def closeEvent(self, event):

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

@@ -556 +556 @@
         self.communicate.saveAnalysisSignal.connect(self.savePageState)
         self.smearing_widget.smearingChangedSignal.connect(self.onSmearingOptionsUpdate)
-        self.communicate.copyFitParamsSignal.connect(self.onParameterCopy)
-        self.communicate.pasteFitParamsSignal.connect(self.onParameterPaste)
 
         # Communicator signal