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

rename and move RealTreeModel

parent ed128090
No related branches found
No related tags found
1 merge request!1643loaders: minor cleanup
Hide whitespace changes
Inline Side-by-side
GUI/View/Import/RealDataTreeModel.cpp → GUI/Model/Model/RealTreeModel.cpp
+ 22
− 22
View file @ 0314bf23
......@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/Import/RealDataTreeModel.cpp
//! @brief Implements class RealDataTreeModel
//! @file GUI/Model/Model/RealTreeModel.cpp
//! @brief Implements class RealTreeModel
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
......@@ -12,7 +12,7 @@
//
// ************************************************************************************************
#include "GUI/View/Import/RealDataTreeModel.h"
#include "GUI/Model/Model/RealTreeModel.h"
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Model/RealModel.h"
......@@ -20,7 +20,7 @@
#include <QApplication>
#include <QtGui>
RealDataTreeModel::RealDataTreeModel(QObject* parent, RealModel* model)
RealTreeModel::RealTreeModel(QObject* parent, RealModel* model)
: QAbstractItemModel(parent)
, m_model(model)
, m_visibleRanks({1, 2})
......@@ -31,7 +31,7 @@ RealDataTreeModel::RealDataTreeModel(QObject* parent, RealModel* model)
updateSubscriptions();
}
void RealDataTreeModel::setVisibleRanks(QSet<int> visibleRanks)
void RealTreeModel::setVisibleRanks(QSet<int> visibleRanks)
{
if (m_visibleRanks == visibleRanks)
return;
......@@ -46,7 +46,7 @@ void RealDataTreeModel::setVisibleRanks(QSet<int> visibleRanks)
updateSubscriptions();
}
void RealDataTreeModel::refreshAfterModelChange()
void RealTreeModel::refreshAfterModelChange()
{
for (auto rank : m_visibleRanks) {
if (!m_items[rank - 1].isEmpty()) {
......@@ -59,7 +59,7 @@ void RealDataTreeModel::refreshAfterModelChange()
updateSubscriptions();
}
void RealDataTreeModel::removeDataItem(RealItem* item)
void RealTreeModel::removeDataItem(RealItem* item)
{
QModelIndex index = indexForItem(item);
if (!index.isValid())
......@@ -78,7 +78,7 @@ void RealDataTreeModel::removeDataItem(RealItem* item)
}
}
RealItem* RealDataTreeModel::injectDataItem(int rank)
RealItem* RealTreeModel::injectDataItem(int rank)
{
auto* newItem = m_model->insertDataItem(rank);
if (!m_visibleRanks.contains(rank))
......@@ -92,7 +92,7 @@ RealItem* RealDataTreeModel::injectDataItem(int rank)
return newItem;
}
RealItem* RealDataTreeModel::topMostItem() const
RealItem* RealTreeModel::topMostItem() const
{
if (!m_items[0].isEmpty() && m_visibleRanks.contains(1))
return m_items[0].first();
......@@ -101,7 +101,7 @@ RealItem* RealDataTreeModel::topMostItem() const
return nullptr;
}
QModelIndex RealDataTreeModel::indexOfHeadline(int rank) const
QModelIndex RealTreeModel::indexOfHeadline(int rank) const
{
if (!m_visibleRanks.contains(rank))
return QModelIndex();
......@@ -117,7 +117,7 @@ QModelIndex RealDataTreeModel::indexOfHeadline(int rank) const
return QModelIndex();
}
QModelIndex RealDataTreeModel::index(int row, int column, const QModelIndex& parent) const
QModelIndex RealTreeModel::index(int row, int column, const QModelIndex& parent) const
{
if (!hasIndex(row, column, parent))
return QModelIndex();
......@@ -132,7 +132,7 @@ QModelIndex RealDataTreeModel::index(int row, int column, const QModelIndex& par
return QModelIndex();
}
QModelIndex RealDataTreeModel::parent(const QModelIndex& index) const
QModelIndex RealTreeModel::parent(const QModelIndex& index) const
{
if (!index.isValid())
return QModelIndex();
......@@ -146,12 +146,12 @@ QModelIndex RealDataTreeModel::parent(const QModelIndex& index) const
return indexOfHeadline(2);
}
int RealDataTreeModel::columnCount(const QModelIndex& /*parent*/) const
int RealTreeModel::columnCount(const QModelIndex& /*parent*/) const
{
return 1;
}
int RealDataTreeModel::rowCount(const QModelIndex& parent) const
int RealTreeModel::rowCount(const QModelIndex& parent) const
{
if (!parent.isValid())
return m_visibleRanks.size();
......@@ -164,7 +164,7 @@ int RealDataTreeModel::rowCount(const QModelIndex& parent) const
return 0;
}
QVariant RealDataTreeModel::data(const QModelIndex& index, int role) const
QVariant RealTreeModel::data(const QModelIndex& index, int role) const
{
if (isHeadline(index)) {
QString title = (index == indexOfHeadline(1)) ? "1D Data" : "2D Data";
......@@ -233,7 +233,7 @@ QVariant RealDataTreeModel::data(const QModelIndex& index, int role) const
return QVariant();
}
Qt::ItemFlags RealDataTreeModel::flags(const QModelIndex& index) const
Qt::ItemFlags RealTreeModel::flags(const QModelIndex& index) const
{
if (isHeadline(index) || !index.isValid())
return Qt::NoItemFlags;
......@@ -247,7 +247,7 @@ Qt::ItemFlags RealDataTreeModel::flags(const QModelIndex& index) const
return f;
}
bool RealDataTreeModel::setData(const QModelIndex& index, const QVariant& value, int role)
bool RealTreeModel::setData(const QModelIndex& index, const QVariant& value, int role)
{
if (!index.isValid())
return false;
......@@ -261,7 +261,7 @@ bool RealDataTreeModel::setData(const QModelIndex& index, const QVariant& value,
return false;
}
RealItem* RealDataTreeModel::itemForIndex(const QModelIndex& index) const
RealItem* RealTreeModel::itemForIndex(const QModelIndex& index) const
{
if (!index.isValid())
return nullptr;
......@@ -269,7 +269,7 @@ RealItem* RealDataTreeModel::itemForIndex(const QModelIndex& index) const
return reinterpret_cast<RealItem*>(index.internalPointer());
}
QModelIndex RealDataTreeModel::indexForItem(RealItem* item) const
QModelIndex RealTreeModel::indexForItem(RealItem* item) const
{
if (item == nullptr)
return QModelIndex();
......@@ -282,7 +282,7 @@ QModelIndex RealDataTreeModel::indexForItem(RealItem* item) const
return QModelIndex();
}
bool RealDataTreeModel::isHeadline(const QModelIndex& index) const
bool RealTreeModel::isHeadline(const QModelIndex& index) const
{
if (!index.isValid())
return false;
......@@ -290,7 +290,7 @@ bool RealDataTreeModel::isHeadline(const QModelIndex& index) const
return index.internalPointer() == nullptr;
}
void RealDataTreeModel::updateSubscriptions()
void RealTreeModel::updateSubscriptions()
{
for (auto* item : m_items[0])
connect(item, &RealItem::importContentsProcessed, this,
......@@ -301,7 +301,7 @@ void RealDataTreeModel::updateSubscriptions()
[this, item]() { onContentsProcessed(item); });
}
void RealDataTreeModel::onContentsProcessed(RealItem* item)
void RealTreeModel::onContentsProcessed(RealItem* item)
{
QModelIndex index = indexForItem(item);
emit dataChanged(index, index);
......
GUI/View/Import/RealDataTreeModel.h → GUI/Model/Model/RealTreeModel.h
+ 7
− 7
View file @ 0314bf23
......@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/Import/RealDataTreeModel.h
//! @brief Defines class RealDataTreeModel
//! @file GUI/Model/Model/RealTreeModel.h
//! @brief Defines class RealTreeModel
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
......@@ -12,8 +12,8 @@
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_IMPORT_REALDATATREEMODEL_H
#define BORNAGAIN_GUI_VIEW_IMPORT_REALDATATREEMODEL_H
#ifndef BORNAGAIN_GUI_MODEL_MODEL_REALTREEMODEL_H
#define BORNAGAIN_GUI_MODEL_MODEL_REALTREEMODEL_H
#include <QAbstractItemModel>
#include <QSet>
......@@ -22,10 +22,10 @@ class RealModel;
class RealItem;
//! Tree model for real data item selection. Used for the tree in the import view.
class RealDataTreeModel : public QAbstractItemModel {
class RealTreeModel : public QAbstractItemModel {
Q_OBJECT
public:
explicit RealDataTreeModel(QObject* parent, RealModel* model);
explicit RealTreeModel(QObject* parent, RealModel* model);
void setVisibleRanks(QSet<int> visibleRanks);
QModelIndex index(int row, int column,
......@@ -61,4 +61,4 @@ private:
QSet<int> m_visibleRanks;
};
#endif // BORNAGAIN_GUI_VIEW_IMPORT_REALDATATREEMODEL_H
#endif // BORNAGAIN_GUI_MODEL_MODEL_REALTREEMODEL_H
GUI/View/Import/RealDataSelectorWidget.cpp
+ 2
− 2
View file @ 0314bf23
......@@ -16,13 +16,13 @@
#include "Device/Data/Datafield.h"
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Model/RealTreeModel.h"
#include "GUI/Support/IO/AbstractDataLoader1D.h"
#include "GUI/Support/IO/DataLoaders1D.h"
#include "GUI/Support/Util/Error.h"
#include "GUI/Support/Util/StyleUtil.h"
#include "GUI/View/Import/ImportDataUtil.h"
#include "GUI/View/Import/RealDataPropertiesWidget.h"
#include "GUI/View/Import/RealDataTreeModel.h"
#include "GUI/View/Info/MessageBox.h"
#include "GUI/View/Item/ItemViewOverlayButtons.h"
#include "GUI/View/Project/ProjectManager.h"
......@@ -34,7 +34,7 @@
RealDataSelectorWidget::RealDataSelectorWidget(QWidget* parent, ProjectDocument* document)
: QWidget(parent)
, m_itemTree(new QTreeView(this))
, m_treeModel(new RealDataTreeModel(this, document->realModel()))
, m_treeModel(new RealTreeModel(this, document->realModel()))
, m_propertiesWidget(new RealDataPropertiesWidget(this, document))
, m_document(document)
, m_import1dDataAction(new QAction(this))
......
GUI/View/Import/RealDataSelectorWidget.h
+ 2
− 2
View file @ 0314bf23
......@@ -22,7 +22,7 @@
class RealDataPropertiesWidget;
class InstrumentModel;
class RealItem;
class RealDataTreeModel;
class RealTreeModel;
class ProjectDocument;
//! The RealDataSelectorWidget represents left panel of ImportDataView. Contains a tree to
......@@ -61,7 +61,7 @@ private:
private:
QTreeView* m_itemTree;
RealDataTreeModel* m_treeModel;
RealTreeModel* m_treeModel;
RealDataPropertiesWidget* m_propertiesWidget;
ProjectDocument* m_document;
......
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