From c2ecff5d45c5e515bcc9f15491421a04edfb26d2 Mon Sep 17 00:00:00 2001
From: Edward Brown <edward.brown@stfc.ac.uk>
Date: Tue, 5 Sep 2017 10:15:15 +0100
Subject: [PATCH] Re #20302: Renamed DataProcessorGroupRowsCommand to
GroupRowsCommand.
---
qt/python/CMakeLists.txt | 2 +-
qt/python/mantidqt.sip | 10 ++--
qt/widgets/common/CMakeLists.txt | 2 +-
.../DataProcessorGroupRowsCommand.h | 56 -------------------
.../DataProcessorTwoLevelTreeManager.cpp | 4 +-
.../test/DataProcessorUI/CommandsTest.h | 4 +-
.../DataProcessorTwoLevelTreeManagerTest.h | 4 +-
.../data_processor_gui.py | 2 +-
scripts/Interface/ui/poldi/poldi_gui.py | 2 +-
9 files changed, 15 insertions(+), 71 deletions(-)
delete mode 100644 qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index c60a7e6754c..08f3c518896 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -45,7 +45,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index 7ec56ff305c..1e47fc7bbe1 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1752,13 +1752,13 @@ ExportTableCommand();
ExportTableCommand(const MantidQt::MantidWidgets::DataProcessor::ExportTableCommand &);
};
-class DataProcessorGroupRowsCommand
+class GroupRowsCommand
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h"
%End
public:
-DataProcessorGroupRowsCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
+GroupRowsCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute();
QString name();
QString icon();
@@ -1767,8 +1767,8 @@ QString whatsthis();
QString shortcut();
private:
-DataProcessorGroupRowsCommand();
-DataProcessorGroupRowsCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorGroupRowsCommand &);
+GroupRowsCommand();
+GroupRowsCommand(const MantidQt::MantidWidgets::DataProcessor::GroupRowsCommand &);
};
class DataProcessorImportTableCommand
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index da8f8aa4a3e..b6e9f615925 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -316,7 +316,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/GenerateNotebook.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
deleted file mode 100644
index 967cad942b0..00000000000
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORGROUPROWSCOMMAND_H
-#define MANTIDQTMANTIDWIDGETS_DATAPROCESSORGROUPROWSCOMMAND_H
-
-#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
-
-namespace MantidQt {
-namespace MantidWidgets {
-namespace DataProcessor {
-/** @class DataProcessorGroupRowsCommand
-
-DataProcessorGroupRowsCommand defines the action "Group Selected"
-
-Copyright © 2011-16 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
-National Laboratory & European Spallation Source
-
-This file is part of Mantid.
-
-Mantid is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-Mantid is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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 CommandBase {
-public:
- DataProcessorGroupRowsCommand(DataProcessorPresenter *tablePresenter)
- : CommandBase(tablePresenter){};
- DataProcessorGroupRowsCommand(const QDataProcessorWidget &widget)
- : CommandBase(widget){};
- virtual ~DataProcessorGroupRowsCommand(){};
-
- void execute() override {
- m_presenter->notify(DataProcessorPresenter::GroupRowsFlag);
- };
- QString name() override { return QString("Group Selected"); }
- QString icon() override { return QString("://drag_curves.png"); }
- QString tooltip() override { return QString("Group selected rows"); }
- QString whatsthis() override {
- return QString("Places all selected runs into the same group");
- }
- QString shortcut() override { return QString(); }
-};
-}
-}
-}
-#endif /*MANTIDQTMANTIDWIDGETS_DATAPROCESSORGROUPROWSCOMMAND_H*/
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index 4cb1ce012cd..1dbe912c065 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -12,7 +12,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h"
@@ -107,7 +107,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
addCommand(commands,
make_unique<AppendGroupCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
- addCommand(commands, make_unique<DataProcessorGroupRowsCommand>(m_presenter));
+ addCommand(commands, make_unique<GroupRowsCommand>(m_presenter));
addCommand(commands,
make_unique<CopySelectedCommand>(m_presenter));
addCommand(commands,
diff --git a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
index 4cf64a05e34..0795356e96f 100644
--- a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
@@ -16,7 +16,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h"
@@ -266,7 +266,7 @@ public:
void test_group_rows_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
- DataProcessorGroupRowsCommand command(&mockPresenter);
+ GroupRowsCommand command(&mockPresenter);
// The presenter should be notified with the GroupRowsFlag
EXPECT_CALL(mockPresenter, notify(DataProcessorPresenter::GroupRowsFlag))
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
index 52004dd66d0..73e9c970a0b 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
@@ -20,7 +20,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h"
@@ -163,7 +163,7 @@ public:
TS_ASSERT(dynamic_cast<AppendRowCommand *>(comm[20].get()));
TS_ASSERT(dynamic_cast<AppendGroupCommand *>(comm[21].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[22].get()));
- TS_ASSERT(dynamic_cast<DataProcessorGroupRowsCommand *>(comm[23].get()));
+ TS_ASSERT(dynamic_cast<GroupRowsCommand *>(comm[23].get()));
TS_ASSERT(dynamic_cast<CopySelectedCommand *>(comm[24].get()));
TS_ASSERT(dynamic_cast<CutSelectedCommand *>(comm[25].get()));
TS_ASSERT(
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index 988da66ca49..8052e3bf2a0 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -166,7 +166,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
self._create_action(MantidQt.MantidWidgets.DataProcessorPlotGroupCommand(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)
- self._create_action(MantidQt.MantidWidgets.DataProcessorGroupRowsCommand(self.data_processor_table), self.menuEdit)
+ self._create_action(MantidQt.MantidWidgets.GroupRowsCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.CopySelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.CutSelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorPasteSelectedCommand(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 ecda6edcda8..6156cab8c69 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -155,7 +155,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
self._create_action(MantidQt.MantidWidgets.DataProcessorPlotGroupCommand(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)
- self._create_action(MantidQt.MantidWidgets.DataProcessorGroupRowsCommand(self.data_processor_table), self.menuEdit)
+ self._create_action(MantidQt.MantidWidgets.GroupRowsCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.CopySelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.CutSelectedCommand(self.data_processor_table), self.menuEdit)
self._create_action(MantidQt.MantidWidgets.DataProcessorPasteSelectedCommand(self.data_processor_table), self.menuEdit)
--
GitLab