Skip to content
Snippets Groups Projects
Commit 38302be9 authored by Edward Brown's avatar Edward Brown
Browse files

Re #20302: Renamed DataProcessorNewTableCommand to NewTableCommand.

parent 446e1871
No related branches found
No related tags found
No related merge requests found
Showing
with 26 additions and 26 deletions
...@@ -47,7 +47,7 @@ set ( SIP_HDRS ...@@ -47,7 +47,7 @@ set ( SIP_HDRS
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h
../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h
......
...@@ -1790,13 +1790,13 @@ ImportTableCommand(); ...@@ -1790,13 +1790,13 @@ ImportTableCommand();
ImportTableCommand(const MantidQt::MantidWidgets::DataProcessor::ImportTableCommand &); ImportTableCommand(const MantidQt::MantidWidgets::DataProcessor::ImportTableCommand &);
}; };
class DataProcessorNewTableCommand class NewTableCommand
{ {
%TypeHeaderCode %TypeHeaderCode
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
%End %End
public: public:
DataProcessorNewTableCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &); NewTableCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &);
void execute(); void execute();
QString name(); QString name();
QString icon(); QString icon();
...@@ -1805,8 +1805,8 @@ QString whatsthis(); ...@@ -1805,8 +1805,8 @@ QString whatsthis();
QString shortcut(); QString shortcut();
private: private:
DataProcessorNewTableCommand(); NewTableCommand();
DataProcessorNewTableCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorNewTableCommand &); NewTableCommand(const MantidQt::MantidWidgets::DataProcessor::NewTableCommand &);
}; };
class DataProcessorOpenTableCommand class DataProcessorOpenTableCommand
......
...@@ -319,7 +319,7 @@ set ( INC_FILES ...@@ -319,7 +319,7 @@ set ( INC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h inc/MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h inc/MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h inc/MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h
inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
namespace MantidQt { namespace MantidQt {
namespace MantidWidgets { namespace MantidWidgets {
namespace DataProcessor { namespace DataProcessor {
/** @class DataProcessorNewTableCommand /** @class NewTableCommand
DataProcessorNewTableCommand defines the action "New Table" NewTableCommand defines the action "New Table"
Copyright © 2011-16 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge Copyright © 2011-16 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
National Laboratory & European Spallation Source National Laboratory & European Spallation Source
...@@ -31,13 +31,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -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>. File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org> Code Documentation is available at: <http://doxygen.mantidproject.org>
*/ */
class DataProcessorNewTableCommand : public CommandBase { class NewTableCommand : public CommandBase {
public: public:
DataProcessorNewTableCommand(DataProcessorPresenter *tablePresenter) NewTableCommand(DataProcessorPresenter *tablePresenter)
: CommandBase(tablePresenter){}; : CommandBase(tablePresenter){};
DataProcessorNewTableCommand(const QDataProcessorWidget &widget) NewTableCommand(const QDataProcessorWidget &widget)
: CommandBase(widget){}; : CommandBase(widget){};
virtual ~DataProcessorNewTableCommand(){}; virtual ~NewTableCommand(){};
void execute() override { void execute() override {
m_presenter->notify(DataProcessorPresenter::NewTableFlag); m_presenter->notify(DataProcessorPresenter::NewTableFlag);
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DeleteRowCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
...@@ -70,7 +70,7 @@ DataProcessorOneLevelTreeManager::publishCommands() { ...@@ -70,7 +70,7 @@ DataProcessorOneLevelTreeManager::publishCommands() {
std::vector<Command_uptr> commands; std::vector<Command_uptr> commands;
addCommand(commands, make_unique<DataProcessorOpenTableCommand>(m_presenter)); addCommand(commands, make_unique<DataProcessorOpenTableCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorNewTableCommand>(m_presenter)); addCommand(commands, make_unique<NewTableCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSaveTableCommand>(m_presenter)); addCommand(commands, make_unique<DataProcessorSaveTableCommand>(m_presenter));
addCommand(commands, addCommand(commands,
make_unique<DataProcessorSaveTableAsCommand>(m_presenter)); make_unique<DataProcessorSaveTableAsCommand>(m_presenter));
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/ExpandGroupsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
...@@ -79,7 +79,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() { ...@@ -79,7 +79,7 @@ DataProcessorTwoLevelTreeManager::publishCommands() {
std::vector<Command_uptr> commands; std::vector<Command_uptr> commands;
addCommand(commands, make_unique<DataProcessorOpenTableCommand>(m_presenter)); addCommand(commands, make_unique<DataProcessorOpenTableCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorNewTableCommand>(m_presenter)); addCommand(commands, make_unique<NewTableCommand>(m_presenter));
addCommand(commands, make_unique<DataProcessorSaveTableCommand>(m_presenter)); addCommand(commands, make_unique<DataProcessorSaveTableCommand>(m_presenter));
addCommand(commands, addCommand(commands,
make_unique<DataProcessorSaveTableAsCommand>(m_presenter)); make_unique<DataProcessorSaveTableAsCommand>(m_presenter));
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
...@@ -67,7 +67,7 @@ public: ...@@ -67,7 +67,7 @@ public:
void test_new_table_command() { void test_new_table_command() {
NiceMock<MockDataProcessorPresenter> mockPresenter; NiceMock<MockDataProcessorPresenter> mockPresenter;
DataProcessorNewTableCommand command(&mockPresenter); NewTableCommand command(&mockPresenter);
// The presenter should be notified with the NewTableFlag // The presenter should be notified with the NewTableFlag
EXPECT_CALL(mockPresenter, notify(DataProcessorPresenter::NewTableFlag)) EXPECT_CALL(mockPresenter, notify(DataProcessorPresenter::NewTableFlag))
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/ExportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
...@@ -128,7 +128,7 @@ public: ...@@ -128,7 +128,7 @@ public:
TS_ASSERT_EQUALS(comm.size(), 23); TS_ASSERT_EQUALS(comm.size(), 23);
TS_ASSERT(dynamic_cast<DataProcessorOpenTableCommand *>(comm[0].get())); TS_ASSERT(dynamic_cast<DataProcessorOpenTableCommand *>(comm[0].get()));
TS_ASSERT(dynamic_cast<DataProcessorNewTableCommand *>(comm[1].get())); TS_ASSERT(dynamic_cast<NewTableCommand *>(comm[1].get()));
TS_ASSERT(dynamic_cast<DataProcessorSaveTableCommand *>(comm[2].get())); TS_ASSERT(dynamic_cast<DataProcessorSaveTableCommand *>(comm[2].get()));
TS_ASSERT(dynamic_cast<DataProcessorSaveTableAsCommand *>(comm[3].get())); TS_ASSERT(dynamic_cast<DataProcessorSaveTableAsCommand *>(comm[3].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[4].get())); TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[4].get()));
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/GroupRowsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/ImportTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/NewTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h" #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h"
...@@ -140,7 +140,7 @@ public: ...@@ -140,7 +140,7 @@ public:
TS_ASSERT_EQUALS(comm.size(), 31); TS_ASSERT_EQUALS(comm.size(), 31);
TS_ASSERT(dynamic_cast<DataProcessorOpenTableCommand *>(comm[0].get())); TS_ASSERT(dynamic_cast<DataProcessorOpenTableCommand *>(comm[0].get()));
TS_ASSERT(dynamic_cast<DataProcessorNewTableCommand *>(comm[1].get())); TS_ASSERT(dynamic_cast<NewTableCommand *>(comm[1].get()));
TS_ASSERT(dynamic_cast<DataProcessorSaveTableCommand *>(comm[2].get())); TS_ASSERT(dynamic_cast<DataProcessorSaveTableCommand *>(comm[2].get()));
TS_ASSERT(dynamic_cast<DataProcessorSaveTableAsCommand *>(comm[3].get())); TS_ASSERT(dynamic_cast<DataProcessorSaveTableAsCommand *>(comm[3].get()));
TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[4].get())); TS_ASSERT(dynamic_cast<DataProcessorSeparatorCommand *>(comm[4].get()));
......
...@@ -176,7 +176,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces ...@@ -176,7 +176,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
# Actions that go in the 'File' menu # Actions that go in the 'File' menu
self._create_action(MantidQt.MantidWidgets.DataProcessorOpenTableCommand(self.data_processor_table), self.menuFile, workspace_list) self._create_action(MantidQt.MantidWidgets.DataProcessorOpenTableCommand(self.data_processor_table), self.menuFile, workspace_list)
self._create_action(MantidQt.MantidWidgets.DataProcessorNewTableCommand(self.data_processor_table), self.menuFile) self._create_action(MantidQt.MantidWidgets.NewTableCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableCommand(self.data_processor_table), self.menuFile) self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableAsCommand(self.data_processor_table), self.menuFile) 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.ImportTableCommand(self.data_processor_table), self.menuFile)
......
...@@ -165,7 +165,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow): ...@@ -165,7 +165,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
# Actions that go in the 'File' menu # Actions that go in the 'File' menu
self._create_action(MantidQt.MantidWidgets.DataProcessorOpenTableCommand(self.data_processor_table), self.menuFile, workspace_list) self._create_action(MantidQt.MantidWidgets.DataProcessorOpenTableCommand(self.data_processor_table), self.menuFile, workspace_list)
self._create_action(MantidQt.MantidWidgets.DataProcessorNewTableCommand(self.data_processor_table), self.menuFile) self._create_action(MantidQt.MantidWidgets.NewTableCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableCommand(self.data_processor_table), self.menuFile) self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableCommand(self.data_processor_table), self.menuFile)
self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableAsCommand(self.data_processor_table), self.menuFile) 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.ImportTableCommand(self.data_processor_table), self.menuFile)
......
...@@ -1485,7 +1485,7 @@ class SANSDataProcessorGui(QtGui.QMainWindow, ui_sans_data_processor_window.Ui_S ...@@ -1485,7 +1485,7 @@ class SANSDataProcessorGui(QtGui.QMainWindow, ui_sans_data_processor_window.Ui_S
# Actions that go in the 'File' menu # Actions that go in the 'File' menu
self._create_action(MantidQt.MantidWidgets.DataProcessorOpenTableCommand(self.data_processor_table), self._create_action(MantidQt.MantidWidgets.DataProcessorOpenTableCommand(self.data_processor_table),
self.menuFile, workspace_list) self.menuFile, workspace_list)
self._create_action(MantidQt.MantidWidgets.DataProcessorNewTableCommand(self.data_processor_table), self._create_action(MantidQt.MantidWidgets.NewTableCommand(self.data_processor_table),
self.menuFile) self.menuFile)
self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableCommand(self.data_processor_table), self._create_action(MantidQt.MantidWidgets.DataProcessorSaveTableCommand(self.data_processor_table),
self.menuFile) self.menuFile)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment