diff --git a/GUI/Model/Tune/JobQueueData.cpp b/GUI/Model/Tune/JobQueueData.cpp
index f7b556d3046193e43e6819aaf23f3fd6e0b42e97..d562a63d30022613d7a008884c5d37246147c871 100644
--- a/GUI/Model/Tune/JobQueueData.cpp
+++ b/GUI/Model/Tune/JobQueueData.cpp
@@ -22,8 +22,8 @@
#include "GUI/Support/Data/JobWorker.h"
#include "Sim/Simulation/ISimulation.h"
-JobQueueData::JobQueueData(JobsSet* jobModel)
- : m_job_model(jobModel)
+JobQueueData::JobQueueData(JobsSet* jobs_set)
+ : m_job_model(jobs_set)
{
}
diff --git a/GUI/Model/Tune/JobQueueData.h b/GUI/Model/Tune/JobQueueData.h
index c5ab2aa48e8273dc3267635d88508d0487772474..9828ee7426f7e98f89d82b1fecc2579269fa442a 100644
--- a/GUI/Model/Tune/JobQueueData.h
+++ b/GUI/Model/Tune/JobQueueData.h
@@ -29,13 +29,13 @@ class JobsSet;
class JobQueueData : public QObject {
Q_OBJECT
public:
- JobQueueData(JobsSet* jobModel);
+ JobQueueData(JobsSet* jobs_set);
bool hasUnfinishedJobs();
signals:
void globalProgress(int);
- void jobSelected(JobItem* jobItem);
+ void jobSelected(JobItem* job_item);
public slots:
void onStartedJob();
@@ -45,7 +45,7 @@ public slots:
void onFinishedThread();
void onCancelAllJobs();
- void runJob(JobItem* jobItem);
+ void runJob(JobItem* job_item);
void cancelJob(const QString& identifier);
void removeJob(const QString& identifier);
@@ -53,7 +53,7 @@ private:
void assignForDeletion(QThread* thread);
void assignForDeletion(JobWorker* worker);
void clearSimulation(const QString& identifier);
- void processFinishedJob(JobWorker* worker, JobItem* jobItem);
+ void processFinishedJob(JobWorker* worker, JobItem* job_item);
void updateGlobalProgress();
diff --git a/GUI/View/JobControl/JobSelector.cpp b/GUI/View/JobControl/JobSelector.cpp
index 7eb0c69deda5a34521ee21e2bcc2b1597bf80760..e27d0e958b20f241e1bd503467d2b13f9134a076 100644
--- a/GUI/View/JobControl/JobSelector.cpp
+++ b/GUI/View/JobControl/JobSelector.cpp
@@ -39,11 +39,11 @@ QList<int> qVariantToList(const QVariant& var)
}
} // namespace
-JobSelector::JobSelector(JobsSet* jobModel, QWidget* parent)
+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(jobModel)
+ , m_job_model(jobs_set)
{
setWindowTitle(GUI::Style::JobSelectorName);
setObjectName("JobSelector");
diff --git a/GUI/View/JobControl/JobSelector.h b/GUI/View/JobControl/JobSelector.h
index d53dc34c5b5b34985f9050efecbda9f9eb4e132b..f28212f1f36b14dd6157815f6423724d1279977e 100644
--- a/GUI/View/JobControl/JobSelector.h
+++ b/GUI/View/JobControl/JobSelector.h
@@ -29,7 +29,7 @@ class JobsSet;
class JobSelector : public QWidget {
Q_OBJECT
public:
- explicit JobSelector(JobsSet* jobModel, QWidget* parent = nullptr);
+ explicit JobSelector(JobsSet* jobs_set, QWidget* parent = nullptr);
~JobSelector();
void resizeEvent(QResizeEvent* event) override;
diff --git a/GUI/View/Project/SimulationView.cpp b/GUI/View/Project/SimulationView.cpp
index 0d807711aff114b4873225e02006739db7f93ac2..55fe7b75e06a463470576662b3b9a9c625a323d8 100644
--- a/GUI/View/Project/SimulationView.cpp
+++ b/GUI/View/Project/SimulationView.cpp
@@ -286,10 +286,10 @@ void SimulationView::simulate()
"Cannot run the job with current settings\n\n" + msg);
return;
}
- JobsSet* jobModel = gDoc->jobsSet();
- JobItem* jobItem = jobModel->addJobItem(selectedSampleItem(), selectedInstrumentItem(),
+ JobsSet* jobs_set = gDoc->jobsSet();
+ JobItem* job_item = jobs_set->addJobItem(selectedSampleItem(), selectedInstrumentItem(),
selectedDatafileItem(), *optionsItem());
- jobModel->runJob(jobItem);
+ jobs_set->runJob(job_item);
gDoc->setModified();
}
diff --git a/GUI/View/Tuning/JobRealTimeWidget.cpp b/GUI/View/Tuning/JobRealTimeWidget.cpp
index b4562eb87a71ad82a4066819f2a51989a740719d..f67668ff2a6696328624107d7ae8f926ee8fcc3c 100644
--- a/GUI/View/Tuning/JobRealTimeWidget.cpp
+++ b/GUI/View/Tuning/JobRealTimeWidget.cpp
@@ -23,10 +23,10 @@
#include <QSettings>
#include <QVBoxLayout>
-JobRealTimeWidget::JobRealTimeWidget(JobsSet* jobModel, QWidget* parent)
+JobRealTimeWidget::JobRealTimeWidget(JobsSet* jobs_set, QWidget* parent)
: QWidget(parent)
, m_stacked_widget(new ParameterTuningStackPresenter())
- , m_job_model(jobModel)
+ , m_job_model(jobs_set)
{
setWindowTitle(GUI::Style::JobRealTimeWidgetName);
setObjectName("JobRealTimeWidget");
diff --git a/GUI/View/Tuning/JobRealTimeWidget.h b/GUI/View/Tuning/JobRealTimeWidget.h
index 3c956e00cd3458935a75dba5782c96f1f2d813e9..c49263c5ec10d661886f3dde315af50299fdb3e9 100644
--- a/GUI/View/Tuning/JobRealTimeWidget.h
+++ b/GUI/View/Tuning/JobRealTimeWidget.h
@@ -28,7 +28,7 @@ class ParameterTuningWidget;
class JobRealTimeWidget : public QWidget {
Q_OBJECT
public:
- JobRealTimeWidget(JobsSet* jobModel, QWidget* parent = nullptr);
+ JobRealTimeWidget(JobsSet* jobs_set, QWidget* parent = nullptr);
ParameterTuningWidget* parameterTuningWidget();
diff --git a/GUI/View/Tuning/ParameterTuningWidget.cpp b/GUI/View/Tuning/ParameterTuningWidget.cpp
index 8fed0fffacc94bddc9224462d7b9884c5656e4b3..be2947e038a34ddc6b6a5c5b78389d2220d42405 100644
--- a/GUI/View/Tuning/ParameterTuningWidget.cpp
+++ b/GUI/View/Tuning/ParameterTuningWidget.cpp
@@ -131,9 +131,9 @@ void ParameterTuningWidget::setJobItem(JobItem* job_item)
updateJobStatus();
}
-void ParameterTuningWidget::setModel(QObject* jobModel)
+void ParameterTuningWidget::setModel(QObject* jobs_set)
{
- m_job_model = dynamic_cast<JobsSet*>(jobModel);
+ m_job_model = dynamic_cast<JobsSet*>(jobs_set);
ASSERT(m_job_model);
}
diff --git a/GUI/View/Tuning/ParameterTuningWidget.h b/GUI/View/Tuning/ParameterTuningWidget.h
index d13e26ada781e1ad7f22fd14d933fc4fe33f96ec..0c8b9851a7f071937db1aa881f3ae803d737502a 100644
--- a/GUI/View/Tuning/ParameterTuningWidget.h
+++ b/GUI/View/Tuning/ParameterTuningWidget.h
@@ -38,7 +38,7 @@ public:
~ParameterTuningWidget();
void setJobItem(JobItem* job_item);
- void setModel(QObject* jobModel);
+ void setModel(QObject* jobs_set);
QItemSelectionModel* selectionModel();
QVector<ParameterItem*> selectedParameterItems();
diff --git a/Tests/Unit/GUI/TestJobModel.cpp b/Tests/Unit/GUI/TestJobModel.cpp
index 399ba2ee4aa16199b0405b197b9c36c5875c4d08..4460f1731b3dac3cc557d7ebd2e473a96825e3aa 100644
--- a/Tests/Unit/GUI/TestJobModel.cpp
+++ b/Tests/Unit/GUI/TestJobModel.cpp
@@ -18,26 +18,26 @@
TEST(TestJobsSet, nonXMLData)
{
- JobsSet jobModel;
+ JobsSet jobs_set;
// initial state
- EXPECT_EQ(jobModel.dataItems().size(), 0);
+ EXPECT_EQ(jobs_set.dataItems().size(), 0);
// adding JobItem
- auto* job_item = jobModel.createJobItem();
+ auto* job_item = jobs_set.createJobItem();
auto* instrumentItem = new GISASInstrumentItem();
job_item->copyInstrumentIntoJob(instrumentItem);
job_item->createSimulatedDataItem();
- EXPECT_EQ(jobModel.dataItems().size(), 1);
+ EXPECT_EQ(jobs_set.dataItems().size(), 1);
// adding empty DatafileItem to JobItem
DatafileItem dfi("dfi", UTest::GUI::makeData2D(0.0));
job_item->copyDatafileItemIntoJob(&dfi);
- EXPECT_EQ(jobModel.dataItems().size(), 2);
+ EXPECT_EQ(jobs_set.dataItems().size(), 2);
// checking data items of JobsSet
- EXPECT_EQ(jobModel.dataItems().indexOf(job_item->simulatedDataItem()), 0);
- EXPECT_EQ(jobModel.dataItems().indexOf(job_item->dfileItem()->dataItem()), 1);
+ EXPECT_EQ(jobs_set.dataItems().indexOf(job_item->simulatedDataItem()), 0);
+ EXPECT_EQ(jobs_set.dataItems().indexOf(job_item->dfileItem()->dataItem()), 1);
}
TEST(TestJobsSet, saveNonXMLData)
@@ -45,10 +45,10 @@ TEST(TestJobsSet, saveNonXMLData)
const QString projectDir("DatafieldIOService");
UTest::GUI::create_dir(projectDir);
- JobsSet jobModel;
+ JobsSet jobs_set;
// adding JobItem with instrument
- auto* job_item = jobModel.createJobItem();
+ auto* job_item = jobs_set.createJobItem();
auto* instrumentItem = new GISASInstrumentItem();
job_item->copyInstrumentIntoJob(instrumentItem);
@@ -65,7 +65,7 @@ TEST(TestJobsSet, saveNonXMLData)
job_item->updateFileName();
// save first time
- jobModel.writeDatafiles(projectDir);
+ jobs_set.writeDatafiles(projectDir);
QTest::qSleep(10);
// check existence of data on disk
@@ -84,7 +84,7 @@ TEST(TestJobsSet, saveNonXMLData)
// modify data and save the project.
job_item->simulatedDataItem()->setDatafield(UTest::GUI::makeData2D(103.));
- jobModel.writeDatafiles(projectDir);
+ jobs_set.writeDatafiles(projectDir);
QTest::qSleep(10);
// ensure that the simulated data has been changed
@@ -98,7 +98,7 @@ TEST(TestJobsSet, saveNonXMLData)
// rename job and check that file on disk changed the name
job_item->batchInfo()->setJobName("new_job");
job_item->updateFileName();
- jobModel.writeDatafiles(projectDir);
+ jobs_set.writeDatafiles(projectDir);
QTest::qSleep(10);
// check existence of new files on disk