From d0af3296a88b1976eb853dcb0a847c10e4e35012 Mon Sep 17 00:00:00 2001
From: Tobias Knopff <t.knopff@fz-juelich.de>
Date: Wed, 2 Jun 2021 15:42:54 +0200
Subject: [PATCH] Make JobItem::T_SIMULATION_OPTIONS private
---
GUI/Models/JobItem.cpp | 6 ++++++
GUI/Models/JobItem.h | 4 +++-
GUI/Models/JobModel.cpp | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/GUI/Models/JobItem.cpp b/GUI/Models/JobItem.cpp
index 4c1310f9fc0..37b0563f580 100644
--- a/GUI/Models/JobItem.cpp
+++ b/GUI/Models/JobItem.cpp
@@ -377,3 +377,9 @@ const SimulationOptionsItem* JobItem::simulationOptionsItem() const
{
return item<const SimulationOptionsItem>(T_SIMULATION_OPTIONS);
}
+
+SimulationOptionsItem* JobItem::copySimulationOptionsIntoJob
+(const SimulationOptionsItem* options)
+{
+ return model()->copyItem(options, this, T_SIMULATION_OPTIONS);
+}
diff --git a/GUI/Models/JobItem.h b/GUI/Models/JobItem.h
index bef0834c4d3..a073ba46ded 100644
--- a/GUI/Models/JobItem.h
+++ b/GUI/Models/JobItem.h
@@ -52,9 +52,9 @@ private:
static const QString T_REALDATA;
static const QString T_DATAVIEW;
static const QString T_PARAMETER_TREE;
+ static const QString T_SIMULATION_OPTIONS;
public:
- static const QString T_SIMULATION_OPTIONS;
static const QString T_FIT_SUITE;
JobItem();
@@ -101,6 +101,8 @@ public:
InstrumentItem* copyInstrumentIntoJob(const InstrumentItem* instrument);
SimulationOptionsItem* simulationOptionsItem();
+ SimulationOptionsItem* copySimulationOptionsIntoJob
+ (const SimulationOptionsItem* options);
void setResults(const ISimulation* simulation);
diff --git a/GUI/Models/JobModel.cpp b/GUI/Models/JobModel.cpp
index d9a71e54af8..747973bb053 100644
--- a/GUI/Models/JobModel.cpp
+++ b/GUI/Models/JobModel.cpp
@@ -89,7 +89,7 @@ JobItem* JobModel::addJob(const MultiLayerItem* multiLayerItem,
// TODO: remove when specular instrument is ready for magnetization
if (instrumentItem->is<SpecularInstrumentItem>())
JobModelFunctions::muteMagnetizationData(jobItem);
- copyItem(optionItem, jobItem, JobItem::T_SIMULATION_OPTIONS);
+ jobItem->copySimulationOptionsIntoJob(optionItem);
jobItem->setSampleName(multiLayerItem->itemName());
--
GitLab