From 4b9df48914e3c03f5a1380f8eea7da0986bd6dd0 Mon Sep 17 00:00:00 2001
From: Gemma Guest <gemma.guest@stfc.ac.uk>
Date: Fri, 9 Mar 2018 09:55:03 +0000
Subject: [PATCH] Rename function to get per-angle options
---
.../IReflMainWindowPresenter.h | 4 ++--
.../IReflSettingsPresenter.h | 4 ++--
.../IReflSettingsTabPresenter.h | 4 ++--
.../ISISReflectometry/IReflSettingsView.h | 2 +-
.../ISISReflectometry/QtReflSettingsView.cpp | 6 ++---
.../ISISReflectometry/QtReflSettingsView.h | 4 ++--
.../ReflDataProcessorPresenter.cpp | 4 ++--
.../ReflMainWindowPresenter.cpp | 8 +++----
.../ReflMainWindowPresenter.h | 4 ++--
.../ReflRunsTabPresenter.cpp | 8 +++----
.../ISISReflectometry/ReflRunsTabPresenter.h | 4 ++--
.../ReflSettingsPresenter.cpp | 18 +++++++-------
.../ISISReflectometry/ReflSettingsPresenter.h | 6 ++---
.../ReflSettingsTabPresenter.cpp | 8 +++----
.../ReflSettingsTabPresenter.h | 4 ++--
.../test/ReflMainWindowPresenterTest.h | 8 +++----
.../test/ReflMockObjects.h | 14 +++++------
.../test/ReflSettingsPresenterTest.h | 22 ++++++++---------
.../test/ReflSettingsTabPresenterTest.h | 24 +++++++++----------
.../DataProcessorMainPresenter.h | 4 ++--
20 files changed, 80 insertions(+), 80 deletions(-)
diff --git a/qt/scientific_interfaces/ISISReflectometry/IReflMainWindowPresenter.h b/qt/scientific_interfaces/ISISReflectometry/IReflMainWindowPresenter.h
index 6695a4904a1..6feeb8f3303 100644
--- a/qt/scientific_interfaces/ISISReflectometry/IReflMainWindowPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/IReflMainWindowPresenter.h
@@ -50,10 +50,10 @@ public:
virtual void notifyReductionResumed(int group) = 0;
/// Transmission runs for a specific run angle
- virtual std::string getTransmissionRunsForAngle(int group,
+ virtual std::string getOptionsForAngle(int group,
const double angle) const = 0;
/// Whether there are per-angle transmission runs specified
- virtual bool hasPerAngleTransmissionRuns(int group) const = 0;
+ virtual bool hasPerAngleOptions(int group) const = 0;
/// Pre-processing
virtual MantidWidgets::DataProcessor::OptionsQMap
getTransmissionOptions(int group) const = 0;
diff --git a/qt/scientific_interfaces/ISISReflectometry/IReflSettingsPresenter.h b/qt/scientific_interfaces/ISISReflectometry/IReflSettingsPresenter.h
index 2ee9cdd937d..e340ba1248d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/IReflSettingsPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/IReflSettingsPresenter.h
@@ -42,9 +42,9 @@ class IReflSettingsPresenter {
public:
virtual ~IReflSettingsPresenter(){};
/// Transmission runs for a particular angle
- virtual std::string getTransmissionRunsForAngle(const double angle) const = 0;
+ virtual std::string getOptionsForAngle(const double angle) const = 0;
/// Whether per-angle transmission runs are set
- virtual bool hasPerAngleTransmissionRuns() const = 0;
+ virtual bool hasPerAngleOptions() const = 0;
/// Pre-processing
virtual MantidWidgets::DataProcessor::OptionsQMap
getTransmissionOptions() const = 0;
diff --git a/qt/scientific_interfaces/ISISReflectometry/IReflSettingsTabPresenter.h b/qt/scientific_interfaces/ISISReflectometry/IReflSettingsTabPresenter.h
index 9d5c79653e7..b073b2e9c99 100644
--- a/qt/scientific_interfaces/ISISReflectometry/IReflSettingsTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/IReflSettingsTabPresenter.h
@@ -40,10 +40,10 @@ class IReflSettingsTabPresenter {
public:
virtual ~IReflSettingsTabPresenter(){};
/// Transmission runs for a particular run angle
- virtual std::string getTransmissionRunsForAngle(int group,
+ virtual std::string getOptionsForAngle(int group,
const double angle) const = 0;
/// Whether per-angle transmission runs are specified
- virtual bool hasPerAngleTransmissionRuns(int group) const = 0;
+ virtual bool hasPerAngleOptions(int group) const = 0;
/// Pre-processing
virtual MantidWidgets::DataProcessor::OptionsQMap
getTransmissionOptions(int group) const = 0;
diff --git a/qt/scientific_interfaces/ISISReflectometry/IReflSettingsView.h b/qt/scientific_interfaces/ISISReflectometry/IReflSettingsView.h
index 6d5865301e8..d5160b2ee4f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/IReflSettingsView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/IReflSettingsView.h
@@ -58,7 +58,7 @@ public:
/// Experiment settings
virtual std::string getAnalysisMode() const = 0;
- virtual std::map<std::string, std::string> getTransmissionRuns() const = 0;
+ virtual std::map<std::string, std::string> getPerAngleOptions() const = 0;
virtual std::string getStartOverlap() const = 0;
virtual std::string getEndOverlap() const = 0;
virtual std::string getPolarisationCorrections() const = 0;
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflSettingsView.cpp b/qt/scientific_interfaces/ISISReflectometry/QtReflSettingsView.cpp
index 61303715cf3..ecbd1642439 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflSettingsView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflSettingsView.cpp
@@ -36,7 +36,7 @@ Initialise the Interface
*/
void QtReflSettingsView::initLayout() {
m_ui.setupUi(this);
- initTransmissionRunsTable();
+ initPerAngleOptionsTable();
connect(m_ui.getExpDefaultsButton, SIGNAL(clicked()), this,
SLOT(requestExpDefaults()));
@@ -52,7 +52,7 @@ void QtReflSettingsView::initLayout() {
SLOT(setDetectorCorrectionEnabled(bool)));
}
-void QtReflSettingsView::initTransmissionRunsTable() {
+void QtReflSettingsView::initPerAngleOptionsTable() {
auto table = m_ui.transmissionRunsTable;
const auto columnHeadings = QStringList({"Angle", "Transmission Run(s)"});
table->setColumnCount(columnHeadings.size());
@@ -444,7 +444,7 @@ std::string QtReflSettingsView::getAnalysisMode() const {
* @return :: selected transmission run(s)
*/
std::map<std::string, std::string>
-QtReflSettingsView::getTransmissionRuns() const {
+QtReflSettingsView::getPerAngleOptions() const {
const auto &table = m_ui.transmissionRunsTable;
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflSettingsView.h b/qt/scientific_interfaces/ISISReflectometry/QtReflSettingsView.h
index 7762e332288..874c140995d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflSettingsView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflSettingsView.h
@@ -56,7 +56,7 @@ public:
/// Return selected analysis mode
std::string getAnalysisMode() const override;
/// Return transmission runs
- std::map<std::string, std::string> getTransmissionRuns() const override;
+ std::map<std::string, std::string> getPerAngleOptions() const override;
/// Return start overlap for transmission runs
std::string getStartOverlap() const override;
/// Return end overlap for transmission runs
@@ -140,7 +140,7 @@ public slots:
private:
/// Initialise the interface
void initLayout();
- void initTransmissionRunsTable();
+ void initPerAngleOptionsTable();
void registerSettingsWidgets(Mantid::API::IAlgorithm_sptr alg);
void registerInstrumentSettingsWidgets(Mantid::API::IAlgorithm_sptr alg);
void registerExperimentSettingsWidgets(Mantid::API::IAlgorithm_sptr alg);
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.cpp
index f176aec3669..9a6c1da777a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflDataProcessorPresenter.cpp
@@ -851,7 +851,7 @@ OptionsMap ReflDataProcessorPresenter::getProcessingOptions(RowData_sptr data) {
// Get the angle for the current row. The angle is the second data item
if (!hasAngle(data)) {
- if (m_mainPresenter->hasPerAngleTransmissionRuns()) {
+ if (m_mainPresenter->hasPerAngleOptions()) {
// The user has specified per-angle transmission runs on the settings
// tab. In theory this is fine, but it could cause confusion when the
// angle is not available in the data processor table because the
@@ -873,7 +873,7 @@ OptionsMap ReflDataProcessorPresenter::getProcessingOptions(RowData_sptr data) {
// Insert the transmission runs as the "FirstTransmissionRun" property
auto transmissionRuns =
- m_mainPresenter->getTransmissionRunsForAngle(angle(data));
+ m_mainPresenter->getOptionsForAngle(angle(data));
if (!transmissionRuns.isEmpty()) {
options["FirstTransmissionRun"] = transmissionRuns;
}
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.cpp
index 98aece55c69..aeeb90ed00d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.cpp
@@ -162,20 +162,20 @@ std::string ReflMainWindowPresenter::getTimeSlicingType(int group) const {
* @return :: Values passed for 'Transmission run(s)'
*/
std::string
-ReflMainWindowPresenter::getTransmissionRunsForAngle(int group,
+ReflMainWindowPresenter::getOptionsForAngle(int group,
const double angle) const {
checkSettingsPtrValid(m_settingsPresenter);
- return m_settingsPresenter->getTransmissionRunsForAngle(group, angle);
+ return m_settingsPresenter->getOptionsForAngle(group, angle);
}
/** Returns whether there are per-angle transmission runs specified
* @return :: true if there are per-angle transmission runs
* */
-bool ReflMainWindowPresenter::hasPerAngleTransmissionRuns(int group) const {
+bool ReflMainWindowPresenter::hasPerAngleOptions(int group) const {
checkSettingsPtrValid(m_settingsPresenter);
- return m_settingsPresenter->hasPerAngleTransmissionRuns(group);
+ return m_settingsPresenter->hasPerAngleOptions(group);
}
/**
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.h b/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.h
index 5b68e1325b6..24c84768707 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflMainWindowPresenter.h
@@ -52,10 +52,10 @@ public:
~ReflMainWindowPresenter() override;
/// Returns values passed for 'Transmission run(s)'
- std::string getTransmissionRunsForAngle(int group,
+ std::string getOptionsForAngle(int group,
const double angle) const override;
/// Whether there are per-angle transmission runs specified
- bool hasPerAngleTransmissionRuns(int group) const override;
+ bool hasPerAngleOptions(int group) const override;
/// Returns global options for 'CreateTransmissionWorkspaceAuto'
MantidWidgets::DataProcessor::OptionsQMap
getTransmissionOptions(int group) const override;
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
index 4b3753bc1c0..4e17adc94d5 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
@@ -476,16 +476,16 @@ QString ReflRunsTabPresenter::getTimeSlicingType() const {
* @return :: Transmission run(s) as a comma-separated list
*/
QString
-ReflRunsTabPresenter::getTransmissionRunsForAngle(const double angle) const {
- return QString::fromStdString(m_mainPresenter->getTransmissionRunsForAngle(
+ReflRunsTabPresenter::getOptionsForAngle(const double angle) const {
+ return QString::fromStdString(m_mainPresenter->getOptionsForAngle(
m_view->getSelectedGroup(), angle));
}
/** Check whether there are per-angle transmission runs in the settings
* @return :: true if there are per-angle transmission runs
*/
-bool ReflRunsTabPresenter::hasPerAngleTransmissionRuns() const {
- return m_mainPresenter->hasPerAngleTransmissionRuns(
+bool ReflRunsTabPresenter::hasPerAngleOptions() const {
+ return m_mainPresenter->hasPerAngleOptions(
m_view->getSelectedGroup());
}
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.h b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.h
index 948192abbcb..75fb2717553 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.h
@@ -77,8 +77,8 @@ public:
QString getPostprocessingOptionsAsString() const override;
QString getTimeSlicingValues() const override;
QString getTimeSlicingType() const override;
- QString getTransmissionRunsForAngle(const double angle) const override;
- bool hasPerAngleTransmissionRuns() const override;
+ QString getOptionsForAngle(const double angle) const override;
+ bool hasPerAngleOptions() const override;
/// Handle data reduction paused/resumed
void pause() const override;
void resume() const override;
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflSettingsPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflSettingsPresenter.cpp
index 6e97347e394..0e651306a60 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflSettingsPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflSettingsPresenter.cpp
@@ -226,7 +226,7 @@ OptionsQMap ReflSettingsPresenter::getReductionOptions() const {
// provide per-angle transmission runs, but these need to be
// requested on a per-row basis when we know what the angle is
// for that row.
- auto transmissionRuns = getDefaultTransmissionRuns();
+ auto transmissionRuns = getDefaultOptions();
addIfNotEmpty(options, "FirstTransmissionRun", transmissionRuns);
}
@@ -258,20 +258,20 @@ OptionsQMap ReflSettingsPresenter::getReductionOptions() const {
/** Check whether per-angle transmission runs are specified
*/
-bool ReflSettingsPresenter::hasPerAngleTransmissionRuns() const {
+bool ReflSettingsPresenter::hasPerAngleOptions() const {
// Check the setting is enabled
if (!m_view->experimentSettingsEnabled())
return false;
// Check we have some entries in the table
- auto runsPerAngle = m_view->getTransmissionRuns();
+ auto runsPerAngle = m_view->getPerAngleOptions();
if (runsPerAngle.empty())
return false;
// To save confusion, we only allow EITHER a default transmission runs string
// OR multiple per-angle strings. Therefore if there is a default set there
// cannot be per-angle runs.
- if (!getDefaultTransmissionRuns().empty())
+ if (!getDefaultOptions().empty())
return false;
// Ok, we have some entries and they're not defaults, so assume they're valid
@@ -285,13 +285,13 @@ bool ReflSettingsPresenter::hasPerAngleTransmissionRuns() const {
* @return :: the transmission run(s) as a string of comma-separated values
* @throws :: if the settings the user entered are invalid
*/
-std::string ReflSettingsPresenter::getDefaultTransmissionRuns() const {
+std::string ReflSettingsPresenter::getDefaultOptions() const {
if (!m_view->experimentSettingsEnabled())
return std::string();
// Values are entered as a map of angle to transmission runs. Loop
// through them, checking for the required angle
- auto runsPerAngle = m_view->getTransmissionRuns();
+ auto runsPerAngle = m_view->getPerAngleOptions();
auto iter = runsPerAngle.find("");
if (iter != runsPerAngle.end()) {
// We found an empty angle. Check there is only one entry in the
@@ -313,15 +313,15 @@ std::string ReflSettingsPresenter::getDefaultTransmissionRuns() const {
* @param angleToFind :: the run angle that transmission runs are valid for
* @return :: the transmission run(s) as a string of comma-separated values
*/
-std::string ReflSettingsPresenter::getTransmissionRunsForAngle(
+std::string ReflSettingsPresenter::getOptionsForAngle(
const double angleToFind) const {
std::string result;
- if (!hasPerAngleTransmissionRuns())
+ if (!hasPerAngleOptions())
return result;
// Values are entered as a map of angle to transmission runs
- auto runsPerAngle = m_view->getTransmissionRuns();
+ auto runsPerAngle = m_view->getPerAngleOptions();
// We use a generous tolerance to check the angle because values
// from the log are not that accurate
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflSettingsPresenter.h b/qt/scientific_interfaces/ISISReflectometry/ReflSettingsPresenter.h
index 51a434b1304..7a57045676f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflSettingsPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflSettingsPresenter.h
@@ -54,11 +54,11 @@ public:
/// Returns per-angle values passed for 'Transmission run(s)'
std::string
- getTransmissionRunsForAngle(const double angleToFind) const override;
+ getOptionsForAngle(const double angleToFind) const override;
/// Returns default values passed for 'Transmission run(s)'
- std::string getDefaultTransmissionRuns() const;
+ std::string getDefaultOptions() const;
/// Whether per-angle transmission runs are specified
- bool hasPerAngleTransmissionRuns() const override;
+ bool hasPerAngleOptions() const override;
/// Returns global options for 'CreateTransmissionWorkspaceAuto'
MantidWidgets::DataProcessor::OptionsQMap
getTransmissionOptions() const override;
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflSettingsTabPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflSettingsTabPresenter.cpp
index 4d14e9d16d6..61dd94b1990 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflSettingsTabPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflSettingsTabPresenter.cpp
@@ -65,17 +65,17 @@ void ReflSettingsTabPresenter::onReductionPaused(int group) {
* @param angle :: the run angle to look up transmission runs for
* @return :: Values passed for 'Transmission run(s)'
*/
-std::string ReflSettingsTabPresenter::getTransmissionRunsForAngle(
+std::string ReflSettingsTabPresenter::getOptionsForAngle(
int group, const double angle) const {
- return m_settingsPresenters.at(group)->getTransmissionRunsForAngle(angle);
+ return m_settingsPresenters.at(group)->getOptionsForAngle(angle);
}
/** Check whether per-angle transmission runs are specified
* @return :: true if per-angle transmission runs are specified
*/
-bool ReflSettingsTabPresenter::hasPerAngleTransmissionRuns(int group) const {
- return m_settingsPresenters.at(group)->hasPerAngleTransmissionRuns();
+bool ReflSettingsTabPresenter::hasPerAngleOptions(int group) const {
+ return m_settingsPresenters.at(group)->hasPerAngleOptions();
}
/** Returns global options for 'CreateTransmissionWorkspaceAuto'
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflSettingsTabPresenter.h b/qt/scientific_interfaces/ISISReflectometry/ReflSettingsTabPresenter.h
index 3a04157dff2..eaadb49e11a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflSettingsTabPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflSettingsTabPresenter.h
@@ -55,10 +55,10 @@ public:
passSelfToChildren(std::vector<IReflSettingsPresenter *> const &children);
/// Returns values passed for 'Transmission run(s)'
- std::string getTransmissionRunsForAngle(int group,
+ std::string getOptionsForAngle(int group,
const double angle) const override;
/// Whether per-angle tranmsission runs are set
- bool hasPerAngleTransmissionRuns(int group) const override;
+ bool hasPerAngleOptions(int group) const override;
/// Returns global options for 'CreateTransmissionWorkspaceAuto'
MantidWidgets::DataProcessor::OptionsQMap
getTransmissionOptions(int group) const override;
diff --git a/qt/scientific_interfaces/test/ReflMainWindowPresenterTest.h b/qt/scientific_interfaces/test/ReflMainWindowPresenterTest.h
index e8b3e1c1822..c1fa7511d98 100644
--- a/qt/scientific_interfaces/test/ReflMainWindowPresenterTest.h
+++ b/qt/scientific_interfaces/test/ReflMainWindowPresenterTest.h
@@ -40,13 +40,13 @@ public:
// Should call the settings tab to get the values
double angle = 0.5;
- EXPECT_CALL(mockSettingsTabPresenter, getTransmissionRunsForAngle(0, angle))
+ EXPECT_CALL(mockSettingsTabPresenter, getOptionsForAngle(0, angle))
.Times(Exactly(1));
- presenter.getTransmissionRunsForAngle(0, angle);
+ presenter.getOptionsForAngle(0, angle);
- EXPECT_CALL(mockSettingsTabPresenter, getTransmissionRunsForAngle(1, angle))
+ EXPECT_CALL(mockSettingsTabPresenter, getOptionsForAngle(1, angle))
.Times(Exactly(1));
- presenter.getTransmissionRunsForAngle(1, angle);
+ presenter.getOptionsForAngle(1, angle);
TS_ASSERT(Mock::VerifyAndClearExpectations(&mockSettingsTabPresenter));
}
diff --git a/qt/scientific_interfaces/test/ReflMockObjects.h b/qt/scientific_interfaces/test/ReflMockObjects.h
index 83cc819b184..40901d6f467 100644
--- a/qt/scientific_interfaces/test/ReflMockObjects.h
+++ b/qt/scientific_interfaces/test/ReflMockObjects.h
@@ -106,7 +106,7 @@ public:
MOCK_CONST_METHOD0(getProcessingInstructions, std::string());
MOCK_CONST_METHOD0(getSummationType, std::string());
MOCK_CONST_METHOD0(getReductionType, std::string());
- MOCK_CONST_METHOD0(getTransmissionRuns, std::map<std::string, std::string>());
+ MOCK_CONST_METHOD0(getPerAngleOptions, std::map<std::string, std::string>());
MOCK_CONST_METHOD1(setIsPolCorrEnabled, void(bool));
MOCK_METHOD1(setReductionTypeEnabled, void(bool));
MOCK_METHOD1(setPolarisationOptionsEnabled, void(bool));
@@ -220,8 +220,8 @@ public:
class MockSettingsPresenter : public IReflSettingsPresenter {
public:
- MOCK_CONST_METHOD1(getTransmissionRunsForAngle, std::string(const double));
- MOCK_CONST_METHOD0(hasPerAngleTransmissionRuns, bool());
+ MOCK_CONST_METHOD1(getOptionsForAngle, std::string(const double));
+ MOCK_CONST_METHOD0(hasPerAngleOptions, bool());
MOCK_CONST_METHOD0(getTransmissionOptions, OptionsQMap());
MOCK_CONST_METHOD0(getReductionOptions, OptionsQMap());
MOCK_CONST_METHOD0(getStitchOptions, std::string());
@@ -238,9 +238,9 @@ public:
class MockSettingsTabPresenter : public IReflSettingsTabPresenter {
public:
- MOCK_CONST_METHOD2(getTransmissionRunsForAngle,
+ MOCK_CONST_METHOD2(getOptionsForAngle,
std::string(int, const double));
- MOCK_CONST_METHOD1(hasPerAngleTransmissionRuns, bool(int));
+ MOCK_CONST_METHOD1(hasPerAngleOptions, bool(int));
MOCK_CONST_METHOD0(getTransmissionOptions, OptionsQMap());
MOCK_CONST_METHOD1(getTransmissionOptions, OptionsQMap(int));
MOCK_CONST_METHOD1(getReductionOptions, OptionsQMap(int));
@@ -269,9 +269,9 @@ public:
class MockMainWindowPresenter : public IReflMainWindowPresenter {
public:
- MOCK_CONST_METHOD2(getTransmissionRunsForAngle,
+ MOCK_CONST_METHOD2(getOptionsForAngle,
std::string(int, const double));
- MOCK_CONST_METHOD1(hasPerAngleTransmissionRuns, bool(int));
+ MOCK_CONST_METHOD1(hasPerAngleOptions, bool(int));
MOCK_CONST_METHOD1(getTransmissionOptions, OptionsQMap(int));
MOCK_CONST_METHOD1(getReductionOptions, OptionsQMap(int));
MOCK_CONST_METHOD1(getStitchOptions, std::string(int));
diff --git a/qt/scientific_interfaces/test/ReflSettingsPresenterTest.h b/qt/scientific_interfaces/test/ReflSettingsPresenterTest.h
index 7056fc52d46..da1de2ce632 100644
--- a/qt/scientific_interfaces/test/ReflSettingsPresenterTest.h
+++ b/qt/scientific_interfaces/test/ReflSettingsPresenterTest.h
@@ -58,7 +58,7 @@ public:
void onCallReturnDefaultExperimentSettings(MockSettingsView &mockView) {
ON_CALL(mockView, experimentSettingsEnabled()).WillByDefault(Return(true));
- onCallReturnDefaultTransmissionRuns(mockView);
+ onCallReturnDefaultOptions(mockView);
onCallReturnDefaultAnalysisMode(mockView);
onCallReturnDefaultOverlap(mockView);
onCallReturnDefaultPolarisationCorrections(mockView);
@@ -72,8 +72,8 @@ public:
.WillByDefault(Return("PointDetectorAnalysis"));
}
- void onCallReturnDefaultTransmissionRuns(MockSettingsView &mockView) {
- ON_CALL(mockView, getTransmissionRuns())
+ void onCallReturnDefaultOptions(MockSettingsView &mockView) {
+ ON_CALL(mockView, getPerAngleOptions())
.WillByDefault(Return(std::map<std::string, std::string>()));
}
@@ -390,7 +390,7 @@ public:
std::map<std::string, std::string> transmissionRunsMap = {
{"", "INTER00013463,INTER00013464"}};
- EXPECT_CALL(mockView, getTransmissionRuns())
+ EXPECT_CALL(mockView, getPerAngleOptions())
.Times(AtLeast(1))
.WillOnce(Return(transmissionRunsMap));
@@ -574,7 +574,7 @@ public:
void testInstrumentSettingsDisabled() {
NiceMock<MockSettingsView> mockView;
auto presenter = makeReflSettingsPresenter(&mockView);
- onCallReturnDefaultTransmissionRuns(mockView);
+ onCallReturnDefaultOptions(mockView);
EXPECT_CALL(mockView, experimentSettingsEnabled())
.Times(4)
@@ -607,7 +607,7 @@ public:
EXPECT_CALL(mockView, getMomentumTransferStep()).Times(Exactly(1));
EXPECT_CALL(mockView, getStartOverlap()).Times(Exactly(2));
EXPECT_CALL(mockView, getEndOverlap()).Times(Exactly(2));
- EXPECT_CALL(mockView, getTransmissionRuns()).Times(Exactly(1));
+ EXPECT_CALL(mockView, getPerAngleOptions()).Times(Exactly(1));
EXPECT_CALL(mockView, getStitchOptions()).Times(Exactly(1));
auto transmissionOptions = presenter.getTransmissionOptions();
@@ -629,11 +629,11 @@ public:
EXPECT_CALL(mockView, experimentSettingsEnabled())
.Times(1)
.WillRepeatedly(Return(true));
- EXPECT_CALL(mockView, getTransmissionRuns())
+ EXPECT_CALL(mockView, getPerAngleOptions())
.Times(1)
.WillOnce(Return(transmissionRunsMap));
- auto result = presenter.getDefaultTransmissionRuns();
+ auto result = presenter.getDefaultOptions();
TS_ASSERT_EQUALS(result, "INTER00013463,INTER00013464");
TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
@@ -653,13 +653,13 @@ public:
EXPECT_CALL(mockView, experimentSettingsEnabled())
.Times(4)
.WillRepeatedly(Return(true));
- EXPECT_CALL(mockView, getTransmissionRuns())
+ EXPECT_CALL(mockView, getPerAngleOptions())
.Times(6)
.WillRepeatedly(Return(transmissionRunsMap));
- auto result = presenter.getTransmissionRunsForAngle(0.69);
+ auto result = presenter.getOptionsForAngle(0.69);
TS_ASSERT_EQUALS(result, "INTER00013463,INTER00013464");
- result = presenter.getTransmissionRunsForAngle(2.34);
+ result = presenter.getOptionsForAngle(2.34);
TS_ASSERT_EQUALS(result, "INTER00013463");
TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
diff --git a/qt/scientific_interfaces/test/ReflSettingsTabPresenterTest.h b/qt/scientific_interfaces/test/ReflSettingsTabPresenterTest.h
index 20f049580bd..3f13758585e 100644
--- a/qt/scientific_interfaces/test/ReflSettingsTabPresenterTest.h
+++ b/qt/scientific_interfaces/test/ReflSettingsTabPresenterTest.h
@@ -74,26 +74,26 @@ public:
// Should only call though to the settings presenter for
// the specified group
- EXPECT_CALL(presenter_0, getTransmissionRunsForAngle(angle)).Times(1);
- EXPECT_CALL(presenter_1, getTransmissionRunsForAngle(angle)).Times(0);
- EXPECT_CALL(presenter_2, getTransmissionRunsForAngle(angle)).Times(0);
- presenter.getTransmissionRunsForAngle(0, angle);
+ EXPECT_CALL(presenter_0, getOptionsForAngle(angle)).Times(1);
+ EXPECT_CALL(presenter_1, getOptionsForAngle(angle)).Times(0);
+ EXPECT_CALL(presenter_2, getOptionsForAngle(angle)).Times(0);
+ presenter.getOptionsForAngle(0, angle);
TS_ASSERT(Mock::VerifyAndClearExpectations(&presenter_0));
TS_ASSERT(Mock::VerifyAndClearExpectations(&presenter_1));
TS_ASSERT(Mock::VerifyAndClearExpectations(&presenter_2));
- EXPECT_CALL(presenter_0, getTransmissionRunsForAngle(angle)).Times(0);
- EXPECT_CALL(presenter_1, getTransmissionRunsForAngle(angle)).Times(1);
- EXPECT_CALL(presenter_2, getTransmissionRunsForAngle(angle)).Times(0);
- presenter.getTransmissionRunsForAngle(1, angle);
+ EXPECT_CALL(presenter_0, getOptionsForAngle(angle)).Times(0);
+ EXPECT_CALL(presenter_1, getOptionsForAngle(angle)).Times(1);
+ EXPECT_CALL(presenter_2, getOptionsForAngle(angle)).Times(0);
+ presenter.getOptionsForAngle(1, angle);
TS_ASSERT(Mock::VerifyAndClearExpectations(&presenter_0));
TS_ASSERT(Mock::VerifyAndClearExpectations(&presenter_1));
TS_ASSERT(Mock::VerifyAndClearExpectations(&presenter_2));
- EXPECT_CALL(presenter_0, getTransmissionRunsForAngle(angle)).Times(0);
- EXPECT_CALL(presenter_1, getTransmissionRunsForAngle(angle)).Times(0);
- EXPECT_CALL(presenter_2, getTransmissionRunsForAngle(angle)).Times(1);
- presenter.getTransmissionRunsForAngle(2, angle);
+ EXPECT_CALL(presenter_0, getOptionsForAngle(angle)).Times(0);
+ EXPECT_CALL(presenter_1, getOptionsForAngle(angle)).Times(0);
+ EXPECT_CALL(presenter_2, getOptionsForAngle(angle)).Times(1);
+ presenter.getOptionsForAngle(2, angle);
TS_ASSERT(Mock::VerifyAndClearExpectations(&presenter_0));
TS_ASSERT(Mock::VerifyAndClearExpectations(&presenter_1));
TS_ASSERT(Mock::VerifyAndClearExpectations(&presenter_2));
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
index 1ddcb5853cd..2e2066d0afa 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
@@ -67,12 +67,12 @@ public:
/// Return time-slicing type
virtual QString getTimeSlicingType() const { return QString(); }
/// Return transmission runs for a particular angle
- virtual QString getTransmissionRunsForAngle(const double angle) const {
+ virtual QString getOptionsForAngle(const double angle) const {
UNUSED_ARG(angle);
return QString();
}
/// Return true if there are per-angle transmission runs set
- virtual bool hasPerAngleTransmissionRuns() const { return false; }
+ virtual bool hasPerAngleOptions() const { return false; }
/// Handle data reduction paused/resumed
virtual void pause() const {}
--
GitLab