From 335a4fd11027d61099384abbc1d46dc90ce2dd49 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 21 Feb 2024 18:04:31 +0100
Subject: [PATCH] set name in item c'tors
---
GUI/Model/Device/InstrumentItems.cpp | 9 +++++++--
GUI/View/List/InstrumentsQModel.cpp | 4 ----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index 348160516b9..accf3dbfcd3 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -365,9 +365,10 @@ void ScanningFunctionality::readScanFrom(QXmlStreamReader* r)
// ************************************************************************************************
Scatter2DInstrumentItem::Scatter2DInstrumentItem()
+ : m_beam_item(std::make_unique<BeamItem>())
+ , m_detector_item(std::make_unique<DetectorItem>())
{
- m_detector_item = std::make_unique<DetectorItem>();
- m_beam_item = std::make_unique<BeamItem>();
+ setInstrumentName("GISAS");
}
std::vector<int> Scatter2DInstrumentItem::axdims() const
@@ -477,6 +478,7 @@ OffspecInstrumentItem::OffspecInstrumentItem()
: ScanningFunctionality(1e8)
, m_detector(new OffspecDetectorItem)
{
+ setInstrumentName("Offspec");
}
std::vector<int> OffspecInstrumentItem::axdims() const
@@ -578,6 +580,7 @@ void OffspecInstrumentItem::readFrom(QXmlStreamReader* r)
SpecularInstrumentItem::SpecularInstrumentItem()
: ScanningFunctionality(1e6)
{
+ setInstrumentName("Specular");
}
std::vector<int> SpecularInstrumentItem::axdims() const
@@ -701,6 +704,8 @@ void SpecularInstrumentItem::readFrom(QXmlStreamReader* r)
DepthprobeInstrumentItem::DepthprobeInstrumentItem()
: ScanningFunctionality(1e8)
{
+ setInstrumentName("Depthprobe");
+
auto* axisItem = scanItem()->inclinationAxisItem();
axisItem->setMin(0.0);
axisItem->setMax(1.0);
diff --git a/GUI/View/List/InstrumentsQModel.cpp b/GUI/View/List/InstrumentsQModel.cpp
index df41e97aa7c..1479106bc14 100644
--- a/GUI/View/List/InstrumentsQModel.cpp
+++ b/GUI/View/List/InstrumentsQModel.cpp
@@ -50,28 +50,24 @@ QVariant InstrumentsQModel::data(const QModelIndex& index, int role) const
QModelIndex InstrumentsQModel::addNewScatter2DInstrument()
{
auto* t = new Scatter2DInstrumentItem;
- t->setInstrumentName("GISAS");
return pushInstrument(t);
}
QModelIndex InstrumentsQModel::addNewOffspecInstrument()
{
auto* t = new OffspecInstrumentItem;
- t->setInstrumentName("Offspec");
return pushInstrument(t);
}
QModelIndex InstrumentsQModel::addNewSpecularInstrument()
{
auto* t = new SpecularInstrumentItem;
- t->setInstrumentName("Specular");
return pushInstrument(t);
}
QModelIndex InstrumentsQModel::addNewDepthprobeInstrument()
{
auto* t = new DepthprobeInstrumentItem;
- t->setInstrumentName("Depthprobe");
return pushInstrument(t);
}
--
GitLab