From 3a83db0f80838fe8caec1863a5110b9ca1339855 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 23 Jan 2024 18:45:29 +0100
Subject: [PATCH] rename class and sources
GUI/View/JobControl/JobPropertiesTableModel ->
GUI/View/JobControl/JobparQModel
---
GUI/View/JobControl/JobPropertiesWidget.cpp | 4 +--
GUI/View/JobControl/JobPropertiesWidget.h | 4 +--
...pertiesTableModel.cpp => JobparQModel.cpp} | 27 +++++++++----------
...bPropertiesTableModel.h => JobparQModel.h} | 14 +++++-----
4 files changed, 24 insertions(+), 25 deletions(-)
rename GUI/View/JobControl/{JobPropertiesTableModel.cpp => JobparQModel.cpp} (84%)
rename GUI/View/JobControl/{JobPropertiesTableModel.h => JobparQModel.h} (77%)
diff --git a/GUI/View/JobControl/JobPropertiesWidget.cpp b/GUI/View/JobControl/JobPropertiesWidget.cpp
index 144f819b928..789d023ecce 100644
--- a/GUI/View/JobControl/JobPropertiesWidget.cpp
+++ b/GUI/View/JobControl/JobPropertiesWidget.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Job/BatchInfo.h"
#include "GUI/Model/Job/JobItem.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 <QHeaderView>
#include <QVBoxLayout>
@@ -38,7 +38,7 @@ JobPropertiesWidget::JobPropertiesWidget(QWidget* parent, Qt::WindowFlags f)
: QWidget(parent, f)
, m_tab_widget(new QTabWidget(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_job_item(nullptr)
{
diff --git a/GUI/View/JobControl/JobPropertiesWidget.h b/GUI/View/JobControl/JobPropertiesWidget.h
index 25e8281651d..2a46fe23d60 100644
--- a/GUI/View/JobControl/JobPropertiesWidget.h
+++ b/GUI/View/JobControl/JobPropertiesWidget.h
@@ -22,7 +22,7 @@
#include <QWidget>
class JobItem;
-class JobPropertiesTableModel;
+class JobparQModel;
//! The JobPropertiesWidget class holds component editor for JobItem. Part of JobSelector,
//! resides at lower left corner of JobView.
@@ -45,7 +45,7 @@ private slots:
private:
QTabWidget* m_tab_widget;
QTreeView* m_properties_view;
- JobPropertiesTableModel* m_properties_model;
+ JobparQModel* m_properties_model;
QTextEdit* m_comments_editor;
JobItem* m_job_item;
};
diff --git a/GUI/View/JobControl/JobPropertiesTableModel.cpp b/GUI/View/JobControl/JobparQModel.cpp
similarity index 84%
rename from GUI/View/JobControl/JobPropertiesTableModel.cpp
rename to GUI/View/JobControl/JobparQModel.cpp
index 9e2a829a910..6389e57e76f 100644
--- a/GUI/View/JobControl/JobPropertiesTableModel.cpp
+++ b/GUI/View/JobControl/JobparQModel.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/JobControl/JobPropertiesTableModel.cpp
-//! @brief Implements class JobPropertiesTableModel.
+//! @file GUI/View/JobControl/JobparQModel.cpp
+//! @brief Implements class JobparQModel.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -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/Job/BatchInfo.h"
#include "GUI/Model/Job/JobItem.h"
@@ -37,33 +37,33 @@ const QString ModelDateShortFormat = "yyyy.MM.dd hh:mm:ss";
} // namespace
-JobPropertiesTableModel::JobPropertiesTableModel(QObject* parent)
+JobparQModel::JobparQModel(QObject* parent)
: QAbstractTableModel(parent)
, m_job_item(nullptr)
{
}
-JobPropertiesTableModel::~JobPropertiesTableModel()
+JobparQModel::~JobparQModel()
{
if (m_job_item)
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)
return NumRows;
return 0;
}
-int JobPropertiesTableModel::columnCount(const QModelIndex& parent) const
+int JobparQModel::columnCount(const QModelIndex& parent) const
{
if (!parent.isValid() && m_job_item)
return NumColumns;
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)
|| index.column() < 0 || index.column() >= NumColumns || index.row() < 0
@@ -107,8 +107,7 @@ QVariant JobPropertiesTableModel::data(const QModelIndex& index, int role) const
}
}
-QVariant JobPropertiesTableModel::headerData(int section, Qt::Orientation orientation,
- int role) const
+QVariant JobparQModel::headerData(int section, Qt::Orientation orientation, int role) const
{
if (role == Qt::DisplayRole && orientation == Qt::Horizontal && section >= 0
&& section < NumColumns)
@@ -116,7 +115,7 @@ QVariant JobPropertiesTableModel::headerData(int section, Qt::Orientation orient
return {};
}
-Qt::ItemFlags JobPropertiesTableModel::flags(const QModelIndex& index) const
+Qt::ItemFlags JobparQModel::flags(const QModelIndex& index) const
{
Qt::ItemFlags f = QAbstractTableModel::flags(index);
if (index.column() == Column::Value && index.row() == Row::Name && m_job_item)
@@ -124,7 +123,7 @@ Qt::ItemFlags JobPropertiesTableModel::flags(const QModelIndex& index) const
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
|| !m_job_item)
@@ -133,7 +132,7 @@ bool JobPropertiesTableModel::setData(const QModelIndex& index, const QVariant&
return true;
}
-void JobPropertiesTableModel::setJobItem(JobItem* jobItem)
+void JobparQModel::setJobItem(JobItem* jobItem)
{
beginResetModel();
if (m_job_item)
@@ -144,7 +143,7 @@ void JobPropertiesTableModel::setJobItem(JobItem* jobItem)
endResetModel();
}
-void JobPropertiesTableModel::notifyJobPropertyChange()
+void JobparQModel::notifyJobPropertyChange()
{
// name
connect(m_job_item->batchInfo(), &BatchInfo::jobNameChanged, [this](const QString&) {
diff --git a/GUI/View/JobControl/JobPropertiesTableModel.h b/GUI/View/JobControl/JobparQModel.h
similarity index 77%
rename from GUI/View/JobControl/JobPropertiesTableModel.h
rename to GUI/View/JobControl/JobparQModel.h
index 0e59a3c2239..f5432cd214d 100644
--- a/GUI/View/JobControl/JobPropertiesTableModel.h
+++ b/GUI/View/JobControl/JobparQModel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/JobControl/JobPropertiesTableModel.h
+//! @file GUI/View/JobControl/JobparQModel.h
//! @brief Defines class JobPropertiesWidget.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBPROPERTIESTABLEMODEL_H
-#define BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBPROPERTIESTABLEMODEL_H
+#ifndef BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBPARQMODEL_H
+#define BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBPARQMODEL_H
#include <QAbstractTableModel>
@@ -22,11 +22,11 @@ class JobItem;
//! 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.
-class JobPropertiesTableModel : public QAbstractTableModel {
+class JobparQModel : public QAbstractTableModel {
Q_OBJECT
public:
- explicit JobPropertiesTableModel(QObject* parent = nullptr);
- ~JobPropertiesTableModel() override;
+ explicit JobparQModel(QObject* parent = nullptr);
+ ~JobparQModel() override;
int rowCount(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;
@@ -42,4 +42,4 @@ private:
JobItem* m_job_item;
};
-#endif // BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBPROPERTIESTABLEMODEL_H
+#endif // BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBPARQMODEL_H
--
GitLab