From d3b6c318c6f1fc7f8c44173fac4850d6ddd5ed3e Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Thu, 10 Dec 2015 17:25:19 +0100
Subject: [PATCH] On the way to transforming masks to domain
---
GUI/coregui/Models/TransformToDomain.cpp | 18 ++++++++++++++++++
GUI/coregui/Models/TransformToDomain.h | 2 ++
.../InstrumentWidgets/DetectorMaskDelegate.cpp | 1 +
3 files changed, 21 insertions(+)
diff --git a/GUI/coregui/Models/TransformToDomain.cpp b/GUI/coregui/Models/TransformToDomain.cpp
index c368b380c33..0ba5565ba2f 100644
--- a/GUI/coregui/Models/TransformToDomain.cpp
+++ b/GUI/coregui/Models/TransformToDomain.cpp
@@ -42,6 +42,7 @@
#include "BeamWavelengthItem.h"
#include "BeamAngleItems.h"
#include "ResolutionFunctionItems.h"
+#include "MaskItems.h"
#include <QDebug>
@@ -375,3 +376,20 @@ void TransformToDomain::addDistributionParametersToSimulation(const Parameterize
}
}
}
+
+
+void TransformToDomain::addMasksToSimulation(const ParameterizedItem &detector_item,
+ GISASSimulation *simulation)
+{
+ Q_ASSERT(detector_item.modelType() == Constants::DetectorType);
+
+// if(const DetectorItem *detectorItem = dynamic_cast<const DetectorItem *>(&detector_item)) {
+// if(auto maskContainerItem = detectorItem->getMaskContainerItem()) {
+// foreach(auto child, maskContainerItem->childItems()) {
+
+
+// }
+// }
+// }
+
+}
diff --git a/GUI/coregui/Models/TransformToDomain.h b/GUI/coregui/Models/TransformToDomain.h
index 19dc6c98982..d55e2c36004 100644
--- a/GUI/coregui/Models/TransformToDomain.h
+++ b/GUI/coregui/Models/TransformToDomain.h
@@ -47,6 +47,8 @@ BA_CORE_API_ void initInstrumentFromDetectorItem(const ParameterizedItem &item,
Instrument *instrument);
BA_CORE_API_ void addDistributionParametersToSimulation(const ParameterizedItem &beam_item,
GISASSimulation *simulation);
+BA_CORE_API_ void addMasksToSimulation(const ParameterizedItem &detector_item,
+ GISASSimulation *simulation);
}
#endif // TRANSFORMTODOMAIN_H
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
index ae43c0c591b..c902bcbddf9 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
@@ -109,6 +109,7 @@ OutputData<double> *DetectorMaskDelegate::createOutputData(DetectorItem *detecto
result->addAxis("x", n_x, x_min, x_max);
result->addAxis("y", n_y, y_min, y_max);
+ result->setAllTo(1.0);
return result;
--
GitLab