diff --git a/MantidQt/CustomInterfaces/CMakeLists.txt b/MantidQt/CustomInterfaces/CMakeLists.txt
index 768f699745085fb6d77977a5b3917e90b78264db..a75c16407aaa0da701153ea95c8aa2e8cafb2ca9 100644
--- a/MantidQt/CustomInterfaces/CMakeLists.txt
+++ b/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -494,6 +494,7 @@ set ( UI_FILES inc/MantidQtCustomInterfaces/DataComparison.ui
inc/MantidQtCustomInterfaces/Reflectometry/ReflMainWindowWidget.ui
inc/MantidQtCustomInterfaces/Reflectometry/ReflRunsTabWidget.ui
inc/MantidQtCustomInterfaces/Reflectometry/ReflSaveTabWidget.ui
+ inc/MantidQtCustomInterfaces/Reflectometry/ReflSettingsTabWidget.ui
inc/MantidQtCustomInterfaces/Reflectometry/ReflSettingsWidget.ui
inc/MantidQtCustomInterfaces/Reflectometry/ReflWindow.ui
inc/MantidQtCustomInterfaces/SampleTransmission.ui
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflMainWindowPresenter.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflMainWindowPresenter.h
index e3c84ecf44274434ffa031361594b6614f4abd2d..7b6b9e136e96780472997e7db3fb8125e1716392 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflMainWindowPresenter.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflMainWindowPresenter.h
@@ -39,11 +39,11 @@ public:
/// Destructor
virtual ~IReflMainWindowPresenter(){};
/// Pre-processing
- virtual std::string getTransmissionOptions() const = 0;
+ virtual std::string getTransmissionOptions(int group) const = 0;
/// Processing
- virtual std::string getReductionOptions() const = 0;
+ virtual std::string getReductionOptions(int group) const = 0;
/// Post-processing
- virtual std::string getStitchOptions() const = 0;
+ virtual std::string getStitchOptions(int group) const = 0;
/// Dialog/Prompt methods
virtual std::string askUserString(const std::string &prompt,
const std::string &title,
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSettingsTabPresenter.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSettingsTabPresenter.h
index 474b2e2184d53e27bb2a9d4ff999210f683bbcd0..13d9e0c68dbc68ec926c73a9db45a2f8f1533157 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSettingsTabPresenter.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSettingsTabPresenter.h
@@ -40,11 +40,11 @@ public:
/// Accept a main presenter
virtual void acceptMainPresenter(IReflMainWindowPresenter *mainPresenter) = 0;
/// Pre-processing
- virtual std::string getTransmissionOptions() const = 0;
+ virtual std::string getTransmissionOptions(int group) const = 0;
/// Processing
- virtual std::string getReductionOptions() const = 0;
+ virtual std::string getReductionOptions(int group) const = 0;
/// Post-processing
- virtual std::string getStitchOptions() const = 0;
+ virtual std::string getStitchOptions(int group) const = 0;
/// Set current instrument name
virtual void setInstrumentName(const std::string instName) = 0;
};
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflMainWindowPresenter.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflMainWindowPresenter.h
index f833788dc3cf5d08cbc40a9a80a5562005daf1ac..fca9cb6c204b7f69fc70064322234b5be1d98d19 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflMainWindowPresenter.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflMainWindowPresenter.h
@@ -49,11 +49,11 @@ public:
/// Destructor
~ReflMainWindowPresenter() override;
/// Returns global options for 'CreateTransmissionWorkspaceAuto'
- std::string getTransmissionOptions() const override;
+ std::string getTransmissionOptions(int group) const override;
/// Returns global options for 'ReflectometryReductionOneAuto'
- std::string getReductionOptions() const override;
+ std::string getReductionOptions(int group) const override;
/// Returns global options for 'Stitch1DMany'
- std::string getStitchOptions() const override;
+ std::string getStitchOptions(int group) const override;
/// Dialog/Prompt methods
std::string askUserString(const std::string &prompt, const std::string &title,
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSettingsTabPresenter.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSettingsTabPresenter.h
index dce43e1d30bdd0afbf8f602b8472d22fbed7a037..2ca9b1f622dc29b1b6b5a4e281968de665324b39 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSettingsTabPresenter.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/ReflSettingsTabPresenter.h
@@ -11,6 +11,7 @@ using namespace Mantid::API;
// Forward decs
class IReflMainWindowPresenter;
+class IReflSettingsPresenter;
/** @class ReflSettingsTabPresenter
@@ -42,7 +43,7 @@ class MANTIDQT_CUSTOMINTERFACES_DLL ReflSettingsTabPresenter
: public IReflSettingsTabPresenter {
public:
/// Constructor
- ReflSettingsTabPresenter();
+ ReflSettingsTabPresenter(std::vector<IReflSettingsPresenter *> presenters);
/// Destructor
~ReflSettingsTabPresenter() override;
/// Accept a main presenter
@@ -50,15 +51,17 @@ public:
void setInstrumentName(const std::string instName) override;
/// Returns global options for 'CreateTransmissionWorkspaceAuto'
- std::string getTransmissionOptions() const override;
+ std::string getTransmissionOptions(int group) const override;
/// Returns global options for 'ReflectometryReductionOneAuto'
- std::string getReductionOptions() const override;
+ std::string getReductionOptions(int group) const override;
/// Returns global options for 'Stitch1DMany'
- std::string getStitchOptions() const override;
+ std::string getStitchOptions(int group) const override;
private:
/// The main presenter
IReflMainWindowPresenter *m_mainPresenter;
+ /// The presenters for each group as a vector
+ std::vector<IReflSettingsPresenter *> m_settingsPresenters;
};
}
}
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/QtReflSettingsTabView.cpp b/MantidQt/CustomInterfaces/src/Reflectometry/QtReflSettingsTabView.cpp
index 0b8b0fb01aa472cce42615551435151c9a04d200..0dd9bf213f455ba0dfc0b4c508003888f531a37d 100644
--- a/MantidQt/CustomInterfaces/src/Reflectometry/QtReflSettingsTabView.cpp
+++ b/MantidQt/CustomInterfaces/src/Reflectometry/QtReflSettingsTabView.cpp
@@ -13,8 +13,6 @@ QtReflSettingsTabView::QtReflSettingsTabView(QWidget *parent) {
UNUSED_ARG(parent);
initLayout();
-
- m_presenter.reset(new ReflSettingsTabPresenter());
}
//----------------------------------------------------------------------------------------------
@@ -33,6 +31,12 @@ void QtReflSettingsTabView::initLayout() {
QtReflSettingsView *settings_2 = new QtReflSettingsView(this);
m_ui.toolbox->addItem(settings_2, "Group 2");
+
+ std::vector<IReflSettingsPresenter *> presenters;
+ presenters.push_back(settings_1->getPresenter());
+ presenters.push_back(settings_2->getPresenter());
+
+ m_presenter.reset(new ReflSettingsTabPresenter(presenters));
}
/** Returns the presenter managing this view
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflMainWindowPresenter.cpp b/MantidQt/CustomInterfaces/src/Reflectometry/ReflMainWindowPresenter.cpp
index 89f4a97d3e8fcd8970ac5c51ce42ac65d0b8b036..899f66b70be046263bcde19c69aea63e837d0397 100644
--- a/MantidQt/CustomInterfaces/src/Reflectometry/ReflMainWindowPresenter.cpp
+++ b/MantidQt/CustomInterfaces/src/Reflectometry/ReflMainWindowPresenter.cpp
@@ -34,35 +34,41 @@ ReflMainWindowPresenter::ReflMainWindowPresenter(
ReflMainWindowPresenter::~ReflMainWindowPresenter() {}
/** Returns global options for 'CreateTransmissionWorkspaceAuto'
+*
+* @return :: Index of the group in 'Settings' tab from which to get the options
* @return :: Global options for 'CreateTransmissionWorkspaceAuto'
*/
-std::string ReflMainWindowPresenter::getTransmissionOptions() const {
+std::string ReflMainWindowPresenter::getTransmissionOptions(int group) const {
checkPtrValid(m_settingsPresenter);
- return m_settingsPresenter->getTransmissionOptions();
+ return m_settingsPresenter->getTransmissionOptions(group);
}
/** Returns global processing options
+*
+* @return :: Index of the group in 'Settings' tab from which to get the options
* @return :: Global processing options
*/
-std::string ReflMainWindowPresenter::getReductionOptions() const {
+std::string ReflMainWindowPresenter::getReductionOptions(int group) const {
checkPtrValid(m_settingsPresenter);
// Request global processing options to 'Settings' presenter
- return m_settingsPresenter->getReductionOptions();
+ return m_settingsPresenter->getReductionOptions(group);
}
/** Returns global post-processing options
+*
+* @return :: Index of the group in 'Settings' tab from which to get the options
* @return :: Global post-processing options
*/
-std::string ReflMainWindowPresenter::getStitchOptions() const {
+std::string ReflMainWindowPresenter::getStitchOptions(int group) const {
checkPtrValid(m_settingsPresenter);
// Request global post-processing options to 'Settings' presenter
- return m_settingsPresenter->getStitchOptions();
+ return m_settingsPresenter->getStitchOptions(group);
}
/**
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflRunsTabPresenter.cpp b/MantidQt/CustomInterfaces/src/Reflectometry/ReflRunsTabPresenter.cpp
index f6869b9bdc06d1809700e576b7fe581e00abb12a..4c670c6b6a39fa087b4e4e0dcc23d695732a69c5 100644
--- a/MantidQt/CustomInterfaces/src/Reflectometry/ReflRunsTabPresenter.cpp
+++ b/MantidQt/CustomInterfaces/src/Reflectometry/ReflRunsTabPresenter.cpp
@@ -345,7 +345,8 @@ std::map<std::string, std::string>
ReflRunsTabPresenter::getPreprocessingOptions() const {
std::map<std::string, std::string> options;
- options["Transmission Run(s)"] = m_mainPresenter->getTransmissionOptions();
+ options["Transmission Run(s)"] =
+ m_mainPresenter->getTransmissionOptions(m_view->getSelectedGroup());
return options;
}
@@ -355,7 +356,7 @@ ReflRunsTabPresenter::getPreprocessingOptions() const {
* @return :: Global pre-processing options
*/
std::string ReflRunsTabPresenter::getProcessingOptions() const {
- return m_mainPresenter->getReductionOptions();
+ return m_mainPresenter->getReductionOptions(m_view->getSelectedGroup());
}
/** Requests global pre-processing options. Options are supplied by the main
@@ -363,7 +364,7 @@ std::string ReflRunsTabPresenter::getProcessingOptions() const {
* @return :: Global pre-processing options
*/
std::string ReflRunsTabPresenter::getPostprocessingOptions() const {
- return m_mainPresenter->getStitchOptions();
+ return m_mainPresenter->getStitchOptions(m_view->getSelectedGroup());
}
/**
diff --git a/MantidQt/CustomInterfaces/src/Reflectometry/ReflSettingsTabPresenter.cpp b/MantidQt/CustomInterfaces/src/Reflectometry/ReflSettingsTabPresenter.cpp
index 599f7703fdd77c98fe540b974425ba2186064e45..4193cd2248a9d957e96e93ffa488946970daba21 100644
--- a/MantidQt/CustomInterfaces/src/Reflectometry/ReflSettingsTabPresenter.cpp
+++ b/MantidQt/CustomInterfaces/src/Reflectometry/ReflSettingsTabPresenter.cpp
@@ -1,5 +1,6 @@
#include "MantidQtCustomInterfaces/Reflectometry/ReflSettingsTabPresenter.h"
#include "MantidQtCustomInterfaces/Reflectometry/IReflMainWindowPresenter.h"
+#include "MantidQtCustomInterfaces/Reflectometry/ReflSettingsPresenter.h"
#include "MantidQtMantidWidgets/AlgorithmHintStrategy.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/MatrixWorkspace.h"
@@ -11,15 +12,20 @@ using namespace Mantid::API;
using namespace MantidQt::MantidWidgets;
/** Constructor
+*
* @param view :: The view we are handling
*/
-ReflSettingsTabPresenter::ReflSettingsTabPresenter() : m_mainPresenter() {}
+ReflSettingsTabPresenter::ReflSettingsTabPresenter(
+ std::vector<IReflSettingsPresenter *> presenters)
+ : m_mainPresenter(), m_settingsPresenters(presenters) {}
/** Destructor
+*
*/
ReflSettingsTabPresenter::~ReflSettingsTabPresenter() {}
/** Accept a main presenter
+*
* @param mainPresenter :: [input] The main presenter
*/
void ReflSettingsTabPresenter::acceptMainPresenter(
@@ -29,45 +35,42 @@ void ReflSettingsTabPresenter::acceptMainPresenter(
/** Sets the current instrument name and changes accessibility status of
* the polarisation corrections option in the view accordingly
+*
* @param instName :: [input] The name of the instrument to set to
*/
void ReflSettingsTabPresenter::setInstrumentName(const std::string instName) {
- // m_currentInstrumentName = instName;
- // m_view->setPolarisationOptionsEnabled(instName != "INTER" &&
- // instName != "SURF");
+ for (auto presenter : m_settingsPresenters)
+ presenter->setInstrumentName(instName);
}
/** Returns global options for 'CreateTransmissionWorkspaceAuto'
+*
+* @param group :: The group from which to get the options
* @return :: Global options for 'CreateTransmissionWorkspaceAuto'
*/
-std::string ReflSettingsTabPresenter::getTransmissionOptions() const {
+std::string ReflSettingsTabPresenter::getTransmissionOptions(int group) const {
- std::vector<std::string> options;
-
- // TODO
-
- return boost::algorithm::join(options, ",");
+ return m_settingsPresenters.at(group)->getTransmissionOptions();
}
/** Returns global options for 'ReflectometryReductionOneAuto'
+*
+* @param group :: The group from which to get the options
* @return :: Global options for 'ReflectometryReductionOneAuto'
*/
-std::string ReflSettingsTabPresenter::getReductionOptions() const {
-
- std::vector<std::string> options;
-
- // TODO
+std::string ReflSettingsTabPresenter::getReductionOptions(int group) const {
- return boost::algorithm::join(options, ",");
+ return m_settingsPresenters.at(group)->getReductionOptions();
}
/** Returns global options for 'Stitch1DMany'
+*
+* @param group :: The group from which to get the options
* @return :: Global options for 'Stitch1DMany'
*/
-std::string ReflSettingsTabPresenter::getStitchOptions() const {
+std::string ReflSettingsTabPresenter::getStitchOptions(int group) const {
- // TODO
- return std::string();
+ return m_settingsPresenters.at(group)->getStitchOptions();
}
}
}
\ No newline at end of file