From 39c8f353a1eb09cc902e792e3fdb61bfa66871bd Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Tue, 23 Jan 2024 22:22:32 +0100
Subject: [PATCH] replace 'm_job_model' by 'm_jobs_set'
---
GUI/Model/Project/ProjectDocument.cpp | 13 ++++++-------
GUI/Model/Project/ProjectDocument.h | 2 +-
GUI/Model/Tune/JobQueueData.cpp | 10 +++++-----
GUI/Model/Tune/JobQueueData.h | 2 +-
GUI/View/JobControl/JobSelector.cpp | 4 ++--
GUI/View/JobControl/JobSelector.h | 2 +-
GUI/View/Tuning/JobRealTimeWidget.cpp | 4 ++--
GUI/View/Tuning/JobRealTimeWidget.h | 2 +-
GUI/View/Tuning/ParameterTuningWidget.cpp | 16 ++++++++--------
GUI/View/Tuning/ParameterTuningWidget.h | 2 +-
10 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 50cb9a7444c..51a91e7470d 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -64,7 +64,7 @@ ProjectDocument::ProjectDocument()
std::make_unique<MultiInstrumentNotifier>(m_instrument_model.get()))
, m_sample_model(std::make_unique<SamplesSet>())
, m_real_model(std::make_unique<DatafilesSet>())
- , m_job_model(std::make_unique<JobsSet>())
+ , m_jobs_set(std::make_unique<JobsSet>())
, m_last_view_active(GUI::ID::ViewId::Instrument)
{
connect(m_instrument_edit_controller.get(), &MultiInstrumentNotifier::instrumentAddedOrRemoved,
@@ -135,7 +135,7 @@ DatafilesSet* ProjectDocument::realModel()
JobsSet* ProjectDocument::jobsSet()
{
- return m_job_model.get();
+ return m_jobs_set.get();
}
SimulationOptionsItem* ProjectDocument::simulationOptionsItem()
@@ -163,7 +163,7 @@ void ProjectDocument::saveProjectFileWithData(const QString& projectPullPath)
writeProject(&file);
file.close();
- m_job_model->writeDatafiles(GUI::Util::Project::projectDir(projectPullPath));
+ m_jobs_set->writeDatafiles(GUI::Util::Project::projectDir(projectPullPath));
m_real_model->writeDatafiles(GUI::Util::Project::projectDir(projectPullPath));
const bool autoSave = GUI::Util::Project::isAutosave(projectPullPath);
@@ -192,8 +192,7 @@ ProjectDocument::ReadResult ProjectDocument::loadProjectFileWithData(const QStri
if (result == ReadResult::error)
return result;
- m_job_model->readDatafiles(GUI::Util::Project::projectDir(projectPullPath),
- &messageService);
+ m_jobs_set->readDatafiles(GUI::Util::Project::projectDir(projectPullPath), &messageService);
m_real_model->readDatafiles(GUI::Util::Project::projectDir(projectPullPath),
&messageService);
@@ -272,7 +271,7 @@ void ProjectDocument::writeProject(QIODevice* device)
// job model
w.writeStartElement(Tag::JobsSet);
- m_job_model->writeTo(&w);
+ m_jobs_set->writeTo(&w);
w.writeEndElement();
// active view
@@ -335,7 +334,7 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
// job model
} else if (tag == Tag::JobsSet) {
- m_job_model->readFrom(&r);
+ m_jobs_set->readFrom(&r);
XML::gotoEndElementOfTag(&r, tag);
// active view
diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h
index c3751a32d35..87852c39d48 100644
--- a/GUI/Model/Project/ProjectDocument.h
+++ b/GUI/Model/Project/ProjectDocument.h
@@ -109,7 +109,7 @@ private:
std::unique_ptr<MultiInstrumentNotifier> m_instrument_edit_controller;
std::unique_ptr<SamplesSet> m_sample_model;
std::unique_ptr<DatafilesSet> m_real_model;
- std::unique_ptr<JobsSet> m_job_model;
+ std::unique_ptr<JobsSet> m_jobs_set;
int m_last_view_active;
};
diff --git a/GUI/Model/Tune/JobQueueData.cpp b/GUI/Model/Tune/JobQueueData.cpp
index d562a63d300..ddafd86241b 100644
--- a/GUI/Model/Tune/JobQueueData.cpp
+++ b/GUI/Model/Tune/JobQueueData.cpp
@@ -23,7 +23,7 @@
#include "Sim/Simulation/ISimulation.h"
JobQueueData::JobQueueData(JobsSet* jobs_set)
- : m_job_model(jobs_set)
+ : m_jobs_set(jobs_set)
{
}
@@ -106,7 +106,7 @@ void JobQueueData::onStartedJob()
{
auto* worker = qobject_cast<JobWorker*>(sender());
- auto* job_item = m_job_model->jobItemForIdentifier(worker->identifier());
+ auto* job_item = m_jobs_set->jobItemForIdentifier(worker->identifier());
job_item->batchInfo()->setProgress(0);
job_item->batchInfo()->setStatus(JobStatus::Running);
job_item->batchInfo()->setBeginTime(worker->simulationStart());
@@ -119,7 +119,7 @@ void JobQueueData::onFinishedJob()
{
auto* worker = qobject_cast<JobWorker*>(sender());
- auto* job_item = m_job_model->jobItemForIdentifier(worker->identifier());
+ auto* job_item = m_jobs_set->jobItemForIdentifier(worker->identifier());
processFinishedJob(worker, job_item);
// I tell to the thread to exit here (instead of connecting JobRunner::finished
@@ -144,7 +144,7 @@ void JobQueueData::onFinishedThread()
void JobQueueData::onProgressUpdate()
{
auto* worker = qobject_cast<JobWorker*>(sender());
- auto* job_item = m_job_model->jobItemForIdentifier(worker->identifier());
+ auto* job_item = m_jobs_set->jobItemForIdentifier(worker->identifier());
job_item->batchInfo()->setProgress(worker->progress());
updateGlobalProgress();
}
@@ -156,7 +156,7 @@ void JobQueueData::updateGlobalProgress()
{
int global_progress(0);
int nRunningJobs(0);
- for (auto* job_item : m_job_model->jobItems())
+ for (auto* job_item : m_jobs_set->jobItems())
if (isRunning(job_item->batchInfo()->status())) {
global_progress += job_item->batchInfo()->progress();
nRunningJobs++;
diff --git a/GUI/Model/Tune/JobQueueData.h b/GUI/Model/Tune/JobQueueData.h
index 9828ee7426f..9f2b4fa35a3 100644
--- a/GUI/Model/Tune/JobQueueData.h
+++ b/GUI/Model/Tune/JobQueueData.h
@@ -65,7 +65,7 @@ private:
QMap<QString, JobWorker*> m_workers; //! job identifier to jobWorker
QMap<QString, ISimulation*> m_simulations; //! job identifier to simulation
- JobsSet* m_job_model;
+ JobsSet* m_jobs_set;
};
#endif // BORNAGAIN_GUI_MODEL_TUNE_JOBQUEUEDATA_H
diff --git a/GUI/View/JobControl/JobSelector.cpp b/GUI/View/JobControl/JobSelector.cpp
index e27d0e958b2..8c8c10ed848 100644
--- a/GUI/View/JobControl/JobSelector.cpp
+++ b/GUI/View/JobControl/JobSelector.cpp
@@ -43,7 +43,7 @@ JobSelector::JobSelector(JobsSet* jobs_set, QWidget* parent)
: QWidget(parent)
, m_splitter(new QSplitter(Qt::Vertical, this))
, m_job_properties(new JobPropertiesWidget(this))
- , m_job_model(jobs_set)
+ , m_jobs_set(jobs_set)
{
setWindowTitle(GUI::Style::JobSelectorName);
setObjectName("JobSelector");
@@ -56,7 +56,7 @@ JobSelector::JobSelector(JobsSet* jobs_set, QWidget* parent)
m_splitter->setChildrenCollapsible(true);
layout->addWidget(m_splitter);
- m_listing = new JobListing(m_job_model, m_splitter);
+ m_listing = new JobListing(m_jobs_set, m_splitter);
m_splitter->addWidget(m_listing);
m_splitter->setCollapsible(0, false);
m_splitter->setStretchFactor(0, 1);
diff --git a/GUI/View/JobControl/JobSelector.h b/GUI/View/JobControl/JobSelector.h
index f28212f1f36..fa8a2fed30d 100644
--- a/GUI/View/JobControl/JobSelector.h
+++ b/GUI/View/JobControl/JobSelector.h
@@ -51,7 +51,7 @@ private:
QSplitter* m_splitter;
JobListing* m_listing;
JobPropertiesWidget* m_job_properties;
- JobsSet* m_job_model;
+ JobsSet* m_jobs_set;
};
#endif // BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBSELECTOR_H
diff --git a/GUI/View/Tuning/JobRealTimeWidget.cpp b/GUI/View/Tuning/JobRealTimeWidget.cpp
index f67668ff2a6..81d42506612 100644
--- a/GUI/View/Tuning/JobRealTimeWidget.cpp
+++ b/GUI/View/Tuning/JobRealTimeWidget.cpp
@@ -26,7 +26,7 @@
JobRealTimeWidget::JobRealTimeWidget(JobsSet* jobs_set, QWidget* parent)
: QWidget(parent)
, m_stacked_widget(new ParameterTuningStackPresenter())
- , m_job_model(jobs_set)
+ , m_jobs_set(jobs_set)
{
setWindowTitle(GUI::Style::JobRealTimeWidgetName);
setObjectName("JobRealTimeWidget");
@@ -60,7 +60,7 @@ void JobRealTimeWidget::setJobItem(JobItem* jobItem)
m_stacked_widget->hide();
return;
}
- m_stacked_widget->setItem(jobItem, m_job_model);
+ m_stacked_widget->setItem(jobItem, m_jobs_set);
}
//! Returns true if JobItem is valid for real time simulation.
diff --git a/GUI/View/Tuning/JobRealTimeWidget.h b/GUI/View/Tuning/JobRealTimeWidget.h
index c49263c5ec1..04b3a7fb7a8 100644
--- a/GUI/View/Tuning/JobRealTimeWidget.h
+++ b/GUI/View/Tuning/JobRealTimeWidget.h
@@ -43,7 +43,7 @@ private:
void applySettings();
ParameterTuningStackPresenter* m_stacked_widget;
- JobsSet* m_job_model;
+ JobsSet* m_jobs_set;
};
#endif // BORNAGAIN_GUI_VIEW_TUNING_JOBREALTIMEWIDGET_H
diff --git a/GUI/View/Tuning/ParameterTuningWidget.cpp b/GUI/View/Tuning/ParameterTuningWidget.cpp
index be2947e038a..8ec680ead6f 100644
--- a/GUI/View/Tuning/ParameterTuningWidget.cpp
+++ b/GUI/View/Tuning/ParameterTuningWidget.cpp
@@ -52,7 +52,7 @@ int currentColumnWidth = GUI::Style::PARAMETER_TUNING_WIDGET_COLUMN_WIDTH;
} // namespace
ParameterTuningWidget::ParameterTuningWidget()
- : m_job_model(nullptr)
+ : m_jobs_set(nullptr)
, m_parameter_tuning_model(nullptr)
, m_backup_widget(new ParameterBackupWidget)
, m_slider_settings_widget(new SliderEditor)
@@ -133,8 +133,8 @@ void ParameterTuningWidget::setJobItem(JobItem* job_item)
void ParameterTuningWidget::setModel(QObject* jobs_set)
{
- m_job_model = dynamic_cast<JobsSet*>(jobs_set);
- ASSERT(m_job_model);
+ m_jobs_set = dynamic_cast<JobsSet*>(jobs_set);
+ ASSERT(m_jobs_set);
}
QItemSelectionModel* ParameterTuningWidget::selectionModel()
@@ -163,7 +163,7 @@ void ParameterTuningWidget::onCurrentLinkChanged(ParameterItem* item)
return;
if (item)
- m_job_model->runJob(m_job_item);
+ m_jobs_set->runJob(m_job_item);
}
void ParameterTuningWidget::onSliderRangeChanged(int value)
@@ -181,7 +181,7 @@ void ParameterTuningWidget::onLockZValueChanged(bool value)
void ParameterTuningWidget::updateParameterModel()
{
- ASSERT(m_job_model);
+ ASSERT(m_jobs_set);
if (!m_job_item)
return;
@@ -215,7 +215,7 @@ void ParameterTuningWidget::onCustomContextMenuRequested(const QPoint& point)
void ParameterTuningWidget::restoreModelsOfCurrentJobItem(int index)
{
- ASSERT(m_job_model);
+ ASSERT(m_jobs_set);
ASSERT(m_job_item);
if (isRunning(m_job_item->batchInfo()->status()))
@@ -223,8 +223,8 @@ void ParameterTuningWidget::restoreModelsOfCurrentJobItem(int index)
closeActiveEditors();
- m_job_model->restore(m_job_item, index);
- m_job_model->runJob(m_job_item);
+ m_jobs_set->restore(m_job_item, index);
+ m_jobs_set->runJob(m_job_item);
updateView();
gDoc->setModified();
}
diff --git a/GUI/View/Tuning/ParameterTuningWidget.h b/GUI/View/Tuning/ParameterTuningWidget.h
index 0c8b9851a7f..f372b2e1e14 100644
--- a/GUI/View/Tuning/ParameterTuningWidget.h
+++ b/GUI/View/Tuning/ParameterTuningWidget.h
@@ -68,7 +68,7 @@ private:
void applySettings();
JobItem* m_job_item;
- JobsSet* m_job_model;
+ JobsSet* m_jobs_set;
PartunerQModel* m_parameter_tuning_model;
ParameterBackupWidget* m_backup_widget;
SliderEditor* m_slider_settings_widget;
--
GitLab