diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 998066db89f1d3b24d920ec07db8696a855fd711..58440afd67ef296ee43ec400c435b61dd0ddd9f4 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -76,8 +76,8 @@
src/DataProcessorUI/GenericDataProcessorPresenter.cpp
src/ParseKeyValueString.cpp
src/ParseNumerics.cpp
- src/DataProcessorUI/QDataProcessorOneLevelTreeModel.cpp
- src/DataProcessorUI/QDataProcessorTwoLevelTreeModel.cpp
+ src/DataProcessorUI/QOneLevelTreeModel.cpp
+ src/DataProcessorUI/QTwoLevelTreeModel.cpp
src/DataProcessorUI/QDataProcessorWidget.cpp
src/DataProcessorUI/QtDataProcessorOptionsDialog.cpp
src/DataProcessorUI/DataProcessorVectorString.cpp
@@ -189,8 +189,8 @@ set ( MOC_FILES
inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterThread.h
inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterRowReducerWorker.h
inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterGroupReducerWorker.h
- inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorOneLevelTreeModel.h
- inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorTwoLevelTreeModel.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/QOneLevelTreeModel.h
+ inc/MantidQtWidgets/Common/DataProcessorUI/QTwoLevelTreeModel.h
inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
inc/MantidQtWidgets/Common/DataProcessorUI/QtDataProcessorOptionsDialog.h
inc/MantidQtWidgets/Common/DataProcessorUI/TreeData.h
@@ -452,8 +452,8 @@ set( TEST_FILES
DataProcessorUI/DataProcessorWhiteListTest.h
DataProcessorUI/GenericDataProcessorPresenterTest.h
ParseKeyValueStringTest.h
- DataProcessorUI/QDataProcessorOneLevelTreeModelTest.h
- DataProcessorUI/QDataProcessorTwoLevelTreeModelTest.h
+ DataProcessorUI/QOneLevelTreeModelTest.h
+ DataProcessorUI/QTwoLevelTreeModelTest.h
ProjectSaveModelTest.h
ProjectSavePresenterTest.h
WorkspacePresenter/ADSAdapterTest.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OneLevelTreeManager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OneLevelTreeManager.h
index 352ef8378a94609d8921a86f404bc722bd6c8a91..273e02e24f659049edfce350355ed86ff8aa22d6 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OneLevelTreeManager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/OneLevelTreeManager.h
@@ -10,7 +10,7 @@ namespace DataProcessor {
class DataProcessorPresenter;
class DataProcessorWhiteList;
-class QDataProcessorOneLevelTreeModel;
+class QOneLevelTreeModel;
/** @class OneLevelTreeManager
@@ -108,7 +108,7 @@ private:
/// The DataProcessor presenter
DataProcessorPresenter *m_presenter;
/// The model
- boost::shared_ptr<QDataProcessorOneLevelTreeModel> m_model;
+ boost::shared_ptr<QOneLevelTreeModel> m_model;
/// Insert a row in the model
void insertRow(int rowIndex);
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QOneLevelTreeModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QOneLevelTreeModel.h
index 00bfb18835d004284cc8cff79d8ece872f2ba79a..3fddf1a5e4a9d2a188065b7dcd6430fc0f2e488d 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QOneLevelTreeModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QOneLevelTreeModel.h
@@ -12,7 +12,7 @@ namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** QDataProcessorOneLevelTreeModel : Provides a QAbstractItemModel for a
+/** QOneLevelTreeModel : Provides a QAbstractItemModel for a
DataProcessorUI with no post-processing defined. The first argument to the
constructor is a Mantid ITableWorkspace containing the values to use in the
reduction. Each row in the table corresponds to an independent reduction. The
@@ -41,14 +41,14 @@ 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 EXPORT_OPT_MANTIDQT_COMMON QDataProcessorOneLevelTreeModel
+class EXPORT_OPT_MANTIDQT_COMMON QOneLevelTreeModel
: public AbstractTreeModel {
Q_OBJECT
public:
- QDataProcessorOneLevelTreeModel(
+ QOneLevelTreeModel(
Mantid::API::ITableWorkspace_sptr tableWorkspace,
const DataProcessorWhiteList &whitelist);
- ~QDataProcessorOneLevelTreeModel() override;
+ ~QOneLevelTreeModel() override;
// Functions to read data from the model
@@ -92,9 +92,9 @@ private:
std::vector<bool> m_rows;
};
-/// Typedef for a shared pointer to \c QDataProcessorOneLevelTreeModel
-using QDataProcessorOneLevelTreeModel_sptr =
- boost::shared_ptr<QDataProcessorOneLevelTreeModel>;
+/// Typedef for a shared pointer to \c QOneLevelTreeModel
+using QOneLevelTreeModel_sptr =
+ boost::shared_ptr<QOneLevelTreeModel>;
} // namespace DataProcessor
} // namespace MantidWidgets
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QTwoLevelTreeModel.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QTwoLevelTreeModel.h
index 124550bd13c2f333c73cbd6a8c2ba503ad1ed866..14cf6d663350c83694e665e8b58114a159f1f080 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QTwoLevelTreeModel.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QTwoLevelTreeModel.h
@@ -12,7 +12,7 @@ namespace MantidQt {
namespace MantidWidgets {
namespace DataProcessor {
-/** QDataProcessorTwoLevelTreeModel : Provides a QAbstractItemModel for a
+/** QTwoLevelTreeModel : Provides a QAbstractItemModel for a
DataProcessorUI with post-processing defined. The first argument to the
constructor is a Mantid ITableWorkspace containing the values to use in the
reduction. Each row corresponds to an independent reduction and the first column
@@ -44,14 +44,14 @@ 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 EXPORT_OPT_MANTIDQT_COMMON QDataProcessorTwoLevelTreeModel
+class EXPORT_OPT_MANTIDQT_COMMON QTwoLevelTreeModel
: public AbstractTreeModel {
Q_OBJECT
public:
- QDataProcessorTwoLevelTreeModel(
+ QTwoLevelTreeModel(
Mantid::API::ITableWorkspace_sptr tableWorkspace,
const DataProcessorWhiteList &whitelist);
- ~QDataProcessorTwoLevelTreeModel() override;
+ ~QTwoLevelTreeModel() override;
// Functions to read data from the model
@@ -104,8 +104,8 @@ private:
std::vector<std::vector<std::pair<int, bool>>> m_rowsOfGroup;
};
-/// Typedef for a shared pointer to \c QDataProcessorTwoLevelTreeModel
-using QDataProcessorTwoLevelTreeModel_sptr = boost::shared_ptr<QDataProcessorTwoLevelTreeModel>;
+/// Typedef for a shared pointer to \c QTwoLevelTreeModel
+using QTwoLevelTreeModel_sptr = boost::shared_ptr<QTwoLevelTreeModel>;
} // namespace DataProcessor
} // namespace MantidWidgets
} // namespace Mantid
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TwoLevelTreeManager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TwoLevelTreeManager.h
index fe93bfcf4d20775cd631d024438611ab12a06707..4fa830835c9a94a111863b08e8b35ec0cb41a126 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TwoLevelTreeManager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/TwoLevelTreeManager.h
@@ -10,7 +10,7 @@ namespace DataProcessor {
class DataProcessorPresenter;
class DataProcessorWhiteList;
-class QDataProcessorTwoLevelTreeModel;
+class QTwoLevelTreeModel;
/** @class TwoLevelTreeManager
@@ -108,7 +108,7 @@ private:
/// The DataProcessor presenter
DataProcessorPresenter *m_presenter;
/// The model
- boost::shared_ptr<QDataProcessorTwoLevelTreeModel> m_model;
+ boost::shared_ptr<QTwoLevelTreeModel> m_model;
/// Insert a row in the model
void insertRow(int groupIndex, int rowIndex);
diff --git a/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
index 4567d6de87649e9be63cb7d0d7d0572415c43f7b..36b53bcc6fe3dedb00dc7eff32df625aca80ec78 100644
--- a/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/OneLevelTreeManager.cpp
@@ -19,7 +19,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/SaveTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/SeparatorCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorOneLevelTreeModel.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/QOneLevelTreeModel.h"
#include "MantidKernel/make_unique.h"
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/join.hpp>
@@ -43,7 +43,7 @@ OneLevelTreeManager::OneLevelTreeManager(
DataProcessorPresenter *presenter, Mantid::API::ITableWorkspace_sptr table,
const DataProcessorWhiteList &whitelist)
: m_presenter(presenter),
- m_model(new QDataProcessorOneLevelTreeModel(table, whitelist)) {}
+ m_model(new QOneLevelTreeModel(table, whitelist)) {}
/**
* Constructor (no table workspace given)
@@ -241,7 +241,7 @@ void OneLevelTreeManager::pasteSelected(const QString &text) {
void OneLevelTreeManager::newTable(
const DataProcessorWhiteList &whitelist) {
- m_model.reset(new QDataProcessorOneLevelTreeModel(
+ m_model.reset(new QOneLevelTreeModel(
createDefaultWorkspace(whitelist), whitelist));
}
@@ -253,7 +253,7 @@ void OneLevelTreeManager::newTable(
ITableWorkspace_sptr table, const DataProcessorWhiteList &whitelist) {
if (isValidModel(table, whitelist.size())) {
- m_model.reset(new QDataProcessorOneLevelTreeModel(table, whitelist));
+ m_model.reset(new QOneLevelTreeModel(table, whitelist));
} else
throw std::runtime_error("Selected table has the incorrect number of "
"columns to be used as a data processor table.");
@@ -358,7 +358,7 @@ void OneLevelTreeManager::transfer(
}
}
- m_model.reset(new QDataProcessorOneLevelTreeModel(ws, whitelist));
+ m_model.reset(new QOneLevelTreeModel(ws, whitelist));
}
/** Updates a row with new data
diff --git a/qt/widgets/common/src/DataProcessorUI/QOneLevelTreeModel.cpp b/qt/widgets/common/src/DataProcessorUI/QOneLevelTreeModel.cpp
index 7b9a2a6b2fe9220d50364c26189fa4a27ae229f0..2d1f487d516d7423ca247b5b56d35e1209a02d97 100644
--- a/qt/widgets/common/src/DataProcessorUI/QOneLevelTreeModel.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/QOneLevelTreeModel.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorOneLevelTreeModel.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/QOneLevelTreeModel.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
@@ -12,7 +12,7 @@ using namespace Mantid::API;
@param tableWorkspace : The table workspace to wrap
@param whitelist : A DataProcessorWhiteList containing the columns
*/
-QDataProcessorOneLevelTreeModel::QDataProcessorOneLevelTreeModel(
+QOneLevelTreeModel::QOneLevelTreeModel(
ITableWorkspace_sptr tableWorkspace,
const DataProcessorWhiteList &whitelist)
: AbstractTreeModel(tableWorkspace, whitelist) {
@@ -25,14 +25,14 @@ QDataProcessorOneLevelTreeModel::QDataProcessorOneLevelTreeModel(
m_rows = std::vector<bool>(tableWorkspace->rowCount(), false);
}
-QDataProcessorOneLevelTreeModel::~QDataProcessorOneLevelTreeModel() {}
+QOneLevelTreeModel::~QOneLevelTreeModel() {}
/** Returns data for specified index
* @param index : The index
* @param role : The role
* @return : The data associated with the given index
*/
-QVariant QDataProcessorOneLevelTreeModel::data(const QModelIndex &index,
+QVariant QOneLevelTreeModel::data(const QModelIndex &index,
int role) const {
if (!index.isValid())
return QVariant();
@@ -57,7 +57,7 @@ QVariant QDataProcessorOneLevelTreeModel::data(const QModelIndex &index,
* @param role : The role
* @return : The column name
*/
-QVariant QDataProcessorOneLevelTreeModel::headerData(
+QVariant QOneLevelTreeModel::headerData(
int section, Qt::Orientation orientation, int role) const {
if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
@@ -73,7 +73,7 @@ QVariant QDataProcessorOneLevelTreeModel::headerData(
* @return : The index of the element
*/
QModelIndex
-QDataProcessorOneLevelTreeModel::index(int row, int column,
+QOneLevelTreeModel::index(int row, int column,
const QModelIndex &parent) const {
UNUSED_ARG(parent);
@@ -85,7 +85,7 @@ QDataProcessorOneLevelTreeModel::index(int row, int column,
* @param parent : The parent of this item
* @return : The 'processed' status
*/
-bool QDataProcessorOneLevelTreeModel::isProcessed(
+bool QOneLevelTreeModel::isProcessed(
int position, const QModelIndex &parent) const {
// No parent items exists, this should not be possible
@@ -107,7 +107,7 @@ bool QDataProcessorOneLevelTreeModel::isProcessed(
* @return : Its parent
*/
QModelIndex
-QDataProcessorOneLevelTreeModel::parent(const QModelIndex &index) const {
+QOneLevelTreeModel::parent(const QModelIndex &index) const {
UNUSED_ARG(index);
return QModelIndex();
@@ -119,7 +119,7 @@ QDataProcessorOneLevelTreeModel::parent(const QModelIndex &index) const {
* @param parent : The parent of the set of elements
* @return : Boolean indicating whether the insertion was successful or not
*/
-bool QDataProcessorOneLevelTreeModel::insertRows(int position, int count,
+bool QOneLevelTreeModel::insertRows(int position, int count,
const QModelIndex &parent) {
if (parent.isValid())
return false;
@@ -152,7 +152,7 @@ bool QDataProcessorOneLevelTreeModel::insertRows(int position, int count,
* @return : Boolean indicating whether the elements were removed successfully or
* not
*/
-bool QDataProcessorOneLevelTreeModel::removeRows(int position, int count,
+bool QOneLevelTreeModel::removeRows(int position, int count,
const QModelIndex &parent) {
if (parent.isValid())
@@ -183,7 +183,7 @@ bool QDataProcessorOneLevelTreeModel::removeRows(int position, int count,
* @param parent : The parent item
* @return : The number of rows
*/
-int QDataProcessorOneLevelTreeModel::rowCount(const QModelIndex &parent) const {
+int QOneLevelTreeModel::rowCount(const QModelIndex &parent) const {
if (parent.isValid())
return 0;
@@ -196,7 +196,7 @@ int QDataProcessorOneLevelTreeModel::rowCount(const QModelIndex &parent) const {
* @param value : the new value
* @param role : the role
*/
-bool QDataProcessorOneLevelTreeModel::setData(const QModelIndex &index,
+bool QOneLevelTreeModel::setData(const QModelIndex &index,
const QVariant &value, int role) {
if (role != Qt::EditRole)
@@ -222,7 +222,7 @@ bool QDataProcessorOneLevelTreeModel::setData(const QModelIndex &index,
* @param parent : The parent of this row
* @return : Boolean indicating whether process status was set successfully
*/
-bool QDataProcessorOneLevelTreeModel::setProcessed(bool processed, int position,
+bool QOneLevelTreeModel::setProcessed(bool processed, int position,
const QModelIndex &parent) {
// No parent items exists, this should not be possible
@@ -244,7 +244,7 @@ bool QDataProcessorOneLevelTreeModel::setProcessed(bool processed, int position,
* @return :: the underlying table workspace
*/
ITableWorkspace_sptr
-QDataProcessorOneLevelTreeModel::getTableWorkspace() const {
+QOneLevelTreeModel::getTableWorkspace() const {
return m_tWS;
}
diff --git a/qt/widgets/common/src/DataProcessorUI/QTwoLevelTreeModel.cpp b/qt/widgets/common/src/DataProcessorUI/QTwoLevelTreeModel.cpp
index 688f7c18d9f789bc4e6e425601cf7e9422096d33..720703484fe53ed10d325595913bfff1443da481 100644
--- a/qt/widgets/common/src/DataProcessorUI/QTwoLevelTreeModel.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/QTwoLevelTreeModel.cpp
@@ -1,4 +1,4 @@
-#include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorTwoLevelTreeModel.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/QTwoLevelTreeModel.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
@@ -13,7 +13,7 @@ using namespace Mantid::API;
@param whitelist : A DataProcessorWhiteList containing information about the
columns, their indices and descriptions
*/
-QDataProcessorTwoLevelTreeModel::QDataProcessorTwoLevelTreeModel(
+QTwoLevelTreeModel::QTwoLevelTreeModel(
ITableWorkspace_sptr tableWorkspace,
const DataProcessorWhiteList &whitelist)
: AbstractTreeModel(tableWorkspace, whitelist) {
@@ -30,14 +30,14 @@ QDataProcessorTwoLevelTreeModel::QDataProcessorTwoLevelTreeModel(
setupModelData(tableWorkspace);
}
-QDataProcessorTwoLevelTreeModel::~QDataProcessorTwoLevelTreeModel() {}
+QTwoLevelTreeModel::~QTwoLevelTreeModel() {}
/** Returns data for specified index
* @param index : The index
* @param role : The role
* @return : The data associated with the given index
*/
-QVariant QDataProcessorTwoLevelTreeModel::data(const QModelIndex &index,
+QVariant QTwoLevelTreeModel::data(const QModelIndex &index,
int role) const {
if (!index.isValid())
@@ -80,7 +80,7 @@ QVariant QDataProcessorTwoLevelTreeModel::data(const QModelIndex &index,
* @param role : The role
* @return : The column name
*/
-QVariant QDataProcessorTwoLevelTreeModel::headerData(
+QVariant QTwoLevelTreeModel::headerData(
int section, Qt::Orientation orientation, int role) const {
if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
@@ -99,7 +99,7 @@ QVariant QDataProcessorTwoLevelTreeModel::headerData(
* @return : The index of the element
*/
QModelIndex
-QDataProcessorTwoLevelTreeModel::index(int row, int column,
+QTwoLevelTreeModel::index(int row, int column,
const QModelIndex &parent) const {
return parent.isValid() ? createIndex(row, column, parent.row())
@@ -111,7 +111,7 @@ QDataProcessorTwoLevelTreeModel::index(int row, int column,
* @param parent : The parent of this item
* @return : The 'processed' status
*/
-bool QDataProcessorTwoLevelTreeModel::isProcessed(
+bool QTwoLevelTreeModel::isProcessed(
int position, const QModelIndex &parent) const {
if (!parent.isValid()) {
@@ -142,7 +142,7 @@ bool QDataProcessorTwoLevelTreeModel::isProcessed(
* @return : Its parent
*/
QModelIndex
-QDataProcessorTwoLevelTreeModel::parent(const QModelIndex &index) const {
+QTwoLevelTreeModel::parent(const QModelIndex &index) const {
int internalIdInt = int(index.internalId());
@@ -155,7 +155,7 @@ QDataProcessorTwoLevelTreeModel::parent(const QModelIndex &index) const {
* @param parent : The parent of the set of elements
* @return : Boolean indicating whether the insertion was successful or not
*/
-bool QDataProcessorTwoLevelTreeModel::insertRows(int position, int count,
+bool QTwoLevelTreeModel::insertRows(int position, int count,
const QModelIndex &parent) {
bool success = false;
@@ -177,7 +177,7 @@ bool QDataProcessorTwoLevelTreeModel::insertRows(int position, int count,
* @param parent : The parent index (as integer)
* @return : Boolean indicating if the insertion was successful
*/
-bool QDataProcessorTwoLevelTreeModel::insertRows(int position, int count,
+bool QTwoLevelTreeModel::insertRows(int position, int count,
int parent) {
// Parent does not exist
@@ -237,7 +237,7 @@ bool QDataProcessorTwoLevelTreeModel::insertRows(int position, int count,
* @param count : The number of groups to insert
* @return : True if insertion was successful, false otherwise
*/
-bool QDataProcessorTwoLevelTreeModel::insertGroups(int position, int count) {
+bool QTwoLevelTreeModel::insertGroups(int position, int count) {
// Invalid position
if (position < 0 || position > rowCount())
@@ -275,7 +275,7 @@ bool QDataProcessorTwoLevelTreeModel::insertGroups(int position, int count) {
* @return : Boolean indicating whether the elements were removed successfully or
* not
*/
-bool QDataProcessorTwoLevelTreeModel::removeRows(int position, int count,
+bool QTwoLevelTreeModel::removeRows(int position, int count,
const QModelIndex &parent) {
bool success = false;
@@ -296,7 +296,7 @@ bool QDataProcessorTwoLevelTreeModel::removeRows(int position, int count,
* @param count : The number of groups to remove
* @return : Boolean indicating whether or not groups were removed
*/
-bool QDataProcessorTwoLevelTreeModel::removeGroups(int position, int count) {
+bool QTwoLevelTreeModel::removeGroups(int position, int count) {
// Invalid position
if (position < 0 || position >= rowCount())
@@ -347,7 +347,7 @@ bool QDataProcessorTwoLevelTreeModel::removeGroups(int position, int count) {
* @param parent : The parent item
* @return : Boolean indicating whether or not rows were removed
*/
-bool QDataProcessorTwoLevelTreeModel::removeRows(int position, int count,
+bool QTwoLevelTreeModel::removeRows(int position, int count,
int parent) {
// Parent does not exist
@@ -400,7 +400,7 @@ bool QDataProcessorTwoLevelTreeModel::removeRows(int position, int count,
* @param parent : The parent item
* @return : The number of rows
*/
-int QDataProcessorTwoLevelTreeModel::rowCount(const QModelIndex &parent) const {
+int QTwoLevelTreeModel::rowCount(const QModelIndex &parent) const {
// We are counting the number of groups
if (!parent.isValid())
@@ -423,7 +423,7 @@ int QDataProcessorTwoLevelTreeModel::rowCount(const QModelIndex &parent) const {
* @param value : the new value
* @param role : the role
*/
-bool QDataProcessorTwoLevelTreeModel::setData(const QModelIndex &index,
+bool QTwoLevelTreeModel::setData(const QModelIndex &index,
const QVariant &value, int role) {
if (role != Qt::EditRole)
@@ -474,7 +474,7 @@ bool QDataProcessorTwoLevelTreeModel::setData(const QModelIndex &index,
* whitelist
* @param table : A table workspace containing the data
*/
-void QDataProcessorTwoLevelTreeModel::setupModelData(
+void QTwoLevelTreeModel::setupModelData(
ITableWorkspace_sptr table) {
int nrows = static_cast<int>(table->rowCount());
@@ -502,7 +502,7 @@ void QDataProcessorTwoLevelTreeModel::setupModelData(
* @return :: the underlying table workspace
*/
ITableWorkspace_sptr
-QDataProcessorTwoLevelTreeModel::getTableWorkspace() const {
+QTwoLevelTreeModel::getTableWorkspace() const {
return m_tWS;
}
@@ -512,7 +512,7 @@ QDataProcessorTwoLevelTreeModel::getTableWorkspace() const {
* @param parent : The parent of this item
* @return : Boolean indicating whether process status was set successfully
*/
-bool QDataProcessorTwoLevelTreeModel::setProcessed(bool processed, int position,
+bool QTwoLevelTreeModel::setProcessed(bool processed, int position,
const QModelIndex &parent) {
if (!parent.isValid()) {
diff --git a/qt/widgets/common/src/DataProcessorUI/TwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/TwoLevelTreeManager.cpp
index 8f070de93f47579bb6083dd3dabfcada84278b33..045812a16ceeac4a9424cc002a0ee7a5f59cdf6f 100644
--- a/qt/widgets/common/src/DataProcessorUI/TwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/TwoLevelTreeManager.cpp
@@ -26,7 +26,7 @@
#include "MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/SaveTableCommand.h"
#include "MantidQtWidgets/Common/DataProcessorUI/SeparatorCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorTwoLevelTreeModel.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/QTwoLevelTreeModel.h"
#include "MantidQtWidgets/Common/ParseNumerics.h"
#include "MantidQtWidgets/Common/DataProcessorUI/ToStdStringMap.h"
#include "MantidKernel/make_unique.h"
@@ -52,7 +52,7 @@ TwoLevelTreeManager::TwoLevelTreeManager(
DataProcessorPresenter *presenter, Mantid::API::ITableWorkspace_sptr table,
const DataProcessorWhiteList &whitelist)
: m_presenter(presenter),
- m_model(new QDataProcessorTwoLevelTreeModel(table, whitelist)) {}
+ m_model(new QTwoLevelTreeModel(table, whitelist)) {}
/**
* Constructor (no table workspace given)
@@ -376,7 +376,7 @@ void TwoLevelTreeManager::pasteSelected(const QString &text) {
void TwoLevelTreeManager::newTable(
const DataProcessorWhiteList &whitelist) {
- m_model.reset(new QDataProcessorTwoLevelTreeModel(
+ m_model.reset(new QTwoLevelTreeModel(
createDefaultWorkspace(whitelist), whitelist));
}
@@ -388,7 +388,7 @@ void TwoLevelTreeManager::newTable(
ITableWorkspace_sptr table, const DataProcessorWhiteList &whitelist) {
if (isValidModel(table, whitelist.size())) {
- m_model.reset(new QDataProcessorTwoLevelTreeModel(table, whitelist));
+ m_model.reset(new QTwoLevelTreeModel(table, whitelist));
} else
throw std::runtime_error("Selected table has the incorrect number of "
"columns to be used as a data processor table.");
@@ -566,7 +566,7 @@ void TwoLevelTreeManager::transfer(
}
}
- m_model.reset(new QDataProcessorTwoLevelTreeModel(ws, whitelist));
+ m_model.reset(new QTwoLevelTreeModel(ws, whitelist));
}
/** Updates a row with new data
diff --git a/qt/widgets/common/test/DataProcessorUI/QOneLevelTreeModelTest.h b/qt/widgets/common/test/DataProcessorUI/QOneLevelTreeModelTest.h
index b47569f25469dc15f4136bf1ddb9f3d15589deba..13d7628c6b173ef28a95d7a8f7f446af4854030e 100644
--- a/qt/widgets/common/test/DataProcessorUI/QOneLevelTreeModelTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/QOneLevelTreeModelTest.h
@@ -4,18 +4,18 @@
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorOneLevelTreeModel.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/QOneLevelTreeModel.h"
#include <cxxtest/TestSuite.h>
using namespace MantidQt::MantidWidgets;
using namespace MantidQt::MantidWidgets::DataProcessor;
using namespace Mantid::API;
-class QDataProcessorOneLevelTreeModelTest : public CxxTest::TestSuite {
+class QOneLevelTreeModelTest : public CxxTest::TestSuite {
public:
// Create a white list
- QDataProcessorOneLevelTreeModelTest() {
+ QOneLevelTreeModelTest() {
m_whitelist.addElement("Column1", "Property1", "Description1");
m_whitelist.addElement("Column2", "Property2", "Description2");
}
@@ -58,18 +58,18 @@ public:
auto ws = oneRowTable();
ws->addColumn("str", "Group");
- TS_ASSERT_THROWS(QDataProcessorOneLevelTreeModel(ws, m_whitelist),
+ TS_ASSERT_THROWS(QOneLevelTreeModel(ws, m_whitelist),
std::invalid_argument);
ws->addColumn("str", "Group1");
ws->addColumn("str", "Group2");
- TS_ASSERT_THROWS(QDataProcessorOneLevelTreeModel(ws, m_whitelist),
+ TS_ASSERT_THROWS(QOneLevelTreeModel(ws, m_whitelist),
std::invalid_argument);
}
void testConstructorOneRowTable() {
auto ws = oneRowTable();
- QDataProcessorOneLevelTreeModel model(ws, m_whitelist);
+ QOneLevelTreeModel model(ws, m_whitelist);
// One row
TS_ASSERT_EQUALS(model.rowCount(), 1);
@@ -90,7 +90,7 @@ public:
void testConstructorFourRowTable() {
auto ws = fourRowTable();
- QDataProcessorOneLevelTreeModel model(ws, m_whitelist);
+ QOneLevelTreeModel model(ws, m_whitelist);
// Four rows
TS_ASSERT_EQUALS(model.rowCount(), 4);
@@ -115,13 +115,13 @@ public:
void testColumnCount() {
auto ws = oneRowTable();
- QDataProcessorOneLevelTreeModel model(ws, m_whitelist);
+ QOneLevelTreeModel model(ws, m_whitelist);
TS_ASSERT_EQUALS(model.columnCount(), m_whitelist.size());
}
void testIndex() {
auto ws = fourRowTable();
- QDataProcessorOneLevelTreeModel model(ws, m_whitelist);
+ QOneLevelTreeModel model(ws, m_whitelist);
TS_ASSERT_EQUALS(model.index(0, 0).row(), 0);
TS_ASSERT_EQUALS(model.index(1, 0).row(), 1);
@@ -131,7 +131,7 @@ public:
void testParent() {
auto ws = fourRowTable();
- QDataProcessorOneLevelTreeModel model(ws, m_whitelist);
+ QOneLevelTreeModel model(ws, m_whitelist);
TS_ASSERT_EQUALS(model.parent(model.index(0, 0)), QModelIndex());
TS_ASSERT_EQUALS(model.parent(model.index(1, 0)), QModelIndex());
@@ -141,7 +141,7 @@ public:
void testSetData() {
auto ws = fourRowTable();
- QDataProcessorOneLevelTreeModel model(ws, m_whitelist);
+ QOneLevelTreeModel model(ws, m_whitelist);
// Update some cells with new data
model.setData(model.index(0, 0), "new_value1");
@@ -169,7 +169,7 @@ public:
void testInsertRowsOneRowTable() {
auto ws = oneRowTable();
- QDataProcessorOneLevelTreeModel model(ws, m_whitelist);
+ QOneLevelTreeModel model(ws, m_whitelist);
// Insert rows
@@ -191,7 +191,7 @@ public:
void testRemoveRowsOneRowTable() {
auto ws = oneRowTable();
- QDataProcessorOneLevelTreeModel model(ws, m_whitelist);
+ QOneLevelTreeModel model(ws, m_whitelist);
// Remove the only row
TS_ASSERT_EQUALS(model.removeRows(0, 1), true);
@@ -204,7 +204,7 @@ public:
void testRemoveRowsFourRowTable() {
auto ws = fourRowTable();
- QDataProcessorOneLevelTreeModel model(ws, m_whitelist);
+ QOneLevelTreeModel model(ws, m_whitelist);
// Non-existing row
TS_ASSERT_EQUALS(model.removeRows(10, 1), false);
@@ -222,7 +222,7 @@ public:
void testHighlightFourRowTable() {
auto ws = fourRowTable();
- QDataProcessorOneLevelTreeModel model(ws, m_whitelist);
+ QOneLevelTreeModel model(ws, m_whitelist);
// Non-existent row
TS_ASSERT_EQUALS(model.setProcessed(true, 10), false);
@@ -253,7 +253,7 @@ public:
void testIsProcessedFourRowTable() {
auto ws = fourRowTable();
- QDataProcessorOneLevelTreeModel model(ws, m_whitelist);
+ QOneLevelTreeModel model(ws, m_whitelist);
// Set the 1st and 3rd rows processed
model.setProcessed(true, 0);
diff --git a/qt/widgets/common/test/DataProcessorUI/QTwoLevelTreeModelTest.h b/qt/widgets/common/test/DataProcessorUI/QTwoLevelTreeModelTest.h
index fec7cbbdd0b13b58c9f49a7a765dcd881c141ed8..cbff2f78bd57eae3823b0c707365c7d2f5690ff6 100644
--- a/qt/widgets/common/test/DataProcessorUI/QTwoLevelTreeModelTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/QTwoLevelTreeModelTest.h
@@ -4,18 +4,18 @@
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/TableRow.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorTwoLevelTreeModel.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/QTwoLevelTreeModel.h"
#include <cxxtest/TestSuite.h>
using namespace MantidQt::MantidWidgets;
using namespace MantidQt::MantidWidgets::DataProcessor;
using namespace Mantid::API;
-class QDataProcessorTwoLevelTreeModelTest : public CxxTest::TestSuite {
+class QTwoLevelTreeModelTest : public CxxTest::TestSuite {
public:
// Constructor (initializes whitelist)
- QDataProcessorTwoLevelTreeModelTest() {
+ QTwoLevelTreeModelTest() {
m_whitelist.addElement("Column1", "Property1", "Description1");
m_whitelist.addElement("Column2", "Property2", "Description2");
}
@@ -90,18 +90,18 @@ public:
auto ws = oneRowTable();
ws->removeColumn("Group");
- TS_ASSERT_THROWS(QDataProcessorTwoLevelTreeModel(ws, m_whitelist),
+ TS_ASSERT_THROWS(QTwoLevelTreeModel(ws, m_whitelist),
std::invalid_argument);
ws->addColumn("str", "Group1");
ws->addColumn("str", "Group2");
- TS_ASSERT_THROWS(QDataProcessorTwoLevelTreeModel(ws, m_whitelist),
+ TS_ASSERT_THROWS(QTwoLevelTreeModel(ws, m_whitelist),
std::invalid_argument);
}
void testConstructorOneRowTable() {
auto ws = oneRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// One group
TS_ASSERT_EQUALS(model.rowCount(), 1);
@@ -135,7 +135,7 @@ public:
void testConstructorFourRowTable() {
auto ws = fourRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// TWo groups
TS_ASSERT_EQUALS(model.rowCount(), 2);
@@ -186,13 +186,13 @@ public:
void testColumnCount() {
auto ws = oneRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
TS_ASSERT_EQUALS(model.columnCount(), m_whitelist.size());
}
void testIndex() {
auto ws = fourRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Group indices
TS_ASSERT_EQUALS(model.index(0, 0).row(), 0);
@@ -207,7 +207,7 @@ public:
void testParent() {
auto ws = fourRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Group parent
TS_ASSERT_EQUALS(model.parent(model.index(0, 0)), QModelIndex());
@@ -226,7 +226,7 @@ public:
void testSetData() {
auto ws = fourRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Rename groups
model.setData(model.index(0, 0), "new_group_0");
@@ -280,7 +280,7 @@ public:
void testInsertRowsOneRowTable() {
auto ws = oneRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Insert rows
@@ -302,7 +302,7 @@ public:
void testInsertGroupsOneRowTable() {
auto ws = oneRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Insert groups
@@ -338,7 +338,7 @@ public:
void testRemoveRowsOneRowTable() {
auto ws = oneRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Remove the only row, this should remove the group
TS_ASSERT_EQUALS(model.removeRows(0, 1, model.index(0, 0)), true);
@@ -351,7 +351,7 @@ public:
void testRemoveGroupsFourRowTable() {
auto ws = fourRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Non-existing group
TS_ASSERT_EQUALS(model.removeRows(10, 1), false);
@@ -373,7 +373,7 @@ public:
void testRemoveRowsFourRowTable() {
auto ws = fourRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Non-existing row in first group
TS_ASSERT_EQUALS(model.removeRows(10, 1, model.index(0, 1)), false);
@@ -453,7 +453,7 @@ public:
<< "13469"
<< "0.7";
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Delete second row
TS_ASSERT_EQUALS(model.removeRows(0, 1, model.index(1, 0)), true);
@@ -493,7 +493,7 @@ public:
void testRemoveRowUnsortedTable() {
// Create a table ws
ITableWorkspace_sptr ws = unsortedFourRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Delete second row
TS_ASSERT_EQUALS(model.removeRows(1, 1, model.index(0, 0)), true);
@@ -513,7 +513,7 @@ public:
void testRemoveRowsUnsortedTable() {
// Create a table ws
ITableWorkspace_sptr ws = unsortedFourRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Delete two consecutive rows belonging to second group
TS_ASSERT_EQUALS(model.removeRows(0, 2, model.index(1, 0)), true);
@@ -531,7 +531,7 @@ public:
void testRemoveGroupUnsortedTable() {
// Create a table ws
ITableWorkspace_sptr ws = unsortedFourRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Delete second group
TS_ASSERT_EQUALS(model.removeRows(1, 1), true);
@@ -559,7 +559,7 @@ public:
<< "group2_row1_col0"
<< "group2_row1_col1";
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Delete second and third groups
TS_ASSERT_EQUALS(model.removeRows(1, 2), true);
@@ -604,7 +604,7 @@ public:
<< "13460"
<< "0.7";
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
ITableWorkspace_sptr ws_model = model.getTableWorkspace();
TS_ASSERT_EQUALS(ws_model->rowCount(), 5);
@@ -622,14 +622,14 @@ public:
void testCountRowsOfNonexistentGroup() {
- QDataProcessorTwoLevelTreeModel model(oneRowTable(), m_whitelist);
+ QTwoLevelTreeModel model(oneRowTable(), m_whitelist);
TS_ASSERT_THROWS_NOTHING(model.rowCount(model.index(1, 0)));
}
void testHighlightTable() {
auto ws = fourRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Non-existent row
TS_ASSERT_EQUALS(model.setProcessed(true, 10, model.index(0, 0)), false);
@@ -676,7 +676,7 @@ public:
void testIsProcessed() {
auto ws = fourRowTable();
- QDataProcessorTwoLevelTreeModel model(ws, m_whitelist);
+ QTwoLevelTreeModel model(ws, m_whitelist);
// Set 1st row of 1st group and 2nd group processed
model.setProcessed(true, 0, model.index(0, 0));