From 6063213a3eeeda835a4b8104eab3d12fad71e149 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 11 Aug 2023 10:39:50 +0200
Subject: [PATCH] ItemizeSimulation no need for switch
---
GUI/Model/FromCore/ItemizeSimulation.cpp | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp
index b64fd23485b..28141ae6dbd 100644
--- a/GUI/Model/FromCore/ItemizeSimulation.cpp
+++ b/GUI/Model/FromCore/ItemizeSimulation.cpp
@@ -244,26 +244,16 @@ void setFlatDetector(FlatDetectorItem* detectorItem, const FlatDetector& detecto
{
// Axes
detectorItem->setXSize(detector.xSize());
- detectorItem->setWidth(detector.width());
-
detectorItem->setYSize(detector.ySize());
+
+ detectorItem->setDistance(detector.getDistance());
+ detectorItem->setWidth(detector.width());
detectorItem->setHeight(detector.height());
+ detectorItem->setU0(detector.getU0());
+ detectorItem->setV0(detector.getV0());
+
detectorItem->setDetectorAlignment(detector.getDetectorArrangment());
- if (detector.getDetectorArrangment() == FlatDetector::X) {
- detectorItem->setDistance(detector.getDistance());
- detectorItem->setU0(detector.getU0());
- detectorItem->setV0(detector.getV0());
- } else if (detector.getDetectorArrangment() == FlatDetector::T) {
- detectorItem->setDistance(detector.getDistance());
- detectorItem->setU0(detector.getU0());
- detectorItem->setV0(detector.getV0());
- } else if (detector.getDetectorArrangment() == FlatDetector::R) {
- detectorItem->setDistance(detector.getDistance());
- detectorItem->setU0(detector.getU0());
- detectorItem->setV0(detector.getV0());
- } else
- ASSERT(false);
}
void setDetectorGeometry(GISASInstrumentItem* instrument_item, const IDetector& detector)
--
GitLab