Changeset 20f4857 in sasview

Timestamp:

Sep 26, 2018 4:46:21 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:

8eea1b1

Parents:

9b9ec10

Message:

Few fixes for Copy Excel/Latex? menu option

Just connecting these up in the same way as main copy function so that only current FitPage? tab can be accessed

Location:

src/sas/qtgui

Files:

• MainWindow/GuiManager.py (modified) (2 diffs)
• Perspectives/Fitting/FittingPerspective.py (modified) (2 diffs)
• Utilities/GuiUtils.py (modified) (1 diff)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -597 +597 @@
         can be saved to the clipboard
         """
-        self.communicate.copyFitParamsSignal.emit("Excel")
+        self.communicate.copyExcelFitParamsSignal.emit("Excel")
 
     def actionLatex(self):
@@ -604 +604 @@
         can be saved to the clipboard
         """
-        self.communicate.copyFitParamsSignal.emit("Latex")
+        self.communicate.copyLatexFitParamsSignal.emit("Latex")
 
     #============ VIEW =================

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

@@ -65 +65 @@
         self.communicate.copyFitParamsSignal.connect(self.onParamCopy)
         self.communicate.pasteFitParamsSignal.connect(self.onParamPaste)
+        self.communicate.copyExcelFitParamsSignal.connect(self.onExcelCopy)
+        self.communicate.copyLatexFitParamsSignal.connect(self.onLatexCopy)
+
 
         # Perspective window not allowed to close by default
@@ -103 +106 @@
     def onParamPaste(self):
         self.currentTab.onParameterPaste()
+
+    def onExcelCopy(self):
+        self.currentTab.onParameterCopy("Excel")
+
+    def onLatexCopy(self):
+        self.currentTab.onParameterCopy("Latex")
 
     def closeEvent(self, event):

src/sas/qtgui/Utilities/GuiUtils.py

@@ -271 +271 @@
     # Fitting parameter copy to clipboard
     copyFitParamsSignal = QtCore.pyqtSignal(str)
+
+    # Fitting parameter copy to clipboard for Excel
+    copyExcelFitParamsSignal = QtCore.pyqtSignal(str)
+
+    # Fitting parameter copy to clipboard for Latex
+    copyLatexFitParamsSignal = QtCore.pyqtSignal(str)
 
     # Fitting parameter paste from clipboard