From 49da7e5ca111046776eac9092f7be517a9a539da Mon Sep 17 00:00:00 2001
From: Tobias Knopff <t.knopff@fz-juelich.de>
Date: Wed, 2 Jun 2021 15:27:25 +0200
Subject: [PATCH] Make JobItem::T_PARAMETER_TREE private
---
GUI/Models/JobItem.cpp | 8 +++++++-
GUI/Models/JobItem.h | 5 +++--
GUI/Models/JobModel.cpp | 2 +-
GUI/Models/ParameterTreeUtils.cpp | 3 +--
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/GUI/Models/JobItem.cpp b/GUI/Models/JobItem.cpp
index 662e98d1170..4c1310f9fc0 100644
--- a/GUI/Models/JobItem.cpp
+++ b/GUI/Models/JobItem.cpp
@@ -268,7 +268,7 @@ ParameterContainerItem* JobItem::parameterContainerItem()
const ParameterContainerItem* JobItem::parameterContainerItem() const
{
- return dynamic_cast<ParameterContainerItem*>(getItem(JobItem::T_PARAMETER_TREE));
+ return dynamic_cast<ParameterContainerItem*>(getItem(T_PARAMETER_TREE));
}
FitParameterContainerItem* JobItem::fitParameterContainerItem()
@@ -279,6 +279,12 @@ FitParameterContainerItem* JobItem::fitParameterContainerItem()
return nullptr;
}
+ParameterContainerItem* JobItem::createParameterContainerItem()
+{
+ return model()->insertItem<ParameterContainerItem>
+ (this, -1, T_PARAMETER_TREE);
+}
+
RealDataItem* JobItem::realDataItem()
{
return dynamic_cast<RealDataItem*>(getItem(JobItem::T_REALDATA));
diff --git a/GUI/Models/JobItem.h b/GUI/Models/JobItem.h
index dafa6078b44..bef0834c4d3 100644
--- a/GUI/Models/JobItem.h
+++ b/GUI/Models/JobItem.h
@@ -51,9 +51,9 @@ private:
static const QString T_OUTPUT;
static const QString T_REALDATA;
static const QString T_DATAVIEW;
+ static const QString T_PARAMETER_TREE;
public:
- static const QString T_PARAMETER_TREE;
static const QString T_SIMULATION_OPTIONS;
static const QString T_FIT_SUITE;
@@ -107,8 +107,9 @@ public:
FitSuiteItem* fitSuiteItem();
ParameterContainerItem* parameterContainerItem();
const ParameterContainerItem* parameterContainerItem() const;
-
FitParameterContainerItem* fitParameterContainerItem();
+ ParameterContainerItem* createParameterContainerItem();
+
RealDataItem* realDataItem();
RealDataItem* copyRealDataIntoJob(const RealDataItem* real_data);
void addRealDataItem(RealDataItem* real_data);
diff --git a/GUI/Models/JobModel.cpp b/GUI/Models/JobModel.cpp
index 3045593b2bf..d9a71e54af8 100644
--- a/GUI/Models/JobModel.cpp
+++ b/GUI/Models/JobModel.cpp
@@ -111,7 +111,7 @@ QVector<JobItem*> JobModel::jobItems() const
//! restore instrument and sample model from backup for given JobItem
void JobModel::restore(JobItem* jobItem)
{
- restoreItem(jobItem->getItem(JobItem::T_PARAMETER_TREE));
+ restoreItem(jobItem->parameterContainerItem());
}
bool JobModel::hasUnfinishedJobs()
diff --git a/GUI/Models/ParameterTreeUtils.cpp b/GUI/Models/ParameterTreeUtils.cpp
index f07106cc620..415ecb5c09c 100644
--- a/GUI/Models/ParameterTreeUtils.cpp
+++ b/GUI/Models/ParameterTreeUtils.cpp
@@ -88,8 +88,7 @@ void populateParameterContainer(SessionItem* container, const SessionItem* sourc
void ParameterTreeUtils::createParameterTree(JobItem* jobItem)
{
- auto container = jobItem->model()->insertItem<ParameterContainerItem>(
- jobItem, -1, JobItem::T_PARAMETER_TREE);
+ auto container = jobItem->createParameterContainerItem();
populateParameterContainer(container, jobItem->materialContainerItem());
--
GitLab