diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt index 640683b41611c6fb06cd937bf2c4cb83dde85364..c34f2c675f133636fd11c85bbb4e7657f518fc90 100644 --- a/qt/python/CMakeLists.txt +++ b/qt/python/CMakeLists.txt @@ -36,7 +36,7 @@ set ( SIP_HDRS ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPostprocessingAlgorithm.h ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h - ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h + ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip index 7b63bf607efc8838b67d5fe4a85a2ea9a91aabad..de485394017ca21cb90b44769e1e36681f7a36d1 100644 --- a/qt/python/mantidqt.sip +++ b/qt/python/mantidqt.sip @@ -1581,13 +1581,13 @@ virtual QString getPostprocessingOptions() const; virtual void notifyADSChanged(const QSet<QString> &); }; -class DataProcessorAppendRowCommand +class AppendRowCommand { %TypeHeaderCode -#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h" +#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h" %End public: -DataProcessorAppendRowCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &); +AppendRowCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &); void execute(); QString name(); QString icon(); @@ -1596,8 +1596,8 @@ QString whatsthis(); QString shortcut(); private: -DataProcessorAppendRowCommand(); -DataProcessorAppendRowCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorAppendRowCommand &); +AppendRowCommand(); +AppendRowCommand(const MantidQt::MantidWidgets::DataProcessor::AppendRowCommand &); }; class AppendGroupCommand diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt index 21c00f5a35842c5c776c72affda01ba0eeab169d..5526f8cf18ee70cf81a292885ef739b548791482 100644 --- a/qt/widgets/common/CMakeLists.txt +++ b/qt/widgets/common/CMakeLists.txt @@ -303,7 +303,7 @@ set ( INC_FILES inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h inc/MantidQtWidgets/Common/CatalogHelper.h inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h - inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h + inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h similarity index 85% rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h index 3a25d4d5106b25aaa4a88fd37f7d9d5be64e93bf..564c1151f225fda696adfead44486ee63c312b44 100644 --- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h +++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h @@ -7,9 +7,9 @@ namespace MantidQt { namespace MantidWidgets { namespace DataProcessor { -/** @class DataProcessorAppendRowCommand +/** @class AppendRowCommand -DataProcessorAppendRowCommand defines the action "Insert Row After" +AppendRowCommand defines the action "Insert Row After" Copyright © 2011-16 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge National Laboratory & European Spallation Source @@ -32,13 +32,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 DataProcessorAppendRowCommand : public DataProcessorCommandBase { +class AppendRowCommand : public DataProcessorCommandBase { public: - DataProcessorAppendRowCommand(DataProcessorPresenter *tablePresenter) + AppendRowCommand(DataProcessorPresenter *tablePresenter) : DataProcessorCommandBase(tablePresenter){}; - DataProcessorAppendRowCommand(const QDataProcessorWidget &widget) + AppendRowCommand(const QDataProcessorWidget &widget) : DataProcessorCommandBase(widget){}; - virtual ~DataProcessorAppendRowCommand(){}; + virtual ~AppendRowCommand(){}; void execute() override { m_presenter->notify(DataProcessorPresenter::AppendRowFlag); diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h index 751b6a5ec01b2460a386cd4e51c134e5b869b299..56c535488b8b9c8af5c303d080694bcefe301d7c 100644 --- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h +++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h @@ -3,7 +3,7 @@ #include "MantidKernel/WarningSuppressions.h" #include "MantidKernel/make_unique.h" -#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h" +#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h" @@ -150,7 +150,7 @@ private: std::vector<DataProcessorCommand_uptr> commands; for (size_t i = 0; i < 31; i++) commands.push_back( - Mantid::Kernel::make_unique<DataProcessorAppendRowCommand>(this)); + Mantid::Kernel::make_unique<AppendRowCommand>(this)); publishCommandsMocked(); return commands; }; diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp index d5e43174b4f879c7bc1f686b09d9b34964805aa8..bfc974b3da42480a6bcabcd9a84f64b72e69fd3c 100644 --- a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp +++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp @@ -2,7 +2,7 @@ #include "MantidAPI/ITableWorkspace.h" #include "MantidAPI/TableRow.h" #include "MantidAPI/WorkspaceFactory.h" -#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h" +#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h" @@ -87,7 +87,7 @@ DataProcessorOneLevelTreeManager::publishCommands() { addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter)); addCommand(commands, make_unique<DataProcessorPlotRowCommand>(m_presenter)); addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter)); - addCommand(commands, make_unique<DataProcessorAppendRowCommand>(m_presenter)); + addCommand(commands, make_unique<AppendRowCommand>(m_presenter)); addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter)); addCommand(commands, make_unique<DataProcessorCopySelectedCommand>(m_presenter)); diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp index f16ded4104c4a7b3b929ea6fe346e99a2c42dae4..98a5a3e32dd7478ced587bfad1a731478ef19c5d 100644 --- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp +++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp @@ -3,7 +3,7 @@ #include "MantidAPI/TableRow.h" #include "MantidAPI/WorkspaceFactory.h" #include "MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h" -#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h" +#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCollapseGroupsCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h" @@ -103,7 +103,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() { addCommand(commands, make_unique<DataProcessorPlotRowCommand>(m_presenter)); addCommand(commands, make_unique<DataProcessorPlotGroupCommand>(m_presenter)); addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter)); - addCommand(commands, make_unique<DataProcessorAppendRowCommand>(m_presenter)); + addCommand(commands, make_unique<AppendRowCommand>(m_presenter)); addCommand(commands, make_unique<AppendGroupCommand>(m_presenter)); addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter)); diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h index 42a41c2f0d8a8a57dfddf2ea5c3b4781e9bc849a..02894710d8023acce65fccce6f6dd2e6f52ca54e 100644 --- a/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h +++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h @@ -6,7 +6,7 @@ #include <gtest/gtest.h> #include "MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h" -#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h" +#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCollapseGroupsCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h" @@ -240,7 +240,7 @@ public: void test_append_row_command() { NiceMock<MockDataProcessorPresenter> mockPresenter; - DataProcessorAppendRowCommand command(&mockPresenter); + AppendRowCommand command(&mockPresenter); // The presenter should be notified with the AppendRowFlag EXPECT_CALL(mockPresenter, notify(DataProcessorPresenter::AppendRowFlag)) diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h index fdefe495ce43f51936957eacaba741eaf8675acf..15517401b19ce7c2e707c714827c3e42ea7df9bb 100644 --- a/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h +++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h @@ -9,7 +9,7 @@ #include "MantidAPI/TableRow.h" #include "MantidAPI/WorkspaceFactory.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h" -#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h" +#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h" @@ -142,7 +142,7 @@ public: TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[12].get())); TS_ASSERT(dynamic_cast<DataProcessorPlotRowCommand *>(comm[13].get())); TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[14].get())); - TS_ASSERT(dynamic_cast<DataProcessorAppendRowCommand *>(comm[15].get())); + TS_ASSERT(dynamic_cast<AppendRowCommand *>(comm[15].get())); TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[16].get())); TS_ASSERT(dynamic_cast<DataProcessorCopySelectedCommand *>(comm[17].get())); TS_ASSERT(dynamic_cast<DataProcessorCutSelectedCommand *>(comm[18].get())); diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h index 4d90c11022ce6ac8389a950766566b46c53c7bfd..ebaa423ae1184e9781988e1a4dcac53b4c943642 100644 --- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h +++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h @@ -10,7 +10,7 @@ #include "MantidAPI/WorkspaceFactory.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h" #include "MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h" -#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorAppendRowCommand.h" +#include "MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorClearSelectedCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCollapseGroupsCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCopySelectedCommand.h" @@ -160,7 +160,7 @@ public: TS_ASSERT(dynamic_cast<DataProcessorPlotRowCommand *>(comm[17].get())); TS_ASSERT(dynamic_cast<DataProcessorPlotGroupCommand *>(comm[18].get())); TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[19].get())); - TS_ASSERT(dynamic_cast<DataProcessorAppendRowCommand *>(comm[20].get())); + 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())); diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py index 4a88f9381fbbf2ca0a206185995e1f02362b2d3c..7098572b1c276537125d7d5fc5326c008acf65ad 100644 --- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py +++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py @@ -164,7 +164,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces self._create_action(MantidQt.MantidWidgets.DataProcessorExpandCommand(self.data_processor_table), self.menuEdit) self._create_action(MantidQt.MantidWidgets.DataProcessorPlotRowCommand(self.data_processor_table), self.menuEdit) self._create_action(MantidQt.MantidWidgets.DataProcessorPlotGroupCommand(self.data_processor_table), self.menuEdit) - self._create_action(MantidQt.MantidWidgets.DataProcessorAppendRowCommand(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.DataProcessorCopySelectedCommand(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 8dedca899b66c4aa79e2a7ae0854b88cc19a6116..6daa33cfd00eca0b7011f45c864b26810b4cb4bf 100644 --- a/scripts/Interface/ui/poldi/poldi_gui.py +++ b/scripts/Interface/ui/poldi/poldi_gui.py @@ -153,7 +153,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow): self._create_action(MantidQt.MantidWidgets.DataProcessorExpandCommand(self.data_processor_table), self.menuEdit) self._create_action(MantidQt.MantidWidgets.DataProcessorPlotRowCommand(self.data_processor_table), self.menuEdit) self._create_action(MantidQt.MantidWidgets.DataProcessorPlotGroupCommand(self.data_processor_table), self.menuEdit) - self._create_action(MantidQt.MantidWidgets.DataProcessorAppendRowCommand(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.DataProcessorCopySelectedCommand(self.data_processor_table), self.menuEdit)