From ccbb517f95be055d6a9a45e6e505fda681e0349d Mon Sep 17 00:00:00 2001
From: Edward Brown <edward.brown@stfc.ac.uk>
Date: Tue, 5 Sep 2017 10:40:40 +0100
Subject: [PATCH] Re #20302: Renamed DataProcessorPlotRowCommand to
PlotRowCommand
---
qt/python/CMakeLists.txt | 2 +-
qt/python/mantidqt.sip | 10 +++++-----
qt/widgets/common/CMakeLists.txt | 2 +-
...ataProcessorPlotRowCommand.h => PlotRowCommand.h} | 12 ++++++------
.../DataProcessorTwoLevelTreeManager.cpp | 4 ++--
.../src/DataProcessorUI/OneLevelTreeManager.cpp | 4 ++--
.../common/test/DataProcessorUI/CommandsTest.h | 4 ++--
.../DataProcessorTwoLevelTreeManagerTest.h | 4 ++--
.../test/DataProcessorUI/OneLevelTreeManagerTest.h | 4 ++--
.../ui/dataprocessorinterface/data_processor_gui.py | 2 +-
scripts/Interface/ui/poldi/poldi_gui.py | 2 +-
.../ui/sans_isis/sans_data_processor_gui.py | 2 +-
12 files changed, 26 insertions(+), 26 deletions(-)
rename qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/{DataProcessorPlotRowCommand.h => PlotRowCommand.h} (84%)
diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index da9cabef976..c4b94efac9b 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -52,7 +52,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PlotGroupCommand.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index 303213eea54..6f46471b818 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1885,13 +1885,13 @@ PlotGroupCommand();
PlotGroupCommand(const MantidQt::MantidWidgets::DataProcessor::PlotGroupCommand &);
};
-class DataProcessorPlotRowCommand
+class PlotRowCommand
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h"
%End
public:
-DataProcessorPlotRowCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
+PlotRowCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute();
QString name();
QString icon();
@@ -1900,8 +1900,8 @@ QString whatsthis();
QString shortcut();
private:
-DataProcessorPlotRowCommand();
-DataProcessorPlotRowCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorPlotRowCommand &);
+PlotRowCommand();
+PlotRowCommand(const MantidQt::MantidWidgets::DataProcessor::PlotRowCommand &);
};
class DataProcessorProcessCommand
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 5f0243aee67..21a03933b08 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -326,7 +326,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/PauseCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/PlotGroupCommand.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPostprocessingAlgorithm.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessingAlgorithm.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPreprocessMap.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h
similarity index 84%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h
index 23089ec8704..74b3177424e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h
@@ -6,9 +6,9 @@
namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** @class DataProcessorPlotRowCommand
+/** @class PlotRowCommand
-DataProcessorPlotRowCommand defines the action "Plot Selected Rows"
+PlotRowCommand defines the action "Plot Selected Rows"
Copyright © 2011-16 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
National Laboratory & European Spallation Source
@@ -31,13 +31,13 @@ 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 CommandBase {
+class PlotRowCommand : public CommandBase {
public:
- DataProcessorPlotRowCommand(DataProcessorPresenter *tablePresenter)
+ PlotRowCommand(DataProcessorPresenter *tablePresenter)
: CommandBase(tablePresenter){};
- DataProcessorPlotRowCommand(const QDataProcessorWidget &widget)
+ PlotRowCommand(const QDataProcessorWidget &widget)
: CommandBase(widget){};
- virtual ~DataProcessorPlotRowCommand(){};
+ virtual ~PlotRowCommand(){};
void execute() override {
m_presenter->notify(DataProcessorPresenter::PlotRowFlag);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index c9cedcec5ab..b698ab13b4a 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -21,7 +21,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/PauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/PlotGroupCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h"
@@ -100,7 +100,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
addCommand(commands,
make_unique<CollapseGroupsCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
- addCommand(commands, make_unique<DataProcessorPlotRowCommand>(m_presenter));
+ addCommand(commands, make_unique<PlotRowCommand>(m_presenter));
addCommand(commands, make_unique<PlotGroupCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands, make_unique<AppendRowCommand>(m_presenter));
diff --git a/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
index 2946fe684ce..9cf2613ba53 100644
--- a/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
@@ -14,7 +14,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/PauseCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h"
@@ -85,7 +85,7 @@ OneLevelTreeManager::publishCommands() {
addCommand(commands, make_unique<DataProcessorProcessCommand>(m_presenter));
addCommand(commands, make_unique<PauseCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
- addCommand(commands, make_unique<DataProcessorPlotRowCommand>(m_presenter));
+ addCommand(commands, make_unique<PlotRowCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands, make_unique<AppendRowCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
diff --git a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
index 5b9da763805..fc865c8c6a7 100644
--- a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
@@ -25,7 +25,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/PauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/PlotGroupCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h"
@@ -214,7 +214,7 @@ public:
void test_plot_row_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
- DataProcessorPlotRowCommand command(&mockPresenter);
+ PlotRowCommand command(&mockPresenter);
// The presenter should be notified with the PlotRowFlag
EXPECT_CALL(mockPresenter, notify(DataProcessorPresenter::PlotRowFlag))
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
index c7f9a356bab..b93b40ec072 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
@@ -29,7 +29,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/PauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/PlotGroupCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h"
@@ -157,7 +157,7 @@ public:
TS_ASSERT(
dynamic_cast<CollapseGroupsCommand *>(comm[15].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[16].get()));
- TS_ASSERT(dynamic_cast<DataProcessorPlotRowCommand *>(comm[17].get()));
+ TS_ASSERT(dynamic_cast<PlotRowCommand *>(comm[17].get()));
TS_ASSERT(dynamic_cast<PlotGroupCommand *>(comm[18].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[19].get()));
TS_ASSERT(dynamic_cast<AppendRowCommand *>(comm[20].get()));
diff --git a/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
index a55b680db2f..452f5c31437 100644
--- a/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
@@ -22,7 +22,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/PasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/PauseCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/PlotRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h"
@@ -140,7 +140,7 @@ public:
TS_ASSERT(dynamic_cast<DataProcessorProcessCommand *>(comm[10].get()));
TS_ASSERT(dynamic_cast<PauseCommand *>(comm[11].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[12].get()));
- TS_ASSERT(dynamic_cast<DataProcessorPlotRowCommand *>(comm[13].get()));
+ TS_ASSERT(dynamic_cast<PlotRowCommand *>(comm[13].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[14].get()));
TS_ASSERT(dynamic_cast<AppendRowCommand *>(comm[15].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[16].get()));
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index 0c71da1ed0f..d9fe31ee11b 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -162,7 +162,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
# Actions that go in the 'Edit' menu
self._create_action(MantidQt.MantidWidgets.DataProcessorProcessCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.ExpandCommand(self.data_processor_table), self.menuEdit)
- self._create_action(MantidQt.MantidWidgets.DataProcessorPlotRowCommand(self.data_processor_table), self.menuEdit)
+ self._create_action(MantidQt.MantidWidgets.PlotRowCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.PlotGroupCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.AppendRowCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.AppendGroupCommand(self.data_processor_table), self.menuEdit)
diff --git a/scripts/Interface/ui/poldi/poldi_gui.py b/scripts/Interface/ui/poldi/poldi_gui.py
index 5c2a53df31e..21f41eb28a2 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -151,7 +151,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
# Actions that go in the 'Edit' menu
self._create_action(MantidQt.MantidWidgets.DataProcessorProcessCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.ExpandCommand(self.data_processor_table), self.menuEdit)
- self._create_action(MantidQt.MantidWidgets.DataProcessorPlotRowCommand(self.data_processor_table), self.menuEdit)
+ self._create_action(MantidQt.MantidWidgets.PlotRowCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.PlotGroupCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.AppendRowCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.AppendGroupCommand(self.data_processor_table), self.menuEdit)
diff --git a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
index 0755f0becd0..e7d512f8fec 100644
--- a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
+++ b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
@@ -1467,7 +1467,7 @@ class SANSDataProcessorGui(QtGui.QMainWindow, ui_sans_data_processor_window.Ui_S
# Actions that go in the 'Edit' menu
self._create_action(MantidQt.MantidWidgets.DataProcessorProcessCommand(self.data_processor_table),
self.menuEdit)
- self._create_action(MantidQt.MantidWidgets.DataProcessorPlotRowCommand(self.data_processor_table),
+ self._create_action(MantidQt.MantidWidgets.PlotRowCommand(self.data_processor_table),
self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorAppendRowCommand(self.data_processor_table),
self.menuEdit)
--
GitLab