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

rename class and sources GUI/View/JobControl/JobPropertiesTableModel ->...

rename class and sources GUI/View/JobControl/JobPropertiesTableModel -> GUI/View/JobControl/JobparQModel
parent 0755dd53
No related branches found
No related tags found
1 merge request!2323BatchInfo split off from JobItem; mv Material classes; systematic names *Set, *QModel, *Editor
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "GUI/Model/Job/BatchInfo.h" #include "GUI/Model/Job/BatchInfo.h"
#include "GUI/Model/Job/JobItem.h" #include "GUI/Model/Job/JobItem.h"
#include "GUI/Support/Data/JobStatus.h" #include "GUI/Support/Data/JobStatus.h"
#include "GUI/View/JobControl/JobPropertiesTableModel.h" #include "GUI/View/JobControl/JobparQModel.h"
#include "GUI/View/Layout/mainwindow_constants.h" #include "GUI/View/Layout/mainwindow_constants.h"
#include <QHeaderView> #include <QHeaderView>
#include <QVBoxLayout> #include <QVBoxLayout>
...@@ -38,7 +38,7 @@ JobPropertiesWidget::JobPropertiesWidget(QWidget* parent, Qt::WindowFlags f) ...@@ -38,7 +38,7 @@ JobPropertiesWidget::JobPropertiesWidget(QWidget* parent, Qt::WindowFlags f)
: QWidget(parent, f) : QWidget(parent, f)
, m_tab_widget(new QTabWidget(this)) , m_tab_widget(new QTabWidget(this))
, m_properties_view(new QTreeView(this)) , m_properties_view(new QTreeView(this))
, m_properties_model(new JobPropertiesTableModel(this)) , m_properties_model(new JobparQModel(this))
, m_comments_editor(new QTextEdit(this)) , m_comments_editor(new QTextEdit(this))
, m_job_item(nullptr) , m_job_item(nullptr)
{ {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <QWidget> #include <QWidget>
class JobItem; class JobItem;
class JobPropertiesTableModel; class JobparQModel;
//! The JobPropertiesWidget class holds component editor for JobItem. Part of JobSelector, //! The JobPropertiesWidget class holds component editor for JobItem. Part of JobSelector,
//! resides at lower left corner of JobView. //! resides at lower left corner of JobView.
...@@ -45,7 +45,7 @@ private slots: ...@@ -45,7 +45,7 @@ private slots:
private: private:
QTabWidget* m_tab_widget; QTabWidget* m_tab_widget;
QTreeView* m_properties_view; QTreeView* m_properties_view;
JobPropertiesTableModel* m_properties_model; JobparQModel* m_properties_model;
QTextEdit* m_comments_editor; QTextEdit* m_comments_editor;
JobItem* m_job_item; JobItem* m_job_item;
}; };
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// //
// BornAgain: simulate and fit reflection and scattering // BornAgain: simulate and fit reflection and scattering
// //
//! @file GUI/View/JobControl/JobPropertiesTableModel.cpp //! @file GUI/View/JobControl/JobparQModel.cpp
//! @brief Implements class JobPropertiesTableModel. //! @brief Implements class JobparQModel.
//! //!
//! @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)
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
// //
// ************************************************************************************************ // ************************************************************************************************
#include "GUI/View/JobControl/JobPropertiesTableModel.h" #include "GUI/View/JobControl/JobparQModel.h"
#include "GUI/Model/Device/InstrumentItems.h" #include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Job/BatchInfo.h" #include "GUI/Model/Job/BatchInfo.h"
#include "GUI/Model/Job/JobItem.h" #include "GUI/Model/Job/JobItem.h"
...@@ -37,33 +37,33 @@ const QString ModelDateShortFormat = "yyyy.MM.dd hh:mm:ss"; ...@@ -37,33 +37,33 @@ const QString ModelDateShortFormat = "yyyy.MM.dd hh:mm:ss";
} // namespace } // namespace
JobPropertiesTableModel::JobPropertiesTableModel(QObject* parent) JobparQModel::JobparQModel(QObject* parent)
: QAbstractTableModel(parent) : QAbstractTableModel(parent)
, m_job_item(nullptr) , m_job_item(nullptr)
{ {
} }
JobPropertiesTableModel::~JobPropertiesTableModel() JobparQModel::~JobparQModel()
{ {
if (m_job_item) if (m_job_item)
disconnect(m_job_item, nullptr, this, nullptr); disconnect(m_job_item, nullptr, this, nullptr);
} }
int JobPropertiesTableModel::rowCount(const QModelIndex& parent) const int JobparQModel::rowCount(const QModelIndex& parent) const
{ {
if (!parent.isValid() && m_job_item) if (!parent.isValid() && m_job_item)
return NumRows; return NumRows;
return 0; return 0;
} }
int JobPropertiesTableModel::columnCount(const QModelIndex& parent) const int JobparQModel::columnCount(const QModelIndex& parent) const
{ {
if (!parent.isValid() && m_job_item) if (!parent.isValid() && m_job_item)
return NumColumns; return NumColumns;
return 0; return 0;
} }
QVariant JobPropertiesTableModel::data(const QModelIndex& index, int role) const QVariant JobparQModel::data(const QModelIndex& index, int role) const
{ {
if ((role != Qt::DisplayRole && role != Qt::EditRole && role != Qt::ToolTipRole) if ((role != Qt::DisplayRole && role != Qt::EditRole && role != Qt::ToolTipRole)
|| index.column() < 0 || index.column() >= NumColumns || index.row() < 0 || index.column() < 0 || index.column() >= NumColumns || index.row() < 0
...@@ -107,8 +107,7 @@ QVariant JobPropertiesTableModel::data(const QModelIndex& index, int role) const ...@@ -107,8 +107,7 @@ QVariant JobPropertiesTableModel::data(const QModelIndex& index, int role) const
} }
} }
QVariant JobPropertiesTableModel::headerData(int section, Qt::Orientation orientation, QVariant JobparQModel::headerData(int section, Qt::Orientation orientation, int role) const
int role) const
{ {
if (role == Qt::DisplayRole && orientation == Qt::Horizontal && section >= 0 if (role == Qt::DisplayRole && orientation == Qt::Horizontal && section >= 0
&& section < NumColumns) && section < NumColumns)
...@@ -116,7 +115,7 @@ QVariant JobPropertiesTableModel::headerData(int section, Qt::Orientation orient ...@@ -116,7 +115,7 @@ QVariant JobPropertiesTableModel::headerData(int section, Qt::Orientation orient
return {}; return {};
} }
Qt::ItemFlags JobPropertiesTableModel::flags(const QModelIndex& index) const Qt::ItemFlags JobparQModel::flags(const QModelIndex& index) const
{ {
Qt::ItemFlags f = QAbstractTableModel::flags(index); Qt::ItemFlags f = QAbstractTableModel::flags(index);
if (index.column() == Column::Value && index.row() == Row::Name && m_job_item) if (index.column() == Column::Value && index.row() == Row::Name && m_job_item)
...@@ -124,7 +123,7 @@ Qt::ItemFlags JobPropertiesTableModel::flags(const QModelIndex& index) const ...@@ -124,7 +123,7 @@ Qt::ItemFlags JobPropertiesTableModel::flags(const QModelIndex& index) const
return f; return f;
} }
bool JobPropertiesTableModel::setData(const QModelIndex& index, const QVariant& value, int role) bool JobparQModel::setData(const QModelIndex& index, const QVariant& value, int role)
{ {
if (role != Qt::EditRole || index.column() != Column::Value || index.row() != Row::Name if (role != Qt::EditRole || index.column() != Column::Value || index.row() != Row::Name
|| !m_job_item) || !m_job_item)
...@@ -133,7 +132,7 @@ bool JobPropertiesTableModel::setData(const QModelIndex& index, const QVariant& ...@@ -133,7 +132,7 @@ bool JobPropertiesTableModel::setData(const QModelIndex& index, const QVariant&
return true; return true;
} }
void JobPropertiesTableModel::setJobItem(JobItem* jobItem) void JobparQModel::setJobItem(JobItem* jobItem)
{ {
beginResetModel(); beginResetModel();
if (m_job_item) if (m_job_item)
...@@ -144,7 +143,7 @@ void JobPropertiesTableModel::setJobItem(JobItem* jobItem) ...@@ -144,7 +143,7 @@ void JobPropertiesTableModel::setJobItem(JobItem* jobItem)
endResetModel(); endResetModel();
} }
void JobPropertiesTableModel::notifyJobPropertyChange() void JobparQModel::notifyJobPropertyChange()
{ {
// name // name
connect(m_job_item->batchInfo(), &BatchInfo::jobNameChanged, [this](const QString&) { connect(m_job_item->batchInfo(), &BatchInfo::jobNameChanged, [this](const QString&) {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// //
// BornAgain: simulate and fit reflection and scattering // BornAgain: simulate and fit reflection and scattering
// //
//! @file GUI/View/JobControl/JobPropertiesTableModel.h //! @file GUI/View/JobControl/JobparQModel.h
//! @brief Defines class JobPropertiesWidget. //! @brief Defines class JobPropertiesWidget.
//! //!
//! @homepage http://www.bornagainproject.org //! @homepage http://www.bornagainproject.org
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
// //
// ************************************************************************************************ // ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBPROPERTIESTABLEMODEL_H #ifndef BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBPARQMODEL_H
#define BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBPROPERTIESTABLEMODEL_H #define BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBPARQMODEL_H
#include <QAbstractTableModel> #include <QAbstractTableModel>
...@@ -22,11 +22,11 @@ class JobItem; ...@@ -22,11 +22,11 @@ class JobItem;
//! A table model for the properties of a job except for the comment. //! A table model for the properties of a job except for the comment.
//! The name of the job is editable, all other fields are read only. //! The name of the job is editable, all other fields are read only.
class JobPropertiesTableModel : public QAbstractTableModel { class JobparQModel : public QAbstractTableModel {
Q_OBJECT Q_OBJECT
public: public:
explicit JobPropertiesTableModel(QObject* parent = nullptr); explicit JobparQModel(QObject* parent = nullptr);
~JobPropertiesTableModel() override; ~JobparQModel() override;
int rowCount(const QModelIndex& parent = QModelIndex()) const override; int rowCount(const QModelIndex& parent = QModelIndex()) const override;
int columnCount(const QModelIndex& parent = QModelIndex()) const override; int columnCount(const QModelIndex& parent = QModelIndex()) const override;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
...@@ -42,4 +42,4 @@ private: ...@@ -42,4 +42,4 @@ private:
JobItem* m_job_item; JobItem* m_job_item;
}; };
#endif // BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBPROPERTIESTABLEMODEL_H #endif // BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBPARQMODEL_H
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