From 249555c720f4814d1ed3988c00f35d4786c86b8e Mon Sep 17 00:00:00 2001
From: Roman Tolchenov <roman.tolchenov@stfc.ac.uk>
Date: Fri, 15 Jan 2016 11:25:39 +0000
Subject: [PATCH] Re #14953. Pass MaxIteration from fit browser to sequential
dialog.
---
.../inc/MantidQtMantidWidgets/FitPropertyBrowser.h | 2 ++
MantidQt/MantidWidgets/src/FitPropertyBrowser.cpp | 6 ++++++
MantidQt/MantidWidgets/src/SequentialFitDialog.cpp | 1 +
3 files changed, 9 insertions(+)
diff --git a/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FitPropertyBrowser.h b/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FitPropertyBrowser.h
index 17ea8980f59..60b7efb2efc 100644
--- a/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FitPropertyBrowser.h
+++ b/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FitPropertyBrowser.h
@@ -145,6 +145,8 @@ public:
bool convolveMembers()const;
/// Set if the data must be normalised before fitting
void normaliseData(bool on) {m_shouldBeNormalised = on;}
+ /// Get the max number of iterations
+ int maxIterations() const;
/// Get the start X
double startX()const;
diff --git a/MantidQt/MantidWidgets/src/FitPropertyBrowser.cpp b/MantidQt/MantidWidgets/src/FitPropertyBrowser.cpp
index a41cf563578..853ed75000d 100644
--- a/MantidQt/MantidWidgets/src/FitPropertyBrowser.cpp
+++ b/MantidQt/MantidWidgets/src/FitPropertyBrowser.cpp
@@ -1185,6 +1185,12 @@ bool FitPropertyBrowser::convolveMembers() const
return m_boolManager->value(m_convolveMembers);
}
+/// Get the max number of iterations
+int FitPropertyBrowser::maxIterations() const
+{
+ return m_intManager->value(m_maxIterations);
+}
+
/// Get the registered function names
void FitPropertyBrowser::populateFunctionNames()
{
diff --git a/MantidQt/MantidWidgets/src/SequentialFitDialog.cpp b/MantidQt/MantidWidgets/src/SequentialFitDialog.cpp
index e92884258fa..68dbec67eaa 100644
--- a/MantidQt/MantidWidgets/src/SequentialFitDialog.cpp
+++ b/MantidQt/MantidWidgets/src/SequentialFitDialog.cpp
@@ -357,6 +357,7 @@ void SequentialFitDialog::accept()
}
alg->setPropertyValue("Minimizer",m_fitBrowser->minimizer());
alg->setPropertyValue("CostFunction",m_fitBrowser->costFunction());
+ alg->setProperty("MaxIterations",m_fitBrowser->maxIterations());
if (ui.rbIndividual->isChecked())
{
alg->setPropertyValue("FitType","Individual");
--
GitLab