Skip to content
Snippets Groups Projects
Commit 9d719378 authored by Matthias Puchner's avatar Matthias Puchner Committed by Wuttke, Joachim
Browse files

rectify class name

parent 4906addb
No related branches found
No related tags found
1 merge request!565further consequences of big refactoring
Hide whitespace changes
Inline Side-by-side
GUI/Model/Fit/FitParameterProxyModel.cpp → GUI/Model/Fit/FitParameterModel.cpp
+ 38
− 40
View file @ 9d719378
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
// //
// BornAgain: simulate and fit reflection and scattering // BornAgain: simulate and fit reflection and scattering
// //
//! @file GUI/Model/Fit/FitParameterProxyModel.cpp //! @file GUI/Model/Fit/FitParameterModel.cpp
//! @brief Implements class FitParameterAbsModel //! @brief Implements class FitParameterAbsModel
//! //!
//! @homepage http://www.bornagainproject.org //! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING) //! @license GNU General Public License v3 or higher (see COPYING)
//! @copyright Forschungszentrum Jülich GmbH 2018 //! @copyright Forschungszentrum Jülich GmbH 2021
//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS) //! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
// //
// ************************************************************************************************ // ************************************************************************************************
#include "GUI/Model/Fit/FitParameterProxyModel.h" #include "GUI/Model/Fit/FitParameterModel.h"
#include "GUI/Model/Fit/FitParameterContainerItem.h" #include "GUI/Model/Fit/FitParameterContainerItem.h"
#include "GUI/Model/Fit/FitParameterHelper.h" #include "GUI/Model/Fit/FitParameterHelper.h"
#include "GUI/Model/Fit/FitParameterItem.h" #include "GUI/Model/Fit/FitParameterItem.h"
...@@ -32,8 +32,7 @@ using boost::polymorphic_downcast; ...@@ -32,8 +32,7 @@ using boost::polymorphic_downcast;
using GUI::Session::ItemUtils::ParentRow; using GUI::Session::ItemUtils::ParentRow;
FitParameterProxyModel::FitParameterProxyModel(FitParameterContainerItem* fitParContainer, FitParameterModel::FitParameterModel(FitParameterContainerItem* fitParContainer, QObject* parent)
QObject* parent)
: QAbstractItemModel(parent), m_root_item(fitParContainer) : QAbstractItemModel(parent), m_root_item(fitParContainer)
{ {
addColumn(COL_NAME, "Name", "Name of fit parameter"); addColumn(COL_NAME, "Name", "Name of fit parameter");
...@@ -47,7 +46,7 @@ FitParameterProxyModel::FitParameterProxyModel(FitParameterContainerItem* fitPar ...@@ -47,7 +46,7 @@ FitParameterProxyModel::FitParameterProxyModel(FitParameterContainerItem* fitPar
m_root_item->mapper()->setOnItemDestroy( m_root_item->mapper()->setOnItemDestroy(
[this](SessionItem* parentItem) { [this](SessionItem* parentItem) {
if (parentItem != m_root_item) { if (parentItem != m_root_item) {
throw Error("FitParameterProxyModel::FitParameterProxyModel() -> Error. " throw Error("FitParameterModel::FitParameterModel() -> Error. "
"Wrong item reported."); "Wrong item reported.");
} }
m_root_item = nullptr; m_root_item = nullptr;
...@@ -55,13 +54,13 @@ FitParameterProxyModel::FitParameterProxyModel(FitParameterContainerItem* fitPar ...@@ -55,13 +54,13 @@ FitParameterProxyModel::FitParameterProxyModel(FitParameterContainerItem* fitPar
this); this);
} }
FitParameterProxyModel::~FitParameterProxyModel() FitParameterModel::~FitParameterModel()
{ {
if (m_root_item) if (m_root_item)
m_root_item->mapper()->unsubscribe(this); m_root_item->mapper()->unsubscribe(this);
} }
Qt::ItemFlags FitParameterProxyModel::flags(const QModelIndex& index) const Qt::ItemFlags FitParameterModel::flags(const QModelIndex& index) const
{ {
if (!m_root_item) if (!m_root_item)
return Qt::NoItemFlags; return Qt::NoItemFlags;
...@@ -90,7 +89,7 @@ Qt::ItemFlags FitParameterProxyModel::flags(const QModelIndex& index) const ...@@ -90,7 +89,7 @@ Qt::ItemFlags FitParameterProxyModel::flags(const QModelIndex& index) const
return returnVal; return returnVal;
} }
QModelIndex FitParameterProxyModel::index(int row, int column, const QModelIndex& parent) const QModelIndex FitParameterModel::index(int row, int column, const QModelIndex& parent) const
{ {
if (!m_root_item || row < 0 || column < 0 || column >= columnCount(QModelIndex()) if (!m_root_item || row < 0 || column < 0 || column >= columnCount(QModelIndex())
|| (parent.isValid() && parent.column() != COL_NAME)) || (parent.isValid() && parent.column() != COL_NAME))
...@@ -137,7 +136,7 @@ QModelIndex FitParameterProxyModel::index(int row, int column, const QModelIndex ...@@ -137,7 +136,7 @@ QModelIndex FitParameterProxyModel::index(int row, int column, const QModelIndex
return QModelIndex(); return QModelIndex();
} }
QModelIndex FitParameterProxyModel::parent(const QModelIndex& child) const QModelIndex FitParameterModel::parent(const QModelIndex& child) const
{ {
if (!m_root_item) if (!m_root_item)
return QModelIndex(); return QModelIndex();
...@@ -160,7 +159,7 @@ QModelIndex FitParameterProxyModel::parent(const QModelIndex& child) const ...@@ -160,7 +159,7 @@ QModelIndex FitParameterProxyModel::parent(const QModelIndex& child) const
return QModelIndex(); return QModelIndex();
} }
int FitParameterProxyModel::rowCount(const QModelIndex& parent) const int FitParameterModel::rowCount(const QModelIndex& parent) const
{ {
if (!m_root_item) if (!m_root_item)
return 0; return 0;
...@@ -179,7 +178,7 @@ int FitParameterProxyModel::rowCount(const QModelIndex& parent) const ...@@ -179,7 +178,7 @@ int FitParameterProxyModel::rowCount(const QModelIndex& parent) const
return 0; return 0;
} }
int FitParameterProxyModel::columnCount(const QModelIndex& parent) const int FitParameterModel::columnCount(const QModelIndex& parent) const
{ {
if (!m_root_item) if (!m_root_item)
return 0; return 0;
...@@ -199,7 +198,7 @@ int FitParameterProxyModel::columnCount(const QModelIndex& parent) const ...@@ -199,7 +198,7 @@ int FitParameterProxyModel::columnCount(const QModelIndex& parent) const
return 0; return 0;
} }
QVariant FitParameterProxyModel::data(const QModelIndex& index, int role) const QVariant FitParameterModel::data(const QModelIndex& index, int role) const
{ {
if (!m_root_item) if (!m_root_item)
return QVariant(); return QVariant();
...@@ -221,7 +220,7 @@ QVariant FitParameterProxyModel::data(const QModelIndex& index, int role) const ...@@ -221,7 +220,7 @@ QVariant FitParameterProxyModel::data(const QModelIndex& index, int role) const
return QVariant(); return QVariant();
} }
bool FitParameterProxyModel::setData(const QModelIndex& index, const QVariant& value, int role) bool FitParameterModel::setData(const QModelIndex& index, const QVariant& value, int role)
{ {
if (!m_root_item) if (!m_root_item)
return false; return false;
...@@ -238,14 +237,14 @@ bool FitParameterProxyModel::setData(const QModelIndex& index, const QVariant& v ...@@ -238,14 +237,14 @@ bool FitParameterProxyModel::setData(const QModelIndex& index, const QVariant& v
return false; return false;
} }
QStringList FitParameterProxyModel::mimeTypes() const QStringList FitParameterModel::mimeTypes() const
{ {
QStringList types; QStringList types;
types << GUI::Session::XML::LinkMimeType; types << GUI::Session::XML::LinkMimeType;
return types; return types;
} }
QMimeData* FitParameterProxyModel::mimeData(const QModelIndexList& indexes) const QMimeData* FitParameterModel::mimeData(const QModelIndexList& indexes) const
{ {
auto* mimeData = new QMimeData(); auto* mimeData = new QMimeData();
QModelIndex index = indexes.first(); QModelIndex index = indexes.first();
...@@ -261,8 +260,8 @@ QMimeData* FitParameterProxyModel::mimeData(const QModelIndexList& indexes) cons ...@@ -261,8 +260,8 @@ QMimeData* FitParameterProxyModel::mimeData(const QModelIndexList& indexes) cons
return mimeData; return mimeData;
} }
bool FitParameterProxyModel::canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, bool FitParameterModel::canDropMimeData(const QMimeData* data, Qt::DropAction action, int row,
int column, const QModelIndex& parent) const int column, const QModelIndex& parent) const
{ {
Q_UNUSED(data); Q_UNUSED(data);
Q_UNUSED(action); Q_UNUSED(action);
...@@ -275,8 +274,8 @@ bool FitParameterProxyModel::canDropMimeData(const QMimeData* data, Qt::DropActi ...@@ -275,8 +274,8 @@ bool FitParameterProxyModel::canDropMimeData(const QMimeData* data, Qt::DropActi
return drop_is_possible; return drop_is_possible;
} }
bool FitParameterProxyModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, bool FitParameterModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int row,
int column, const QModelIndex& parent) int column, const QModelIndex& parent)
{ {
Q_UNUSED(action); Q_UNUSED(action);
Q_UNUSED(row); Q_UNUSED(row);
...@@ -299,8 +298,7 @@ bool FitParameterProxyModel::dropMimeData(const QMimeData* data, Qt::DropAction ...@@ -299,8 +298,7 @@ bool FitParameterProxyModel::dropMimeData(const QMimeData* data, Qt::DropAction
return true; return true;
} }
QVariant FitParameterProxyModel::headerData(int section, Qt::Orientation orientation, QVariant FitParameterModel::headerData(int section, Qt::Orientation orientation, int role) const
int role) const
{ {
if (role == Qt::DisplayRole && orientation == Qt::Horizontal) if (role == Qt::DisplayRole && orientation == Qt::Horizontal)
return m_columnNames.value(section); return m_columnNames.value(section);
...@@ -309,9 +307,9 @@ QVariant FitParameterProxyModel::headerData(int section, Qt::Orientation orienta ...@@ -309,9 +307,9 @@ QVariant FitParameterProxyModel::headerData(int section, Qt::Orientation orienta
return QVariant(); return QVariant();
} }
void FitParameterProxyModel::onSourceDataChanged(const QModelIndex& topLeft, void FitParameterModel::onSourceDataChanged(const QModelIndex& topLeft,
const QModelIndex& bottomRight, const QModelIndex& bottomRight,
const QVector<int>& roles) const QVector<int>& roles)
{ {
Q_UNUSED(bottomRight); Q_UNUSED(bottomRight);
...@@ -325,7 +323,7 @@ void FitParameterProxyModel::onSourceDataChanged(const QModelIndex& topLeft, ...@@ -325,7 +323,7 @@ void FitParameterProxyModel::onSourceDataChanged(const QModelIndex& topLeft,
emit dataChanged(itemIndex, itemIndex, roles); emit dataChanged(itemIndex, itemIndex, roles);
} }
void FitParameterProxyModel::onSourceRowsRemoved(const QModelIndex& parent, int first, int last) void FitParameterModel::onSourceRowsRemoved(const QModelIndex& parent, int first, int last)
{ {
Q_UNUSED(parent); Q_UNUSED(parent);
Q_UNUSED(first); Q_UNUSED(first);
...@@ -334,7 +332,7 @@ void FitParameterProxyModel::onSourceRowsRemoved(const QModelIndex& parent, int ...@@ -334,7 +332,7 @@ void FitParameterProxyModel::onSourceRowsRemoved(const QModelIndex& parent, int
endResetModel(); endResetModel();
} }
void FitParameterProxyModel::onSourceAboutToBeReset() void FitParameterModel::onSourceAboutToBeReset()
{ {
if (!m_root_item) if (!m_root_item)
return; return;
...@@ -342,34 +340,34 @@ void FitParameterProxyModel::onSourceAboutToBeReset() ...@@ -342,34 +340,34 @@ void FitParameterProxyModel::onSourceAboutToBeReset()
endResetModel(); endResetModel();
} }
void FitParameterProxyModel::connectModel(QAbstractItemModel* sourceModel, bool isConnect) const void FitParameterModel::connectModel(QAbstractItemModel* sourceModel, bool isConnect) const
{ {
ASSERT(sourceModel); ASSERT(sourceModel);
if (isConnect) { if (isConnect) {
connect(sourceModel, &QAbstractItemModel::dataChanged, this, connect(sourceModel, &QAbstractItemModel::dataChanged, this,
&FitParameterProxyModel::onSourceDataChanged); &FitParameterModel::onSourceDataChanged);
connect(sourceModel, &QAbstractItemModel::rowsRemoved, this, connect(sourceModel, &QAbstractItemModel::rowsRemoved, this,
&FitParameterProxyModel::onSourceRowsRemoved); &FitParameterModel::onSourceRowsRemoved);
connect(sourceModel, &QAbstractItemModel::modelAboutToBeReset, this, connect(sourceModel, &QAbstractItemModel::modelAboutToBeReset, this,
&FitParameterProxyModel::onSourceAboutToBeReset); &FitParameterModel::onSourceAboutToBeReset);
} else { } else {
disconnect(sourceModel, &QAbstractItemModel::dataChanged, this, disconnect(sourceModel, &QAbstractItemModel::dataChanged, this,
&FitParameterProxyModel::onSourceDataChanged); &FitParameterModel::onSourceDataChanged);
disconnect(sourceModel, &QAbstractItemModel::rowsRemoved, this, disconnect(sourceModel, &QAbstractItemModel::rowsRemoved, this,
&FitParameterProxyModel::onSourceRowsRemoved); &FitParameterModel::onSourceRowsRemoved);
disconnect(sourceModel, &QAbstractItemModel::modelAboutToBeReset, this, disconnect(sourceModel, &QAbstractItemModel::modelAboutToBeReset, this,
&FitParameterProxyModel::onSourceAboutToBeReset); &FitParameterModel::onSourceAboutToBeReset);
} }
} }
void FitParameterProxyModel::addColumn(FitParameterProxyModel::EColumn id, const QString& name, void FitParameterModel::addColumn(FitParameterModel::EColumn id, const QString& name,
const QString& tooltip) const QString& tooltip)
{ {
m_columnNames[id] = name; m_columnNames[id] = name;
m_columnToolTips[id] = tooltip; m_columnToolTips[id] = tooltip;
} }
QModelIndex FitParameterProxyModel::indexOfItem(SessionItem* item) const QModelIndex FitParameterModel::indexOfItem(SessionItem* item) const
{ {
if (!m_root_item) if (!m_root_item)
return QModelIndex(); return QModelIndex();
...@@ -401,7 +399,7 @@ QModelIndex FitParameterProxyModel::indexOfItem(SessionItem* item) const ...@@ -401,7 +399,7 @@ QModelIndex FitParameterProxyModel::indexOfItem(SessionItem* item) const
return QModelIndex(); return QModelIndex();
} }
SessionItem* FitParameterProxyModel::itemForIndex(const QModelIndex& index) const SessionItem* FitParameterModel::itemForIndex(const QModelIndex& index) const
{ {
if (!m_root_item) if (!m_root_item)
return nullptr; return nullptr;
...@@ -417,14 +415,14 @@ SessionItem* FitParameterProxyModel::itemForIndex(const QModelIndex& index) cons ...@@ -417,14 +415,14 @@ SessionItem* FitParameterProxyModel::itemForIndex(const QModelIndex& index) cons
return m_root_item; return m_root_item;
} }
SessionModel* FitParameterProxyModel::sourceModel() const SessionModel* FitParameterModel::sourceModel() const
{ {
ASSERT(m_root_item); ASSERT(m_root_item);
return m_root_item->model(); return m_root_item->model();
} }
//! Returns true if given item still exists in source model //! Returns true if given item still exists in source model
bool FitParameterProxyModel::isValidSourceItem(SessionItem* item) const bool FitParameterModel::isValidSourceItem(SessionItem* item) const
{ {
if (item == m_root_item) if (item == m_root_item)
return true; return true;
......
GUI/Model/Fit/FitParameterProxyModel.h → GUI/Model/Fit/FitParameterModel.h
+ 13
− 16
View file @ 9d719378
...@@ -2,18 +2,18 @@ ...@@ -2,18 +2,18 @@
// //
// BornAgain: simulate and fit reflection and scattering // BornAgain: simulate and fit reflection and scattering
// //
//! @file GUI/Model/Fit/FitParameterProxyModel.h //! @file GUI/Model/Fit/FitParameterModel.h
//! @brief Defines class FitParameterProxyModel //! @brief Defines class FitParameterModel
//! //!
//! @homepage http://www.bornagainproject.org //! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING) //! @license GNU General Public License v3 or higher (see COPYING)
//! @copyright Forschungszentrum Jülich GmbH 2018 //! @copyright Forschungszentrum Jülich GmbH 2021
//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS) //! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
// //
// ************************************************************************************************ // ************************************************************************************************
#ifndef BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERPROXYMODEL_H #ifndef BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERMODEL_H
#define BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERPROXYMODEL_H #define BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERMODEL_H
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QStringList> #include <QStringList>
...@@ -22,18 +22,15 @@ class SessionModel; ...@@ -22,18 +22,15 @@ class SessionModel;
class FitParameterContainerItem; class FitParameterContainerItem;
class SessionItem; class SessionItem;
//! The FitParameterProxyModel adapts the original JobModel to show items from FitParameterContainer //! Model to show items from FitParameterContainer in 5 column tree view.
//! in 5 column tree view. class FitParameterModel : public QAbstractItemModel {
//! It is derived from QAbstractItemModel (and not from QAbstractProxyModel).
class FitParameterProxyModel : public QAbstractItemModel {
Q_OBJECT Q_OBJECT
public: public:
explicit FitParameterProxyModel(FitParameterContainerItem* fitParContainer, explicit FitParameterModel(FitParameterContainerItem* fitParContainer,
QObject* parent = nullptr); QObject* parent = nullptr);
~FitParameterProxyModel() override; ~FitParameterModel() override;
enum EColumn { COL_NAME, COL_TYPE, COL_VALUE, COL_MIN, COL_MAX, NUM_COLUMNS }; enum EColumn { COL_NAME, COL_TYPE, COL_VALUE, COL_MIN, COL_MAX, NUM_COLUMNS };
...@@ -78,14 +75,14 @@ private: ...@@ -78,14 +75,14 @@ private:
QMap<int, QString> m_columnToolTips; QMap<int, QString> m_columnToolTips;
}; };
inline Qt::DropActions FitParameterProxyModel::supportedDragActions() const inline Qt::DropActions FitParameterModel::supportedDragActions() const
{ {
return Qt::MoveAction | Qt::CopyAction; return Qt::MoveAction | Qt::CopyAction;
} }
inline Qt::DropActions FitParameterProxyModel::supportedDropActions() const inline Qt::DropActions FitParameterModel::supportedDropActions() const
{ {
return Qt::MoveAction | Qt::CopyAction; return Qt::MoveAction | Qt::CopyAction;
} }
#endif // BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERPROXYMODEL_H #endif // BORNAGAIN_GUI_MODEL_FIT_FITPARAMETERMODEL_H
GUI/View/Fit/FitParameterWidget.cpp
+ 6
− 6
View file @ 9d719378
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "GUI/Model/Fit/FitParameterHelper.h" #include "GUI/Model/Fit/FitParameterHelper.h"
#include "GUI/Model/Fit/FitParameterItem.h" #include "GUI/Model/Fit/FitParameterItem.h"
#include "GUI/Model/Fit/FitParameterLinkItem.h" #include "GUI/Model/Fit/FitParameterLinkItem.h"
#include "GUI/Model/Fit/FitParameterProxyModel.h" #include "GUI/Model/Fit/FitParameterModel.h"
#include "GUI/Model/Fit/FitSuiteItem.h" #include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Fit/ParameterTreeItems.h" #include "GUI/Model/Fit/ParameterTreeItems.h"
#include "GUI/Model/Group/FilterPropertyProxy.h" #include "GUI/Model/Group/FilterPropertyProxy.h"
...@@ -72,7 +72,7 @@ FitParameterWidget::FitParameterWidget(QWidget* parent) ...@@ -72,7 +72,7 @@ FitParameterWidget::FitParameterWidget(QWidget* parent)
} }
//! Sets ParameterTuningWidget to be able to provide it with context menu and steer //! Sets ParameterTuningWidget to be able to provide it with context menu and steer
//! it behaviour in the course of fit settings or fit running //! its behaviour in the course of fit settings or fit running
void FitParameterWidget::setParameterTuningWidget(ParameterTuningWidget* tuningWidget) void FitParameterWidget::setParameterTuningWidget(ParameterTuningWidget* tuningWidget)
{ {
...@@ -248,13 +248,13 @@ void FitParameterWidget::init_fit_model() ...@@ -248,13 +248,13 @@ void FitParameterWidget::init_fit_model()
m_treeView->setModel(nullptr); m_treeView->setModel(nullptr);
delete m_fitParameterModel; delete m_fitParameterModel;
m_fitParameterModel = new FitParameterProxyModel( m_fitParameterModel = new FitParameterModel(jobItem()->fitParameterContainerItem(),
jobItem()->fitParameterContainerItem(), jobItem()->fitParameterContainerItem()->model()); jobItem()->fitParameterContainerItem()->model());
m_treeView->setModel(m_fitParameterModel); m_treeView->setModel(m_fitParameterModel);
connect(m_fitParameterModel, &FitParameterProxyModel::dataChanged, this, connect(m_fitParameterModel, &FitParameterModel::dataChanged, this,
&FitParameterWidget::onFitParameterModelChange); &FitParameterWidget::onFitParameterModelChange);
connect(m_fitParameterModel, &FitParameterProxyModel::modelReset, this, connect(m_fitParameterModel, &FitParameterModel::modelReset, this,
&FitParameterWidget::onFitParameterModelChange); &FitParameterWidget::onFitParameterModelChange);
onFitParameterModelChange(); onFitParameterModelChange();
......
GUI/View/Fit/FitParameterWidget.h
+ 2
− 2
View file @ 9d719378
...@@ -23,7 +23,7 @@ class ParameterTuningWidget; ...@@ -23,7 +23,7 @@ class ParameterTuningWidget;
class QTreeView; class QTreeView;
class QAction; class QAction;
class QMenu; class QMenu;
class FitParameterProxyModel; class FitParameterModel;
class ParameterItem; class ParameterItem;
class FitParameterItem; class FitParameterItem;
class FitParameterLinkItem; class FitParameterLinkItem;
...@@ -79,7 +79,7 @@ private: ...@@ -79,7 +79,7 @@ private:
QAction* m_createFitParAction; QAction* m_createFitParAction;
QAction* m_removeFromFitParAction; QAction* m_removeFromFitParAction;
QAction* m_removeFitParAction; QAction* m_removeFitParAction;
FitParameterProxyModel* m_fitParameterModel; FitParameterModel* m_fitParameterModel;
DeleteEventFilter* m_keyboardFilter; DeleteEventFilter* m_keyboardFilter;
OverlayLabelController* m_infoLabel; OverlayLabelController* m_infoLabel;
}; };
......
Tests/Unit/GUI/TestFitParameterModel.cpp
+ 20
− 21
View file @ 9d719378
#include "GUI/Model/Fit/FitParameterContainerItem.h" #include "GUI/Model/Fit/FitParameterContainerItem.h"
#include "GUI/Model/Fit/FitParameterItem.h" #include "GUI/Model/Fit/FitParameterItem.h"
#include "GUI/Model/Fit/FitParameterLinkItem.h" #include "GUI/Model/Fit/FitParameterLinkItem.h"
#include "GUI/Model/Fit/FitParameterProxyModel.h" #include "GUI/Model/Fit/FitParameterModel.h"
#include "GUI/Model/Fit/FitSuiteItem.h" #include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Job/JobModel.h" #include "GUI/Model/Job/JobModel.h"
#include "Tests/GTestWrapper/google_test.h" #include "Tests/GTestWrapper/google_test.h"
...@@ -14,11 +14,10 @@ TEST_F(TestFitParameterModel, InitialState) ...@@ -14,11 +14,10 @@ TEST_F(TestFitParameterModel, InitialState)
JobModel source; JobModel source;
auto* fitSuiteItem = source.insertItem<FitSuiteItem>(); auto* fitSuiteItem = source.insertItem<FitSuiteItem>();
auto* container = fitSuiteItem->createFitParametersContainer(); auto* container = fitSuiteItem->createFitParametersContainer();
FitParameterProxyModel proxy(dynamic_cast<FitParameterContainerItem*>(container)); FitParameterModel proxy(dynamic_cast<FitParameterContainerItem*>(container));
EXPECT_EQ(0, proxy.rowCount(QModelIndex())); EXPECT_EQ(0, proxy.rowCount(QModelIndex()));
EXPECT_EQ(static_cast<int>(FitParameterProxyModel::NUM_COLUMNS), EXPECT_EQ(static_cast<int>(FitParameterModel::NUM_COLUMNS), proxy.columnCount(QModelIndex()));
proxy.columnCount(QModelIndex()));
EXPECT_EQ(container, proxy.itemForIndex(QModelIndex())); EXPECT_EQ(container, proxy.itemForIndex(QModelIndex()));
} }
...@@ -27,7 +26,7 @@ TEST_F(TestFitParameterModel, addFitParameter) ...@@ -27,7 +26,7 @@ TEST_F(TestFitParameterModel, addFitParameter)
JobModel source; JobModel source;
auto* fitSuiteItem = source.insertItem<FitSuiteItem>(); auto* fitSuiteItem = source.insertItem<FitSuiteItem>();
auto* container = fitSuiteItem->createFitParametersContainer(); auto* container = fitSuiteItem->createFitParametersContainer();
FitParameterProxyModel proxy(dynamic_cast<FitParameterContainerItem*>(container)); FitParameterModel proxy(dynamic_cast<FitParameterContainerItem*>(container));
// adding fit parameter // adding fit parameter
auto* fitPar0 = source.insertItem<FitParameterItem>(container); auto* fitPar0 = source.insertItem<FitParameterItem>(container);
...@@ -38,7 +37,7 @@ TEST_F(TestFitParameterModel, addFitParameter) ...@@ -38,7 +37,7 @@ TEST_F(TestFitParameterModel, addFitParameter)
// checking index of root // checking index of root
EXPECT_EQ(1, proxy.rowCount(QModelIndex())); EXPECT_EQ(1, proxy.rowCount(QModelIndex()));
EXPECT_EQ(FitParameterProxyModel::NUM_COLUMNS, proxy.columnCount(QModelIndex())); EXPECT_EQ(FitParameterModel::NUM_COLUMNS, proxy.columnCount(QModelIndex()));
// accessing item at col=0 (original FitParameterItem) // accessing item at col=0 (original FitParameterItem)
QModelIndex index = proxy.index(0, 0, QModelIndex()); QModelIndex index = proxy.index(0, 0, QModelIndex());
...@@ -52,9 +51,9 @@ TEST_F(TestFitParameterModel, addFitParameter) ...@@ -52,9 +51,9 @@ TEST_F(TestFitParameterModel, addFitParameter)
EXPECT_EQ(index, proxy.indexOfItem(fitPar0)); EXPECT_EQ(index, proxy.indexOfItem(fitPar0));
// accessing item at col=2 // accessing item at col=2
index = proxy.index(0, FitParameterProxyModel::COL_MIN, QModelIndex()); index = proxy.index(0, FitParameterModel::COL_MIN, QModelIndex());
EXPECT_EQ(index.row(), 0); EXPECT_EQ(index.row(), 0);
EXPECT_EQ(index.column(), FitParameterProxyModel::COL_MIN); EXPECT_EQ(index.column(), FitParameterModel::COL_MIN);
EXPECT_EQ(proxy.rowCount(index), 0); EXPECT_EQ(proxy.rowCount(index), 0);
EXPECT_EQ(proxy.columnCount(index), 0); EXPECT_EQ(proxy.columnCount(index), 0);
...@@ -63,9 +62,9 @@ TEST_F(TestFitParameterModel, addFitParameter) ...@@ -63,9 +62,9 @@ TEST_F(TestFitParameterModel, addFitParameter)
EXPECT_EQ(index, proxy.indexOfItem(fitPar0->minimumItem())); EXPECT_EQ(index, proxy.indexOfItem(fitPar0->minimumItem()));
// accessing item at col=3 // accessing item at col=3
index = proxy.index(0, FitParameterProxyModel::COL_VALUE, QModelIndex()); index = proxy.index(0, FitParameterModel::COL_VALUE, QModelIndex());
EXPECT_EQ(index.row(), 0); EXPECT_EQ(index.row(), 0);
EXPECT_EQ(index.column(), FitParameterProxyModel::COL_VALUE); EXPECT_EQ(index.column(), FitParameterModel::COL_VALUE);
EXPECT_EQ(proxy.rowCount(index), 0); EXPECT_EQ(proxy.rowCount(index), 0);
EXPECT_EQ(proxy.columnCount(index), 0); EXPECT_EQ(proxy.columnCount(index), 0);
...@@ -74,9 +73,9 @@ TEST_F(TestFitParameterModel, addFitParameter) ...@@ -74,9 +73,9 @@ TEST_F(TestFitParameterModel, addFitParameter)
EXPECT_EQ(index, proxy.indexOfItem(fitPar0->startValueItem())); EXPECT_EQ(index, proxy.indexOfItem(fitPar0->startValueItem()));
// accessing item at col=4 // accessing item at col=4
index = proxy.index(0, FitParameterProxyModel::COL_MAX, QModelIndex()); index = proxy.index(0, FitParameterModel::COL_MAX, QModelIndex());
EXPECT_EQ(index.row(), 0); EXPECT_EQ(index.row(), 0);
EXPECT_EQ(index.column(), FitParameterProxyModel::COL_MAX); EXPECT_EQ(index.column(), FitParameterModel::COL_MAX);
EXPECT_EQ(proxy.rowCount(index), 0); EXPECT_EQ(proxy.rowCount(index), 0);
EXPECT_EQ(proxy.columnCount(index), 0); EXPECT_EQ(proxy.columnCount(index), 0);
...@@ -95,12 +94,12 @@ TEST_F(TestFitParameterModel, addFitParameter) ...@@ -95,12 +94,12 @@ TEST_F(TestFitParameterModel, addFitParameter)
// checking index of root // checking index of root
EXPECT_EQ(2, proxy.rowCount(QModelIndex())); EXPECT_EQ(2, proxy.rowCount(QModelIndex()));
EXPECT_EQ(FitParameterProxyModel::NUM_COLUMNS, proxy.columnCount(QModelIndex())); EXPECT_EQ(FitParameterModel::NUM_COLUMNS, proxy.columnCount(QModelIndex()));
// accessing item at col=3 for fitPar0 // accessing item at col=3 for fitPar0
index = proxy.index(0, FitParameterProxyModel::COL_VALUE, QModelIndex()); index = proxy.index(0, FitParameterModel::COL_VALUE, QModelIndex());
EXPECT_EQ(index.row(), 0); EXPECT_EQ(index.row(), 0);
EXPECT_EQ(index.column(), FitParameterProxyModel::COL_VALUE); EXPECT_EQ(index.column(), FitParameterModel::COL_VALUE);
EXPECT_EQ(proxy.rowCount(index), 0); EXPECT_EQ(proxy.rowCount(index), 0);
EXPECT_EQ(proxy.columnCount(index), 0); EXPECT_EQ(proxy.columnCount(index), 0);
...@@ -109,9 +108,9 @@ TEST_F(TestFitParameterModel, addFitParameter) ...@@ -109,9 +108,9 @@ TEST_F(TestFitParameterModel, addFitParameter)
EXPECT_EQ(index, proxy.indexOfItem(fitPar0->startValueItem())); EXPECT_EQ(index, proxy.indexOfItem(fitPar0->startValueItem()));
// accessing item at col=3 for fitPar1 // accessing item at col=3 for fitPar1
index = proxy.index(1, FitParameterProxyModel::COL_VALUE, QModelIndex()); index = proxy.index(1, FitParameterModel::COL_VALUE, QModelIndex());
EXPECT_EQ(index.row(), 1); EXPECT_EQ(index.row(), 1);
EXPECT_EQ(index.column(), FitParameterProxyModel::COL_VALUE); EXPECT_EQ(index.column(), FitParameterModel::COL_VALUE);
EXPECT_EQ(proxy.rowCount(index), 0); EXPECT_EQ(proxy.rowCount(index), 0);
EXPECT_EQ(proxy.columnCount(index), 0); EXPECT_EQ(proxy.columnCount(index), 0);
...@@ -125,7 +124,7 @@ TEST_F(TestFitParameterModel, addFitParameterAndLink) ...@@ -125,7 +124,7 @@ TEST_F(TestFitParameterModel, addFitParameterAndLink)
JobModel source; JobModel source;
auto* fitSuiteItem = source.insertItem<FitSuiteItem>(); auto* fitSuiteItem = source.insertItem<FitSuiteItem>();
auto* container = fitSuiteItem->createFitParametersContainer(); auto* container = fitSuiteItem->createFitParametersContainer();
FitParameterProxyModel proxy(dynamic_cast<FitParameterContainerItem*>(container)); FitParameterModel proxy(dynamic_cast<FitParameterContainerItem*>(container));
// adding fit parameter // adding fit parameter
auto* fitPar0 = source.insertItem<FitParameterItem>(container); auto* fitPar0 = source.insertItem<FitParameterItem>(container);
...@@ -140,7 +139,7 @@ TEST_F(TestFitParameterModel, addFitParameterAndLink) ...@@ -140,7 +139,7 @@ TEST_F(TestFitParameterModel, addFitParameterAndLink)
// checking index of root // checking index of root
EXPECT_EQ(1, proxy.rowCount(QModelIndex())); EXPECT_EQ(1, proxy.rowCount(QModelIndex()));
EXPECT_EQ(FitParameterProxyModel::NUM_COLUMNS, proxy.columnCount(QModelIndex())); EXPECT_EQ(FitParameterModel::NUM_COLUMNS, proxy.columnCount(QModelIndex()));
// accessing item at col=0 (original FitParameterItem) // accessing item at col=0 (original FitParameterItem)
QModelIndex index = proxy.index(0, 0, QModelIndex()); QModelIndex index = proxy.index(0, 0, QModelIndex());
...@@ -186,7 +185,7 @@ TEST_F(TestFitParameterModel, addTwoFitParameterAndLinks) ...@@ -186,7 +185,7 @@ TEST_F(TestFitParameterModel, addTwoFitParameterAndLinks)
JobModel source; JobModel source;
auto* fitSuiteItem = source.insertItem<FitSuiteItem>(); auto* fitSuiteItem = source.insertItem<FitSuiteItem>();
auto* container = fitSuiteItem->createFitParametersContainer(); auto* container = fitSuiteItem->createFitParametersContainer();
FitParameterProxyModel proxy(dynamic_cast<FitParameterContainerItem*>(container)); FitParameterModel proxy(dynamic_cast<FitParameterContainerItem*>(container));
// adding fit parameters // adding fit parameters
auto* fitPar0 = source.insertItem<FitParameterItem>(container); auto* fitPar0 = source.insertItem<FitParameterItem>(container);
...@@ -199,7 +198,7 @@ TEST_F(TestFitParameterModel, addTwoFitParameterAndLinks) ...@@ -199,7 +198,7 @@ TEST_F(TestFitParameterModel, addTwoFitParameterAndLinks)
// checking index of root // checking index of root
EXPECT_EQ(2, proxy.rowCount(QModelIndex())); EXPECT_EQ(2, proxy.rowCount(QModelIndex()));
EXPECT_EQ(FitParameterProxyModel::NUM_COLUMNS, proxy.columnCount(QModelIndex())); EXPECT_EQ(FitParameterModel::NUM_COLUMNS, proxy.columnCount(QModelIndex()));
// accessing fitPar1 // accessing fitPar1
QModelIndex index1 = proxy.index(1, 0, QModelIndex()); QModelIndex index1 = proxy.index(1, 0, QModelIndex());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment