From 832d58e3d914b419a425b6b1b18d344fb2822246 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Sat, 20 Jul 2024 12:02:56 +0200
Subject: [PATCH] use it ...
---
GUI/Model/FromCore/ItemizeSimulation.cpp | 5 +++--
GUI/Model/Sim/InstrumentItems.h | 5 -----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp
index 19f985363d5..e6ac3ad8e68 100644
--- a/GUI/Model/FromCore/ItemizeSimulation.cpp
+++ b/GUI/Model/FromCore/ItemizeSimulation.cpp
@@ -251,12 +251,13 @@ void updateDetector(Scatter2DInstrumentItem* instrument_item, const IDetector& d
void setBackground(InstrumentItem* instrument_item, const ISimulation& simulation)
{
const auto* bg = simulation.background();
+ PolyItem<BackgroundItemCatalog>& ib = instrument_item->backgroundSelection();
if (const auto* constant_bg = dynamic_cast<const ConstantBackground*>(bg)) {
- auto* constant_bg_item = instrument_item->setBackgroundItemType<ConstantBackgroundItem>();
+ auto* constant_bg_item = ib.createCertainItem<ConstantBackgroundItem>();
double value = constant_bg->backgroundValue();
constant_bg_item->setBackgroundValue(value);
} else if (dynamic_cast<const PoissonBackground*>(bg))
- instrument_item->setBackgroundItemType<PoissonBackgroundItem>();
+ ib.createCertainItem<PoissonBackgroundItem>();
}
Scatter2DInstrumentItem* createScatter2DInstrumentItem(const ScatteringSimulation& simulation)
diff --git a/GUI/Model/Sim/InstrumentItems.h b/GUI/Model/Sim/InstrumentItems.h
index 6da3f6b6434..5edc80f7b1e 100644
--- a/GUI/Model/Sim/InstrumentItems.h
+++ b/GUI/Model/Sim/InstrumentItems.h
@@ -66,11 +66,6 @@ public:
template <typename T> bool is() const { return dynamic_cast<const T*>(this) != nullptr; }
- template <typename T> T* setBackgroundItemType()
- {
- return backgroundSelection().createCertainItem<T>();
- }
-
PolyItem<BackgroundItemCatalog>& backgroundSelection() { return m_background; }
BackgroundItem* backgroundItem() const { return m_background.certainItem(); }
--
GitLab