From 2f30b2d34cb149af7fd6455544ba80b1190b8ace Mon Sep 17 00:00:00 2001
From: Dan Nixon <dan@dan-nixon.com>
Date: Tue, 14 Oct 2014 14:58:57 +0100
Subject: [PATCH] Move convolve option to property tree
Refs #8802
---
Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp
index 1df43c429a8..33aa8d97ffd 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp
@@ -68,6 +68,13 @@ namespace IDA
m_cfHwhmRange->setColour(Qt::red);
// Populate Property Widget
+
+ // Option to convolve members
+ m_cfProp["Convolve"] = m_cfBlnMng->addProperty("Convolve");
+ m_cfTree->addProperty(m_cfProp["Convolve"]);
+ m_cfBlnMng->setValue(m_cfProp["Convolve"], true);
+
+ // Fit Range
m_cfProp["FitRange"] = m_cfGrpMng->addProperty("Fitting Range");
m_cfProp["StartX"] = m_cfDblMng->addProperty("StartX");
m_cfDblMng->setDecimals(m_cfProp["StartX"], NUM_DECIMALS);
@@ -77,6 +84,7 @@ namespace IDA
m_cfProp["FitRange"]->addSubProperty(m_cfProp["EndX"]);
m_cfTree->addProperty(m_cfProp["FitRange"]);
+ // Background Range
m_cfProp["LinearBackground"] = m_cfGrpMng->addProperty("Background");
m_cfProp["BGA0"] = m_cfDblMng->addProperty("A0");
m_cfDblMng->setDecimals(m_cfProp["BGA0"], NUM_DECIMALS);
@@ -187,7 +195,7 @@ namespace IDA
pyInput += uiForm().confit_ckSaveSeq->isChecked() ? "True\n" : "False\n";
- if ( uiForm().confit_ckConvolve->isChecked() ) pyInput += "convolve = True\n";
+ if ( m_cfBlnMng->value(m_cfProp["Convolve"]) ) pyInput += "convolve = True\n";
else pyInput += "convolve = False\n";
if ( uiForm().confit_ckVerbose->isChecked() ) pyInput += "verbose = True\n";
--
GitLab