From c46c8a63fc16d15ca9b95a36d85b218c8d8a2ccd Mon Sep 17 00:00:00 2001
From: Michael Wedel <michael.wedel@psi.ch>
Date: Wed, 4 Mar 2015 09:02:46 +0100
Subject: [PATCH] Refs #10996. Small fix to FunctionParameterDecorator
Forwarding of active parameters was not implemented.
---
.../API/inc/MantidAPI/FunctionParameterDecorator.h | 6 ++++++
.../Framework/API/src/FunctionParameterDecorator.cpp | 12 ++++++++++++
2 files changed, 18 insertions(+)
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/FunctionParameterDecorator.h b/Code/Mantid/Framework/API/inc/MantidAPI/FunctionParameterDecorator.h
index edbd2d70d72..533c9942cdd 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/FunctionParameterDecorator.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/FunctionParameterDecorator.h
@@ -64,6 +64,12 @@ public:
/// Set description of parameter of decorated function by name.
virtual void setParameterDescription(const std::string &name,
const std::string &description);
+
+ /// Value of i-th active parameter of the decorated function.
+ virtual double activeParameter(size_t i) const;
+ /// Set new value of i-th active parameter of the decorated function.
+ virtual void setActiveParameter(size_t i, double value);
+
/// Get parameter of decorated function by name.
virtual double getParameter(const std::string &name) const;
/// Total number of parameters of decorated function.
diff --git a/Code/Mantid/Framework/API/src/FunctionParameterDecorator.cpp b/Code/Mantid/Framework/API/src/FunctionParameterDecorator.cpp
index c2fb3100429..fce40a88b01 100644
--- a/Code/Mantid/Framework/API/src/FunctionParameterDecorator.cpp
+++ b/Code/Mantid/Framework/API/src/FunctionParameterDecorator.cpp
@@ -72,6 +72,18 @@ void FunctionParameterDecorator::setParameterDescription(
m_wrappedFunction->setParameterDescription(name, description);
}
+double FunctionParameterDecorator::activeParameter(size_t i) const {
+ throwIfNoFunctionSet();
+
+ return m_wrappedFunction->activeParameter(i);
+}
+
+void FunctionParameterDecorator::setActiveParameter(size_t i, double value) {
+ throwIfNoFunctionSet();
+
+ m_wrappedFunction->setActiveParameter(i, value);
+}
+
double FunctionParameterDecorator::getParameter(const std::string &name) const {
throwIfNoFunctionSet();
--
GitLab