From 9a2282a0b514ebf33f9c5999a1687446d6a4b037 Mon Sep 17 00:00:00 2001
From: Tobias Knopff <t.knopff@fz-juelich.de>
Date: Fri, 28 May 2021 16:52:45 +0200
Subject: [PATCH] Make DetectorItem::P_ANALYZER_DIRECTION private
---
GUI/Models/DetectorItems.cpp | 10 ++++++++++
GUI/Models/DetectorItems.h | 6 +++++-
GUI/Models/TransformFromDomain.cpp | 2 +-
.../InstrumentWidgets/PolarizationAnalysisEditor.cpp | 2 +-
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/GUI/Models/DetectorItems.cpp b/GUI/Models/DetectorItems.cpp
index fb29855af38..7d2cef6973a 100644
--- a/GUI/Models/DetectorItems.cpp
+++ b/GUI/Models/DetectorItems.cpp
@@ -103,6 +103,16 @@ SessionItem* DetectorItem::resolutionFunctionItem() const
return getItem(P_RESOLUTION_FUNCTION);
}
+void DetectorItem::setAnalyserDirection(const kvector_t& direction)
+{
+ item<VectorItem>(P_ANALYZER_DIRECTION)->setVector(direction);
+}
+
+SessionItem* DetectorItem::analyserDirectionItem() const
+{
+ return getItem(P_ANALYZER_DIRECTION);
+}
+
void DetectorItem::register_resolution_function()
{
auto item = addGroupProperty(P_RESOLUTION_FUNCTION, "Resolution function group");
diff --git a/GUI/Models/DetectorItems.h b/GUI/Models/DetectorItems.h
index 7f3f858d841..6c469b81973 100644
--- a/GUI/Models/DetectorItems.h
+++ b/GUI/Models/DetectorItems.h
@@ -16,6 +16,7 @@
#define BORNAGAIN_GUI_MODELS_DETECTORITEMS_H
#include "GUI/Models/SessionItem.h"
+#include "Base/Vector/Vectors3D.h"
class MaskContainerItem;
class IDetector2D;
@@ -26,9 +27,9 @@ class BA_CORE_API_ DetectorItem : public SessionItem {
private:
static const QString T_MASKS;
static const QString P_RESOLUTION_FUNCTION;
+ static const QString P_ANALYZER_DIRECTION;
public:
- static const QString P_ANALYZER_DIRECTION;
static const QString P_ANALYZER_EFFICIENCY;
static const QString P_ANALYZER_TOTAL_TRANSMISSION;
explicit DetectorItem(const QString& modelType);
@@ -60,6 +61,9 @@ public:
SessionItem* setResolutionFunctionType(const QString& model_type);
SessionItem* resolutionFunctionItem() const;
+ void setAnalyserDirection(const kvector_t& directorion);
+ SessionItem* analyserDirectionItem() const;
+
protected:
void register_resolution_function();
void update_resolution_function_tooltips();
diff --git a/GUI/Models/TransformFromDomain.cpp b/GUI/Models/TransformFromDomain.cpp
index da51896711a..af9b29ef6a4 100644
--- a/GUI/Models/TransformFromDomain.cpp
+++ b/GUI/Models/TransformFromDomain.cpp
@@ -350,7 +350,7 @@ void TransformFromDomain::setDetectorProperties(DetectorItem* detector_item,
kvector_t analyzer_dir = detector.detectionProperties().analyzerDirection();
double efficiency = detector.detectionProperties().analyzerEfficiency();
- detector_item->item<VectorItem>(DetectorItem::P_ANALYZER_DIRECTION)->setVector(analyzer_dir);
+ detector_item->setAnalyserDirection(analyzer_dir);
detector_item->setItemValue(DetectorItem::P_ANALYZER_EFFICIENCY, efficiency);
detector_item->setItemValue(DetectorItem::P_ANALYZER_TOTAL_TRANSMISSION, total_transmission);
}
diff --git a/GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp b/GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
index 16b40e0909f..c0d4d800727 100644
--- a/GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.cpp
@@ -98,7 +98,7 @@ void PolarizationAnalysisEditor::updateAnalyserEditor()
{
m_analyserDirectionEditor->clearEditor();
m_analyserPropertiesEditor->clearEditor();
- m_analyserDirectionEditor->addItem(detectorItem()->getItem(DetectorItem::P_ANALYZER_DIRECTION));
+ m_analyserDirectionEditor->addItem(detectorItem()->analyserDirectionItem());
m_analyserPropertiesEditor->addItem(
detectorItem()->getItem(DetectorItem::P_ANALYZER_EFFICIENCY));
m_analyserPropertiesEditor->addItem(
--
GitLab