From f17a57ada688313cd03e7d34892e9a2af38b157d Mon Sep 17 00:00:00 2001
From: Shahroz Ahmed <shahroz.ahmed@stfc.ac.uk>
Date: Fri, 8 Apr 2016 10:20:34 +0100
Subject: [PATCH] peak picker only activated when plot fitted
refs #15767
---
.../EnggDiffraction/EnggDiffractionQtTabFitting.ui | 3 +++
.../src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui
index fe234039b3c..0e301db4582 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui
@@ -363,6 +363,9 @@
</item>
<item>
<widget class="QPushButton" name="pushButton_select_peak">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
<string>Select Peak</string>
</property>
diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
index 56e2385b91d..10341f8efb2 100644
--- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
+++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
@@ -777,8 +777,9 @@ void EnggDiffractionViewQtGUI::dataCurvesFactory(
m_uiTabFitting.dataPlot->replot();
m_zoomTool->setZoomBase();
- // enable zoom after the plotting on graph
+ // enable zoom & select peak btn after the plotting on graph
setZoomTool(true);
+ m_uiTabFitting.pushButton_select_peak->setEnabled(true);
data.clear();
}
--
GitLab