Skip to content
Snippets Groups Projects
Commit 9ec47844 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rename BaseSet -> AbstractSetModel

parent 9e9ab2a4
No related branches found
No related tags found
1 merge request!2402class SetView replaces (Instruments|Samples|Datafiles)QListView
Pipeline #132683 passed
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// BornAgain: simulate and fit reflection and scattering // BornAgain: simulate and fit reflection and scattering
// //
//! @file GUI/Model/Type/SetWithModel.cpp //! @file GUI/Model/Type/SetWithModel.cpp
//! @brief Implements class BaseSet, to enforce vtable generation. //! @brief Implements class AbstractSetModel, to enforce vtable generation.
//! //!
//! @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)
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#include "GUI/Model/Type/SetWithModel.h" #include "GUI/Model/Type/SetWithModel.h"
BaseSet::BaseSet(QObject* parent) AbstractSetModel::AbstractSetModel(QObject* parent)
: QObject(parent) : QObject(parent)
{ {
} }
BaseSet::~BaseSet() = default; AbstractSetModel::~AbstractSetModel() = default;
...@@ -30,11 +30,11 @@ ...@@ -30,11 +30,11 @@
//! Needed to support Qt signals (the Q_OBJECT macro does not work in templated classes). //! Needed to support Qt signals (the Q_OBJECT macro does not work in templated classes).
//! The virtual functions setCurrentIndex(i) and model() are used in class SetView. //! The virtual functions setCurrentIndex(i) and model() are used in class SetView.
class BaseSet : public QObject { class AbstractSetModel : public QObject {
Q_OBJECT Q_OBJECT
public: public:
explicit BaseSet(QObject* parent = nullptr); explicit AbstractSetModel(QObject* parent = nullptr);
virtual ~BaseSet(); virtual ~AbstractSetModel();
virtual void setCurrentIndex(size_t i) = 0; virtual void setCurrentIndex(size_t i) = 0;
virtual QAbstractListModel* model() = 0; virtual QAbstractListModel* model() = 0;
...@@ -46,7 +46,7 @@ signals: ...@@ -46,7 +46,7 @@ signals:
//! A set of NamedItem%s that has a current item and a QListModel. //! A set of NamedItem%s that has a current item and a QListModel.
template <class T> class SetWithModel : public BaseSet { template <class T> class SetWithModel : public AbstractSetModel {
public: public:
SetWithModel() SetWithModel()
: m_qmodel(std::make_unique<ModelForSet<T>>(this)) : m_qmodel(std::make_unique<ModelForSet<T>>(this))
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
m_vec.clear(); m_vec.clear();
m_idx = -1; m_idx = -1;
m_qmodel->endResetModel(); m_qmodel->endResetModel();
emit BaseSet::setChanged(); emit AbstractSetModel::setChanged();
} }
void delete_current() void delete_current()
{ {
...@@ -69,7 +69,7 @@ public: ...@@ -69,7 +69,7 @@ public:
m_vec.delete_at(m_idx); m_vec.delete_at(m_idx);
update_current(); update_current();
m_qmodel->endRemoveRows(); m_qmodel->endRemoveRows();
emit BaseSet::setChanged(); emit AbstractSetModel::setChanged();
} }
void add_item(T* t) void add_item(T* t)
{ {
...@@ -77,7 +77,7 @@ public: ...@@ -77,7 +77,7 @@ public:
m_vec.push_back(t); m_vec.push_back(t);
m_idx = m_vec.size() - 1; m_idx = m_vec.size() - 1;
m_qmodel->endInsertRows(); m_qmodel->endInsertRows();
emit BaseSet::setChanged(); emit AbstractSetModel::setChanged();
} }
void add_items(std::vector<T*> v) void add_items(std::vector<T*> v)
{ {
...@@ -86,7 +86,7 @@ public: ...@@ -86,7 +86,7 @@ public:
m_vec.push_back(t); m_vec.push_back(t);
m_idx = m_vec.size() - 1; m_idx = m_vec.size() - 1;
m_qmodel->endInsertRows(); m_qmodel->endInsertRows();
emit BaseSet::setChanged(); emit AbstractSetModel::setChanged();
} }
void setCurrentIndex(size_t i) override void setCurrentIndex(size_t i) override
...@@ -96,7 +96,7 @@ public: ...@@ -96,7 +96,7 @@ public:
if (i != m_idx) if (i != m_idx)
m_idx = i; m_idx = i;
m_qmodel->endResetModel(); m_qmodel->endResetModel();
emit BaseSet::setChanged(); emit AbstractSetModel::setChanged();
} }
size_t currentIndex() const { return m_idx; } size_t currentIndex() const { return m_idx; }
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "GUI/Model/Type/SetWithModel.h" #include "GUI/Model/Type/SetWithModel.h"
#include "GUI/View/Widget/ListItemDelegate.h" #include "GUI/View/Widget/ListItemDelegate.h"
SetView::SetView(BaseSet* set, int minimum_width, QSizePolicy policy) SetView::SetView(AbstractSetModel* set, int minimum_width, QSizePolicy policy)
{ {
setMinimumWidth(minimum_width); setMinimumWidth(minimum_width);
setSizePolicy(policy); setSizePolicy(policy);
......
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
#include <QListView> #include <QListView>
class BaseSet; class AbstractSetModel;
//! Instrument selector on the left side of InstrumentView. //! Instrument selector on the left side of InstrumentView.
class SetView : public QListView { class SetView : public QListView {
public: public:
SetView(BaseSet*, int minimum_width = 200, SetView(AbstractSetModel*, int minimum_width = 200,
QSizePolicy policy = {QSizePolicy::Preferred, QSizePolicy::Expanding}); QSizePolicy policy = {QSizePolicy::Preferred, QSizePolicy::Expanding});
}; };
......
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