From 3f0cad884ebf063ae136a79a7f18bbbaeba6b175 Mon Sep 17 00:00:00 2001
From: Edward Brown <edward.brown@stfc.ac.uk>
Date: Tue, 5 Sep 2017 10:33:00 +0100
Subject: [PATCH] Re #20302: Renamed DataProcessorOptionsCommand.
- Renamed to OptionsCommand.
---
qt/python/CMakeLists.txt | 2 +-
qt/python/mantidqt.sip | 10 +++++-----
qt/widgets/common/CMakeLists.txt | 2 +-
...ataProcessorOptionsCommand.h => OptionsCommand.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/{DataProcessorOptionsCommand.h => OptionsCommand.h} (84%)
diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index 849f06e7ad5..18277a3bfaf 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -49,7 +49,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h
- ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h
+ ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index fd08a16ac50..c64cb668576 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1828,13 +1828,13 @@ OpenTableCommand();
OpenTableCommand(const MantidQt::MantidWidgets::DataProcessor::OpenTableCommand &);
};
-class DataProcessorOptionsCommand
+class OptionsCommand
{
%TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h"
%End
public:
-DataProcessorOptionsCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
+OptionsCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute();
QString name();
QString icon();
@@ -1843,8 +1843,8 @@ QString whatsthis();
QString shortcut();
private:
-DataProcessorOptionsCommand();
-DataProcessorOptionsCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorOptionsCommand &);
+OptionsCommand();
+OptionsCommand(const MantidQt::MantidWidgets::DataProcessor::OptionsCommand &);
};
class DataProcessorPasteSelectedCommand
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 09706ec4fdf..70bd1619830 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -322,7 +322,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/OneLevelTreeManager.h
inc/MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h
- inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h
similarity index 84%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h
index 1d7263afc81..63507e4bc19 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h
@@ -6,9 +6,9 @@
namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** @class DataProcessorOptionsCommand
+/** @class OptionsCommand
-DataProcessorOptionsCommand defines the action "Import .TBL"
+OptionsCommand defines the action "Import .TBL"
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 DataProcessorOptionsCommand : public CommandBase {
+class OptionsCommand : public CommandBase {
public:
- DataProcessorOptionsCommand(DataProcessorPresenter *tablePresenter)
+ OptionsCommand(DataProcessorPresenter *tablePresenter)
: CommandBase(tablePresenter){};
- DataProcessorOptionsCommand(const QDataProcessorWidget &widget)
+ OptionsCommand(const QDataProcessorWidget &widget)
: CommandBase(widget){};
- virtual ~DataProcessorOptionsCommand(){};
+ virtual ~OptionsCommand(){};
void execute() override {
m_presenter->notify(DataProcessorPresenter::OptionsDialogFlag);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index fed7efa2021..878c2253aba 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -17,7 +17,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h"
@@ -89,7 +89,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
addCommand(commands,
make_unique<ExportTableCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
- addCommand(commands, make_unique<DataProcessorOptionsCommand>(m_presenter));
+ addCommand(commands, make_unique<OptionsCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorProcessCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorPauseCommand>(m_presenter));
diff --git a/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
index c124db84177..42a254ed202 100644
--- a/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
@@ -11,7 +11,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h"
@@ -80,7 +80,7 @@ OneLevelTreeManager::publishCommands() {
addCommand(commands,
make_unique<ExportTableCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
- addCommand(commands, make_unique<DataProcessorOptionsCommand>(m_presenter));
+ addCommand(commands, make_unique<OptionsCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSeparatorCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorProcessCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorPauseCommand>(m_presenter));
diff --git a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
index 5720fe395ce..728f4dd55f3 100644
--- a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
@@ -21,7 +21,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/MockObjects.h"
#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h"
@@ -132,7 +132,7 @@ public:
void test_options_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter;
- DataProcessorOptionsCommand command(&mockPresenter);
+ OptionsCommand command(&mockPresenter);
// The presenter should be notified with the OptionsDialogFlag
EXPECT_CALL(mockPresenter,
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
index 64554526f9c..ac1175fa3eb 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorTwoLevelTreeManagerTest.h
@@ -25,7 +25,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/MockObjects.h"
#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h"
@@ -147,7 +147,7 @@ public:
TS_ASSERT(dynamic_cast<ImportTableCommand *>(comm[5].get()));
TS_ASSERT(dynamic_cast<ExportTableCommand *>(comm[6].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[7].get()));
- TS_ASSERT(dynamic_cast<DataProcessorOptionsCommand *>(comm[8].get()));
+ TS_ASSERT(dynamic_cast<OptionsCommand *>(comm[8].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[9].get()));
TS_ASSERT(dynamic_cast<DataProcessorProcessCommand *>(comm[10].get()));
TS_ASSERT(dynamic_cast<DataProcessorPauseCommand *>(comm[11].get()));
diff --git a/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h b/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
index 2394900100e..10a1b88c493 100644
--- a/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/OneLevelTreeManagerTest.h
@@ -19,7 +19,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/MockObjects.h"
#include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/OpenTableCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/OptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h"
@@ -135,7 +135,7 @@ public:
TS_ASSERT(dynamic_cast<ImportTableCommand *>(comm[5].get()));
TS_ASSERT(dynamic_cast<ExportTableCommand *>(comm[6].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[7].get()));
- TS_ASSERT(dynamic_cast<DataProcessorOptionsCommand *>(comm[8].get()));
+ TS_ASSERT(dynamic_cast<OptionsCommand *>(comm[8].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[9].get()));
TS_ASSERT(dynamic_cast<DataProcessorProcessCommand *>(comm[10].get()));
TS_ASSERT(dynamic_cast<DataProcessorPauseCommand *>(comm[11].get()));
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index d6706fd18e8..5acdb6015d1 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -181,7 +181,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableAsCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.ImportTableCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.ExportTableCommand(self.data_processor_table), self.menuFile)
- self._create_action(MantidQt.MantidWidgets.DataProcessorOptionsCommand(self.data_processor_table), self.menuFile)
+ self._create_action(MantidQt.MantidWidgets.OptionsCommand(self.data_processor_table), self.menuFile)
def _create_action(self, command, menu, workspace_list = None):
"""
diff --git a/scripts/Interface/ui/poldi/poldi_gui.py b/scripts/Interface/ui/poldi/poldi_gui.py
index 05f37fd7e10..51d69b1e2cc 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -170,7 +170,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableAsCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.ImportTableCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.ExportTableCommand(self.data_processor_table), self.menuFile)
- self._create_action(MantidQt.MantidWidgets.DataProcessorOptionsCommand(self.data_processor_table), self.menuFile)
+ self._create_action(MantidQt.MantidWidgets.OptionsCommand(self.data_processor_table), self.menuFile)
def _demo_clicked(self):
PoldiLoadRuns(2013, 6903, 6904, 2, OutputWorkspace='poldi', MaskBadDetectors=False)
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 eda1775aa72..cf951b5c462 100644
--- a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
+++ b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
@@ -1495,7 +1495,7 @@ class SANSDataProcessorGui(QtGui.QMainWindow, ui_sans_data_processor_window.Ui_S
self.menuFile)
self._create_action(MantidQt.MantidWidgets.DataProcessorExportTableCommand(self.data_processor_table),
self.menuFile)
- self._create_action(MantidQt.MantidWidgets.DataProcessorOptionsCommand(self.data_processor_table),
+ self._create_action(MantidQt.MantidWidgets.OptionsCommand(self.data_processor_table),
self.menuFile)
def _create_action(self, command, menu, workspace_list=None):
--
GitLab