From d86d156ea3bf5cc2d7b40bbef94a80e82ab4efbe Mon Sep 17 00:00:00 2001
From: Edward Brown <edward.brown@stfc.ac.uk>
Date: Wed, 23 Aug 2017 10:48:23 +0100
Subject: [PATCH] Re #20303: Renamed DataProcessorCommand to Command
---
.../ISISReflectometry/IReflRunsTabView.h | 6 ++---
.../ISISReflectometry/QtReflRunsTabView.cpp | 10 +++----
.../ISISReflectometry/QtReflRunsTabView.h | 12 ++++-----
.../ReflRunsTabPresenter.cpp | 6 ++---
.../test/ReflMockObjects.h | 8 +++---
qt/widgets/common/CMakeLists.txt | 8 +++---
.../DataProcessorUI/AppendGroupCommand.h | 8 +++---
.../Common/DataProcessorUI/AppendRowCommand.h | 8 +++---
.../DataProcessorUI/ClearSelectedCommand.h | 8 +++---
.../DataProcessorUI/CollapseGroupsCommand.h | 6 ++---
.../{DataProcessorCommand.h => Command.h} | 18 ++++++-------
.../DataProcessorUI/CopySelectedCommand.h | 8 +++---
.../DataProcessorCommandAdapter.h | 26 +++++++++----------
.../DataProcessorCommandBase.h | 10 +++----
.../DataProcessorCutSelectedCommand.h | 8 +++---
.../DataProcessorDeleteGroupCommand.h | 8 +++---
.../DataProcessorDeleteRowCommand.h | 8 +++---
.../DataProcessorExpandCommand.h | 8 +++---
.../DataProcessorExpandGroupsCommand.h | 6 ++---
.../DataProcessorExportTableCommand.h | 8 +++---
.../DataProcessorGroupRowsCommand.h | 8 +++---
.../DataProcessorImportTableCommand.h | 8 +++---
.../DataProcessorMockObjects.h | 6 ++---
.../DataProcessorNewTableCommand.h | 8 +++---
.../DataProcessorOneLevelTreeManager.h | 2 +-
.../DataProcessorOpenTableCommand.h | 8 +++---
.../DataProcessorOptionsCommand.h | 8 +++---
.../DataProcessorPasteSelectedCommand.h | 8 +++---
.../DataProcessorPauseCommand.h | 6 ++---
.../DataProcessorPlotGroupCommand.h | 8 +++---
.../DataProcessorPlotRowCommand.h | 8 +++---
.../DataProcessorUI/DataProcessorPresenter.h | 4 +--
.../DataProcessorProcessCommand.h | 8 +++---
.../DataProcessorSaveTableAsCommand.h | 8 +++---
.../DataProcessorSaveTableCommand.h | 8 +++---
.../DataProcessorSeparatorCommand.h | 8 +++---
.../DataProcessorTreeManager.h | 8 +++---
.../DataProcessorTwoLevelTreeManager.h | 2 +-
.../DataProcessorUI/DataProcessorView.h | 4 +--
.../DataProcessorWorkspaceCommand.h | 8 +++---
.../GenericDataProcessorPresenter.h | 6 ++---
.../DataProcessorUI/QDataProcessorWidget.h | 6 ++---
.../DataProcessorOneLevelTreeManager.cpp | 4 +--
.../DataProcessorTwoLevelTreeManager.cpp | 4 +--
.../GenericDataProcessorPresenter.cpp | 8 +++---
.../DataProcessorUI/QDataProcessorWidget.cpp | 6 ++---
.../DataProcessorCommandsTest.h | 8 +++---
.../data_processor_gui.py | 2 +-
scripts/Interface/ui/poldi/poldi_gui.py | 2 +-
49 files changed, 185 insertions(+), 185 deletions(-)
rename qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/{DataProcessorCommand.h => Command.h} (77%)
diff --git a/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h b/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h
index a00e39320ac..725d127a6de 100644
--- a/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h
@@ -9,7 +9,7 @@ namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-class DataProcessorCommand;
+class Command;
}
}
namespace API {
@@ -62,9 +62,9 @@ public:
const std::string &defaultInstrument) = 0;
virtual void setTransferMethods(const std::set<std::string> &methods) = 0;
virtual void setTableCommands(
- std::vector<std::unique_ptr<DataProcessor::DataProcessorCommand>> tableCommands) = 0;
+ std::vector<std::unique_ptr<DataProcessor::Command>> tableCommands) = 0;
virtual void setRowCommands(
- std::vector<std::unique_ptr<DataProcessor::DataProcessorCommand>> rowCommands) = 0;
+ std::vector<std::unique_ptr<DataProcessor::Command>> rowCommands) = 0;
virtual void setAllSearchRowsSelected() = 0;
virtual void clearCommands() = 0;
virtual void setRowActionEnabled(int index, bool enabled) = 0;
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp
index 372cfb16f1c..1fad565649f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp
@@ -8,7 +8,7 @@
#include "ReflGenericDataProcessorPresenterFactory.h"
#include "ReflRunsTabPresenter.h"
#include "ReflSearchModel.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandAdapter.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
#include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h"
#include "MantidQtWidgets/Common/HintingLineEditFactory.h"
@@ -114,9 +114,9 @@ void QtReflRunsTabView::initLayout() {
* @param command : [input] The command (action) to add
*/
void QtReflRunsTabView::addToMenu(QMenu *menu,
- DataProcessor::DataProcessorCommand_uptr command) {
+ DataProcessor::Command_uptr command) {
- m_commands.push_back(Mantid::Kernel::make_unique<DataProcessorCommandAdapter>(
+ m_commands.push_back(Mantid::Kernel::make_unique<CommandAdapter>(
menu, std::move(command)));
}
@@ -126,7 +126,7 @@ void QtReflRunsTabView::addToMenu(QMenu *menu,
* "Reflectometry" menu
*/
void QtReflRunsTabView::setTableCommands(
- std::vector<DataProcessor::DataProcessorCommand_uptr> tableCommands) {
+ std::vector<DataProcessor::Command_uptr> tableCommands) {
ui.menuTable->clear();
for (auto &command : tableCommands) {
@@ -145,7 +145,7 @@ void QtReflRunsTabView::setTableCommands(
* @param rowCommands : [input] The list of commands to add to the "Edit" menu
*/
void QtReflRunsTabView::setRowCommands(
- std::vector<DataProcessor::DataProcessorCommand_uptr> rowCommands) {
+ std::vector<DataProcessor::Command_uptr> rowCommands) {
ui.menuRows->clear();
for (auto &command : rowCommands) {
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h
index 5bea1d0f25f..ec9060c14f2 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h
@@ -14,8 +14,8 @@ namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
// Forward decs
-class DataProcessorCommand;
-class DataProcessorCommandAdapter;
+class Command;
+class CommandAdapter;
}
class SlitCalculator;
}
@@ -73,10 +73,10 @@ public:
void setInstrumentList(const std::vector<std::string> &instruments,
const std::string &defaultInstrument) override;
void setTransferMethods(const std::set<std::string> &methods) override;
- void setTableCommands(std::vector<std::unique_ptr<DataProcessor::DataProcessorCommand>>
+ void setTableCommands(std::vector<std::unique_ptr<DataProcessor::Command>>
tableCommands) override;
void setRowCommands(
- std::vector<std::unique_ptr<DataProcessor::DataProcessorCommand>> rowCommands) override;
+ std::vector<std::unique_ptr<DataProcessor::Command>> rowCommands) override;
void setAllSearchRowsSelected() override;
void clearCommands() override;
void setRowActionEnabled(int index, bool enabled) override;
@@ -102,7 +102,7 @@ private:
/// initialise the interface
void initLayout();
// Adds an action (command) to a menu
- void addToMenu(QMenu *menu, std::unique_ptr<DataProcessor::DataProcessorCommand> command);
+ void addToMenu(QMenu *menu, std::unique_ptr<DataProcessor::Command> command);
boost::shared_ptr<MantidQt::API::AlgorithmRunner> m_algoRunner;
@@ -115,7 +115,7 @@ private:
// the slit calculator
SlitCalculator *m_calculator;
// Command adapters
- std::vector<std::unique_ptr<DataProcessor::DataProcessorCommandAdapter>> m_commands;
+ std::vector<std::unique_ptr<DataProcessor::CommandAdapter>> m_commands;
private slots:
void on_actionSearch_triggered();
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
index 4ae3875b7f1..9ec597eb07c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
@@ -15,7 +15,7 @@
#include "ReflNexusMeasurementItemSource.h"
#include "ReflSearchModel.h"
#include "ReflFromStdStringMap.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/Command.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
#include "MantidQtWidgets/Common/ProgressPresenter.h"
@@ -165,12 +165,12 @@ void ReflRunsTabPresenter::pushCommands() {
const size_t rowCommStart = 10u;
// We want to have two menus
// Populate the "Reflectometry" menu
- std::vector<MantidWidgets::DataProcessor::DataProcessorCommand_uptr> tableCommands;
+ std::vector<MantidWidgets::DataProcessor::Command_uptr> tableCommands;
for (size_t i = 0; i < rowCommStart; i++)
tableCommands.push_back(std::move(commands[i]));
m_view->setTableCommands(std::move(tableCommands));
// Populate the "Edit" menu
- std::vector<MantidWidgets::DataProcessor::DataProcessorCommand_uptr> rowCommands;
+ std::vector<MantidWidgets::DataProcessor::Command_uptr> rowCommands;
for (size_t i = rowCommStart; i < nCommands; i++)
rowCommands.push_back(std::move(commands[i]));
m_view->setRowCommands(std::move(rowCommands));
diff --git a/qt/scientific_interfaces/test/ReflMockObjects.h b/qt/scientific_interfaces/test/ReflMockObjects.h
index fb314302d17..6ea009b0d08 100644
--- a/qt/scientific_interfaces/test/ReflMockObjects.h
+++ b/qt/scientific_interfaces/test/ReflMockObjects.h
@@ -17,7 +17,7 @@
#include "../ISISReflectometry/IReflSettingsTabPresenter.h"
#include "../ISISReflectometry/IReflSettingsView.h"
#include "../ISISReflectometry/ReflSearchModel.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/Command.h"
#include <gmock/gmock.h>
using namespace MantidQt::CustomInterfaces;
@@ -31,19 +31,19 @@ class MockRunsTabView : public IReflRunsTabView {
public:
// Gmock requires parameters and return values of mocked methods to be
// copyable
- // We can't mock setTableCommands(std::vector<DataProcessorCommand_uptr>)
+ // We can't mock setTableCommands(std::vector<Command_uptr>)
// because
// of the vector of unique pointers
// I will mock a proxy method, setTableCommandsProxy, I just want to test that
// this method is invoked by the presenter's constructor
virtual void setTableCommands(
- std::vector<MantidQt::MantidWidgets::DataProcessor::DataProcessorCommand_uptr>)
+ std::vector<MantidQt::MantidWidgets::DataProcessor::Command_uptr>)
override {
setTableCommandsProxy();
}
// The same happens for setRowCommands
virtual void setRowCommands(
- std::vector<MantidQt::MantidWidgets::DataProcessor::DataProcessorCommand_uptr>)
+ std::vector<MantidQt::MantidWidgets::DataProcessor::Command_uptr>)
override {
setRowCommandsProxy();
}
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 5ee5125a0c3..6a47b7aca48 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -184,7 +184,7 @@ set ( MOC_FILES
inc/MantidQtWidgets/Common/CheckboxHeader.h
inc/MantidQtWidgets/Common/ColorBarWidget.h
inc/MantidQtWidgets/Common/DataProcessorUI/AbstractTreeModel.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/CommandAdapter.h
inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h
inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterThread.h
inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterRowReducerWorker.h
@@ -305,8 +305,8 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/Command.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/CommandBase.h
inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
@@ -440,7 +440,7 @@ set( TEST_FILES
SignalBlockerTest.h
AlgorithmHintStrategyTest.h
TrackedActionTest.h
- DataProcessorUI/DataProcessorCommandsTest.h
+ DataProcessorUI/CommandsTest.h
DataProcessorUI/DataProcessorGenerateNotebookTest.h
DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
DataProcessorUI/DataProcessorPostprocessingAlgorithmTest.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
index 5df336d8454..1c16e57a002 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORAPPENDGROUPCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORAPPENDGROUPCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
namespace MantidQt {
@@ -32,12 +32,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class AppendGroupCommand : public DataProcessorCommandBase {
+class AppendGroupCommand : public CommandBase {
public:
AppendGroupCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
AppendGroupCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~AppendGroupCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
index 564c1151f22..56f4cc6bb82 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORAPPENDROWCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORAPPENDROWCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
namespace MantidQt {
@@ -32,12 +32,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class AppendRowCommand : public DataProcessorCommandBase {
+class AppendRowCommand : public CommandBase {
public:
AppendRowCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
AppendRowCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~AppendRowCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
index 00ed923f8a7..9ec0f7b0be8 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCLEARSELECTEDCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCLEARSELECTEDCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,12 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class ClearSelectedCommand : public DataProcessorCommandBase {
+class ClearSelectedCommand : public CommandBase {
public:
ClearSelectedCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
ClearSelectedCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~ClearSelectedCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h
index 3c956bcbf49..040aee5022f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOLLAPSEGROUPSCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOLLAPSEGROUPSCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,10 +31,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class CollapseGroupsCommand : public DataProcessorCommandBase {
+class CollapseGroupsCommand : public CommandBase {
public:
CollapseGroupsCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter) {}
+ : CommandBase(tablePresenter) {}
virtual ~CollapseGroupsCommand() {}
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/Command.h
similarity index 77%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/Command.h
index 85e38b75ea0..95adee7c16c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/Command.h
@@ -9,9 +9,9 @@
namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** @class DataProcessorCommand
+/** @class Command
-DataProcessorCommand is an interface which defines the functions any data
+Command is an interface which defines the functions any data
processor action needs to support.
Copyright © 2011-16 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
@@ -35,10 +35,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorCommand {
+class Command {
public:
- DataProcessorCommand() : m_child(){};
- virtual ~DataProcessorCommand(){};
+ Command() : m_child(){};
+ virtual ~Command(){};
virtual void execute() = 0;
virtual QString name() = 0;
@@ -48,10 +48,10 @@ public:
virtual QString shortcut() = 0;
virtual bool hasChild() final { return !m_child.empty(); };
virtual void
- setChild(std::vector<std::unique_ptr<DataProcessorCommand>> child) final {
+ setChild(std::vector<std::unique_ptr<Command>> child) final {
m_child = std::move(child);
}
- virtual std::vector<std::unique_ptr<DataProcessorCommand>> &getChild() final {
+ virtual std::vector<std::unique_ptr<Command>> &getChild() final {
return m_child;
}
virtual bool isSeparator() final {
@@ -59,11 +59,11 @@ public:
}
protected:
- std::vector<std::unique_ptr<DataProcessorCommand>> m_child;
+ std::vector<std::unique_ptr<Command>> m_child;
};
/// Typedef for a shared pointer to \c ReflSearchModel
-using DataProcessorCommand_uptr = std::unique_ptr<DataProcessorCommand>;
+using Command_uptr = std::unique_ptr<Command>;
}
}
}
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
index 5414f258b52..5e706e42d92 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOPYSELECTEDCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOPYSELECTEDCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,12 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class CopySelectedCommand : public DataProcessorCommandBase {
+class CopySelectedCommand : public CommandBase {
public:
CopySelectedCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
CopySelectedCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~CopySelectedCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h
index 2e7518898d0..db8f7c7aafa 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h
@@ -2,7 +2,7 @@
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMANDADAPTER_H
#include "MantidKernel/make_unique.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/Command.h"
#include "MantidQtWidgets/Common/DllOption.h"
#include <QObject>
#include <memory>
@@ -14,11 +14,11 @@ namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-using DataProcessorCommand_uptr = std::unique_ptr<DataProcessorCommand>;
+using Command_uptr = std::unique_ptr<Command>;
-/** @class DataProcessorCommandAdapter
+/** @class CommandAdapter
-DataProcessorCommandAdapter is an adapter that allows DataProcessorCommands to
+CommandAdapter is an adapter that allows Commands to
be treated as
QObjects for signals.
@@ -43,14 +43,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class EXPORT_OPT_MANTIDQT_COMMON DataProcessorCommandAdapter : public QObject {
+class EXPORT_OPT_MANTIDQT_COMMON CommandAdapter : public QObject {
Q_OBJECT
public:
/** Constructor: Adds actions to a menu
* @param menu :: The menu where the actions will be added
* @param adaptee :: The action to add
*/
- DataProcessorCommandAdapter(QMenu *menu, DataProcessorCommand_uptr adaptee)
+ CommandAdapter(QMenu *menu, Command_uptr adaptee)
: m_adaptee(std::move(adaptee)) {
if (m_adaptee->hasChild()) {
@@ -62,7 +62,7 @@ public:
auto &child = m_adaptee->getChild();
for (auto &ch : child) {
m_adapter.push_back(
- Mantid::Kernel::make_unique<DataProcessorCommandAdapter>(
+ Mantid::Kernel::make_unique<CommandAdapter>(
submenu, std::move(ch)));
}
} else {
@@ -76,8 +76,8 @@ public:
* @param toolbar :: The toolbar where actions will be added
* @param adaptee :: The action to add
*/
- DataProcessorCommandAdapter(QToolBar *toolbar,
- DataProcessorCommand_uptr adaptee)
+ CommandAdapter(QToolBar *toolbar,
+ Command_uptr adaptee)
: m_adaptee(std::move(adaptee)) {
if (!m_adaptee->hasChild()) {
@@ -111,12 +111,12 @@ public slots:
private:
// The adaptee
- DataProcessorCommand_uptr m_adaptee;
- std::vector<std::unique_ptr<DataProcessorCommandAdapter>> m_adapter;
+ Command_uptr m_adaptee;
+ std::vector<std::unique_ptr<CommandAdapter>> m_adapter;
};
-using DataProcessorCommandAdapter_uptr =
- std::unique_ptr<DataProcessorCommandAdapter>;
+using CommandAdapter_uptr =
+ std::unique_ptr<CommandAdapter>;
}
}
}
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h
index e202a68197f..d549b8c22ea 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMANDBASE_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMANDBASE_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/Command.h"
#include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
@@ -35,16 +35,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorCommandBase : public DataProcessorCommand {
+class CommandBase : public Command {
public:
- DataProcessorCommandBase(DataProcessorPresenter *tablePresenter)
+ CommandBase(DataProcessorPresenter *tablePresenter)
: m_presenter(tablePresenter) {
if (!tablePresenter) {
throw std::invalid_argument("Invalid abstract presenter");
}
};
- DataProcessorCommandBase(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget.getPresenter()) {}
+ CommandBase(const QDataProcessorWidget &widget)
+ : CommandBase(widget.getPresenter()) {}
protected:
DataProcessorPresenter *const m_presenter;
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
index ff425a474e2..1f68538a86c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCUTSELECTEDCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCUTSELECTEDCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,12 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorCutSelectedCommand : public DataProcessorCommandBase {
+class DataProcessorCutSelectedCommand : public CommandBase {
public:
DataProcessorCutSelectedCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorCutSelectedCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorCutSelectedCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
index 8896aa930e0..cb3c062719d 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORDELETEGROUPCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORDELETEGROUPCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -32,12 +32,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorDeleteGroupCommand : public DataProcessorCommandBase {
+class DataProcessorDeleteGroupCommand : public CommandBase {
public:
DataProcessorDeleteGroupCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorDeleteGroupCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorDeleteGroupCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
index bc8f4fa2bfa..a1a50b19522 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORDELETEROWCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORDELETEROWCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -32,12 +32,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorDeleteRowCommand : public DataProcessorCommandBase {
+class DataProcessorDeleteRowCommand : public CommandBase {
public:
DataProcessorDeleteRowCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorDeleteRowCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorDeleteRowCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
index b11dce5e74e..7acb0166dca 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPANDCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPANDCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,12 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorExpandCommand : public DataProcessorCommandBase {
+class DataProcessorExpandCommand : public CommandBase {
public:
DataProcessorExpandCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorExpandCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorExpandCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h
index fac75beabb5..8b7972ec826 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPANDGROUPSCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPANDGROUPSCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,10 +31,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorExpandGroupsCommand : public DataProcessorCommandBase {
+class DataProcessorExpandGroupsCommand : public CommandBase {
public:
DataProcessorExpandGroupsCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter) {}
+ : CommandBase(tablePresenter) {}
virtual ~DataProcessorExpandGroupsCommand() {}
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
index 6736081bcf2..e6e6fdc09af 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPORTTABLECOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPORTTABLECOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -33,12 +33,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorExportTableCommand : public DataProcessorCommandBase {
+class DataProcessorExportTableCommand : public CommandBase {
public:
DataProcessorExportTableCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorExportTableCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorExportTableCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
index cbeea6bed38..967cad942b0 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORGROUPROWSCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORGROUPROWSCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,12 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorGroupRowsCommand : public DataProcessorCommandBase {
+class DataProcessorGroupRowsCommand : public CommandBase {
public:
DataProcessorGroupRowsCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorGroupRowsCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorGroupRowsCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h
index e39ec2b5e31..e0590ce0060 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORIMPORTTABLECOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORIMPORTTABLECOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,12 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorImportTableCommand : public DataProcessorCommandBase {
+class DataProcessorImportTableCommand : public CommandBase {
public:
DataProcessorImportTableCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorImportTableCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorImportTableCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h
index 56c535488b8..1ab0e5ff8c0 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h
@@ -71,7 +71,7 @@ public:
// Actions/commands
// Gmock requires parameters and return values of mocked methods to be
// copyable which means we have to mock addActions() via a proxy method
- void addActions(std::vector<DataProcessorCommand_uptr>) override {
+ void addActions(std::vector<Command_uptr>) override {
addActionsProxy();
}
MOCK_METHOD0(addActionsProxy, void());
@@ -146,8 +146,8 @@ private:
return m_options;
};
- std::vector<DataProcessorCommand_uptr> publishCommands() override {
- std::vector<DataProcessorCommand_uptr> commands;
+ std::vector<Command_uptr> publishCommands() override {
+ std::vector<Command_uptr> commands;
for (size_t i = 0; i < 31; i++)
commands.push_back(
Mantid::Kernel::make_unique<AppendRowCommand>(this));
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h
index 0ba822968c4..4080e919254 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORNEWTABLECOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORNEWTABLECOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,12 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorNewTableCommand : public DataProcessorCommandBase {
+class DataProcessorNewTableCommand : public CommandBase {
public:
DataProcessorNewTableCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorNewTableCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorNewTableCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h
index 749d2930e1e..79eb289a613 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h
@@ -53,7 +53,7 @@ public:
~DataProcessorOneLevelTreeManager() override;
/// Publish commands
- std::vector<std::unique_ptr<DataProcessorCommand>> publishCommands() override;
+ std::vector<std::unique_ptr<Command>> publishCommands() override;
/// Append a row
void appendRow() override;
/// Append a group to the model
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h
index 18c9d4bf341..cbfe1898c20 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPENTABLECOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPENTABLECOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,12 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorOpenTableCommand : public DataProcessorCommandBase {
+class DataProcessorOpenTableCommand : public CommandBase {
public:
DataProcessorOpenTableCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorOpenTableCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorOpenTableCommand(){};
void execute() override{
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h
index 867a2973751..1d7263afc81 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPTIONSTABLECOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPTIONSTABLECOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,12 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorOptionsCommand : public DataProcessorCommandBase {
+class DataProcessorOptionsCommand : public CommandBase {
public:
DataProcessorOptionsCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorOptionsCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorOptionsCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h
index ace00f8f4f2..1a23091ffca 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPASTESELECTEDCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPASTESELECTEDCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,12 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorPasteSelectedCommand : public DataProcessorCommandBase {
+class DataProcessorPasteSelectedCommand : public CommandBase {
public:
DataProcessorPasteSelectedCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorPasteSelectedCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorPasteSelectedCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h
index aea795252de..a12eaf9b802 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPAUSECOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPAUSECOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,10 +31,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorPauseCommand : public DataProcessorCommandBase {
+class DataProcessorPauseCommand : public CommandBase {
public:
DataProcessorPauseCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
virtual ~DataProcessorPauseCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h
index 6a1fac57617..6d3c1aa1745 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPLOTGROUPCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPLOTGROUPCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,12 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorPlotGroupCommand : public DataProcessorCommandBase {
+class DataProcessorPlotGroupCommand : public CommandBase {
public:
DataProcessorPlotGroupCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorPlotGroupCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorPlotGroupCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h
index 249bdbfce21..23089ec8704 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPLOTROWCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPLOTROWCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,12 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorPlotRowCommand : public DataProcessorCommandBase {
+class DataProcessorPlotRowCommand : public CommandBase {
public:
DataProcessorPlotRowCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorPlotRowCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorPlotRowCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h
index 450204e86eb..092e3d40971 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h
@@ -15,7 +15,7 @@ namespace MantidWidgets {
class ProgressableView;
namespace DataProcessor {
// Forward decs
-class DataProcessorCommand;
+class Command;
class DataProcessorMainPresenter;
class DataProcessorView;
@@ -85,7 +85,7 @@ public:
transfer(const std::vector<std::map<QString, QString>> &runs) = 0;
virtual void setInstrumentList(const QStringList &instruments,
const QString &defaultInstrument) = 0;
- virtual std::vector<std::unique_ptr<DataProcessorCommand>>
+ virtual std::vector<std::unique_ptr<Command>>
publishCommands() = 0;
virtual void accept(DataProcessorMainPresenter *mainPresenter) = 0;
virtual void acceptViews(DataProcessorView *tableView,
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h
index 575d7ce21ad..3ca9a2a6124 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPROCESSCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPROCESSCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -32,12 +32,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorProcessCommand : public DataProcessorCommandBase {
+class DataProcessorProcessCommand : public CommandBase {
public:
DataProcessorProcessCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorProcessCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorProcessCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h
index 8efab440870..1e7d3e18e7c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORSAVETABLEASCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORSAVETABLEASCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,12 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorSaveTableAsCommand : public DataProcessorCommandBase {
+class DataProcessorSaveTableAsCommand : public CommandBase {
public:
DataProcessorSaveTableAsCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorSaveTableAsCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorSaveTableAsCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h
index 5dd70ea7119..274e2840872 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORSAVETABLECOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORSAVETABLECOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,12 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorSaveTableCommand : public DataProcessorCommandBase {
+class DataProcessorSaveTableCommand : public CommandBase {
public:
DataProcessorSaveTableCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorSaveTableCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorSaveTableCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h
index e90090ef9b8..c14d888129c 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORSEPARATORCOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORSEPARATORCOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -33,12 +33,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorSeparatorCommand : public DataProcessorCommandBase {
+class DataProcessorSeparatorCommand : public CommandBase {
public:
DataProcessorSeparatorCommand(DataProcessorPresenter *tablePresenter)
- : DataProcessorCommandBase(tablePresenter){};
+ : CommandBase(tablePresenter){};
DataProcessorSeparatorCommand(const QDataProcessorWidget &widget)
- : DataProcessorCommandBase(widget){};
+ : CommandBase(widget){};
virtual ~DataProcessorSeparatorCommand(){};
void execute() override{};
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTreeManager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTreeManager.h
index f8d0eae1ea8..4b6b99d2f4a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTreeManager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTreeManager.h
@@ -15,7 +15,7 @@ namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-class DataProcessorCommand;
+class Command;
class DataProcessorWhiteList;
/** @class DataProcessorTreeManager
@@ -54,7 +54,7 @@ public:
/// Actions/commands
/// Publish actions/commands
- virtual std::vector<std::unique_ptr<DataProcessorCommand>>
+ virtual std::vector<std::unique_ptr<Command>>
publishCommands() = 0;
/// Append a row
virtual void appendRow() = 0;
@@ -112,8 +112,8 @@ public:
protected:
/// Add a command to the list of available commands
- void addCommand(std::vector<std::unique_ptr<DataProcessorCommand>> &commands,
- std::unique_ptr<DataProcessorCommand> command) {
+ void addCommand(std::vector<std::unique_ptr<Command>> &commands,
+ std::unique_ptr<Command> command) {
commands.push_back(std::move(command));
}
};
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h
index 047698b5aea..ca07c3829f0 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h
@@ -53,7 +53,7 @@ public:
~DataProcessorTwoLevelTreeManager() override;
/// Publish commands
- std::vector<std::unique_ptr<DataProcessorCommand>> publishCommands() override;
+ std::vector<std::unique_ptr<Command>> publishCommands() override;
/// Append a row
void appendRow() override;
/// Append a group to the model
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h
index 44395923ed9..4e8c3da1698 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h
@@ -16,7 +16,7 @@ namespace MantidWidgets {
class HintStrategy;
namespace DataProcessor {
// Forward dec
-class DataProcessorCommand;
+class Command;
class DataProcessorPresenter;
/** @class DataProcessorView
@@ -54,7 +54,7 @@ public:
// Add actions to the toolbar
virtual void
- addActions(std::vector<std::unique_ptr<DataProcessorCommand>> commands) = 0;
+ addActions(std::vector<std::unique_ptr<Command>> commands) = 0;
// Connect the model
virtual void showTable(boost::shared_ptr<AbstractTreeModel> model) = 0;
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h
index 0219e6ef18f..03e5ab6fb85 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h
@@ -1,7 +1,7 @@
#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORWORKSPACECOMMAND_H
#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORWORKSPACECOMMAND_H
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
namespace MantidQt {
namespace MantidWidgets {
@@ -31,14 +31,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DataProcessorWorkspaceCommand : public DataProcessorCommandBase {
+class DataProcessorWorkspaceCommand : public CommandBase {
public:
DataProcessorWorkspaceCommand(DataProcessorPresenter *tablePresenter,
const QString &name)
- : DataProcessorCommandBase(tablePresenter), m_name(name){};
+ : CommandBase(tablePresenter), m_name(name){};
DataProcessorWorkspaceCommand(const QDataProcessorWidget &widget,
const QString &name)
- : DataProcessorCommandBase(widget), m_name(name){};
+ : CommandBase(widget), m_name(name){};
virtual ~DataProcessorWorkspaceCommand(){};
void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h
index 11ae5da8561..0d64af41f1f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h
@@ -4,7 +4,7 @@
#include "MantidAPI/ITableWorkspace_fwd.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidQtWidgets/Common/WorkspaceObserver.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/Command.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h"
@@ -117,7 +117,7 @@ public:
void transfer(const std::vector<std::map<QString, QString>> &runs) override;
void setInstrumentList(const QStringList &instruments,
const QString &defaultInstrument) override;
- std::vector<std::unique_ptr<DataProcessorCommand>> publishCommands() override;
+ std::vector<std::unique_ptr<Command>> publishCommands() override;
void acceptViews(DataProcessorView *tableView,
ProgressableView *progressView) override;
void accept(DataProcessorMainPresenter *mainPresenter) override;
@@ -314,7 +314,7 @@ private:
void afterReplaceHandle(const std::string &name,
Mantid::API::Workspace_sptr workspace) override;
void saveNotebook(const TreeData &data);
- std::vector<std::unique_ptr<DataProcessorCommand>> getTableList();
+ std::vector<std::unique_ptr<Command>> getTableList();
};
}
}
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
index 3ade77c3d4d..0e59ab44048 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
@@ -14,7 +14,7 @@ namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-class DataProcessorCommandAdapter;
+class CommandAdapter;
class DataProcessorMainPresenter;
class DataProcessorPreprocessMap;
class DataProcessorProcessingAlgorithm;
@@ -74,7 +74,7 @@ public:
// Add actions to the toolbar
void addActions(
- std::vector<std::unique_ptr<DataProcessorCommand>> commands) override;
+ std::vector<std::unique_ptr<Command>> commands) override;
// Connect the model
void
@@ -158,7 +158,7 @@ private:
QMenu *m_contextMenu;
QSignalMapper *m_openMap;
// Command adapters
- std::vector<std::unique_ptr<DataProcessorCommandAdapter>> m_commands;
+ std::vector<std::unique_ptr<CommandAdapter>> m_commands;
signals:
void comboProcessInstrument_currentIndexChanged(int index);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
index 7758a4b4794..6ec95e93242 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
@@ -64,10 +64,10 @@ DataProcessorOneLevelTreeManager::~DataProcessorOneLevelTreeManager() {}
* Publishes a list of available commands
* @return : The list of available commands
*/
-std::vector<DataProcessorCommand_uptr>
+std::vector<Command_uptr>
DataProcessorOneLevelTreeManager::publishCommands() {
- std::vector<DataProcessorCommand_uptr> commands;
+ std::vector<Command_uptr> commands;
addCommand(commands, make_unique<DataProcessorOpenTableCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorNewTableCommand>(m_presenter));
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index 61be8b79156..0ddbb2f6c70 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -73,10 +73,10 @@ DataProcessorTwoLevelTreeManager::~DataProcessorTwoLevelTreeManager() {}
* Publishes a list of available commands
* @return : The list of available commands
*/
-std::vector<DataProcessorCommand_uptr>
+std::vector<Command_uptr>
DataProcessorTwoLevelTreeManager::publishCommands() {
- std::vector<DataProcessorCommand_uptr> commands;
+ std::vector<Command_uptr> commands;
addCommand(commands, make_unique<DataProcessorOpenTableCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorNewTableCommand>(m_presenter));
diff --git a/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp b/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
index 8085eb3fa13..b1a24eb7ac6 100644
--- a/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
@@ -1574,7 +1574,7 @@ void GenericDataProcessorPresenter::initOptions() {
void GenericDataProcessorPresenter::addCommands() {
auto commands = m_manager->publishCommands();
- std::vector<std::unique_ptr<DataProcessorCommand>> commandsToShow;
+ std::vector<std::unique_ptr<Command>> commandsToShow;
for (auto comm = 10u; comm < commands.size(); comm++)
commandsToShow.push_back(std::move(commands.at(comm)));
m_view->addActions(std::move(commandsToShow));
@@ -1626,7 +1626,7 @@ void GenericDataProcessorPresenter::setPromptUser(bool allowPrompt) {
* Publishes a list of available commands
* @return : The list of available commands
*/
-std::vector<std::unique_ptr<DataProcessorCommand>>
+std::vector<std::unique_ptr<Command>>
GenericDataProcessorPresenter::publishCommands() {
auto commands = m_manager->publishCommands();
@@ -1654,10 +1654,10 @@ void GenericDataProcessorPresenter::accept(
/** Returs the list of valid workspaces currently in the ADS
* @return : The vector of workspaces (as commands)
*/
-std::vector<DataProcessorCommand_uptr>
+std::vector<Command_uptr>
GenericDataProcessorPresenter::getTableList() {
- std::vector<DataProcessorCommand_uptr> workspaces;
+ std::vector<Command_uptr> workspaces;
workspaces.reserve(m_workspaceList.size());
// Create a command for each of the workspaces in the ADS
for (const auto &name : m_workspaceList) {
diff --git a/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp b/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp
index fde9320c304..a91706be0a9 100644
--- a/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp
@@ -1,6 +1,6 @@
#include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h"
#include "MantidQtWidgets/Common/MantidWidget.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandAdapter.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h"
#include "MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h"
#include "MantidQtWidgets/Common/HintingLineEditFactory.h"
@@ -124,12 +124,12 @@ void QDataProcessorWidget::createTable() {
* @param commands :: A vector of actions (commands)
*/
void QDataProcessorWidget::addActions(
- std::vector<std::unique_ptr<DataProcessorCommand>> commands) {
+ std::vector<std::unique_ptr<Command>> commands) {
// Put the commands in the toolbar
for (auto &command : commands) {
m_commands.push_back(
- Mantid::Kernel::make_unique<DataProcessorCommandAdapter>(
+ Mantid::Kernel::make_unique<CommandAdapter>(
ui.rowToolBar, std::move(command)));
}
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
index cfbea1e1edc..af02f1b1603 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
@@ -41,16 +41,16 @@ using namespace testing;
//=====================================================================================
// Functional tests
//=====================================================================================
-class DataProcessorCommandsTest : public CxxTest::TestSuite {
+class CommandsTest : public CxxTest::TestSuite {
private:
public:
// This pair of boilerplate methods prevent the suite being created statically
// This means the constructor isn't called when running other tests
- static DataProcessorCommandsTest *createSuite() {
- return new DataProcessorCommandsTest();
+ static CommandsTest *createSuite() {
+ return new CommandsTest();
}
- static void destroySuite(DataProcessorCommandsTest *suite) { delete suite; }
+ static void destroySuite(CommandsTest *suite) { delete suite; }
void test_open_table_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index d21545f8b30..c841b5f45f7 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -185,7 +185,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
def _create_action(self, command, menu, workspace_list = None):
"""
- Create an action from a given DataProcessorCommand and add it to a given menu
+ Create an action from a given Command and add it to a given menu
A 'workspace_list' can be provided but it is only intended to be used with DataProcessorOpenTableCommand.
It refers to the list of table workspaces in the ADS that could be loaded into the widget. Note that only
table workspaces with an appropriate number of columns and column types can be loaded.
diff --git a/scripts/Interface/ui/poldi/poldi_gui.py b/scripts/Interface/ui/poldi/poldi_gui.py
index 74d116af37a..fdc84e218cf 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -180,7 +180,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
def _create_action(self, command, menu, workspace_list = None):
"""
- Create an action from a given DataProcessorCommand and add it to a given menu
+ Create an action from a given Command and add it to a given menu
A 'workspace_list' can be provided but it is only intended to be used with DataProcessorOpenTableCommand.
It refers to the list of table workspaces in the ADS that could be loaded into the widget. Note that only
table workspaces with an appropriate number of columns and column types can be loaded.
--
GitLab