From c70029cadb02139a33ef17b49a893af983284500 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 7 Mar 2023 13:52:13 +0100
Subject: [PATCH] start merging GISASBeamItem
---
GUI/Model/Device/BeamItems.cpp | 31 ++++++++++++++++---------------
GUI/Model/Device/BeamItems.h | 5 +++--
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/GUI/Model/Device/BeamItems.cpp b/GUI/Model/Device/BeamItems.cpp
index 87844cdb0dc..a14662c538f 100644
--- a/GUI/Model/Device/BeamItems.cpp
+++ b/GUI/Model/Device/BeamItems.cpp
@@ -188,6 +188,22 @@ std::shared_ptr<Beam> SourceItem::createBeam() const
// BeamItem
// ************************************************************************************************
+
+// ************************************************************************************************
+// GISASBeamItem
+// ************************************************************************************************
+
+GISASBeamItem::GISASBeamItem()
+{
+ m_wavelengthItem.reset(new BeamWavelengthItem);
+ m_inclinationAngleItem.reset(new BeamInclinationAngleItem);
+}
+
+double BeamItem::getInclinationAngle() const
+{
+ return dynamic_cast<BeamInclinationAngleItem*>(beamDistributionItem())->inclinationAngle();
+}
+
// ************************************************************************************************
// ScanItem
// ************************************************************************************************
@@ -299,18 +315,3 @@ std::shared_ptr<AlphaScan> ScanItem::createAlphaScan() const
return result;
}
*/
-
-// ************************************************************************************************
-// GISASBeamItem
-// ************************************************************************************************
-
-GISASBeamItem::GISASBeamItem()
-{
- m_wavelengthItem.reset(new BeamWavelengthItem);
- m_inclinationAngleItem.reset(new BeamInclinationAngleItem);
-}
-
-double GISASBeamItem::getInclinationAngle() const
-{
- return dynamic_cast<BeamInclinationAngleItem*>(beamDistributionItem())->inclinationAngle();
-}
diff --git a/GUI/Model/Device/BeamItems.h b/GUI/Model/Device/BeamItems.h
index 83d19d14bdb..31cc4ad998d 100644
--- a/GUI/Model/Device/BeamItems.h
+++ b/GUI/Model/Device/BeamItems.h
@@ -69,7 +69,9 @@ protected:
bool m_expandBeamParameters = true;
};
-class BeamItem : public SourceItem {};
+class BeamItem : public SourceItem {
+ double getInclinationAngle() const override;
+};
class ScanItem : public SourceItem {
public:
@@ -103,7 +105,6 @@ class GISASBeamItem : public BeamItem {
public:
GISASBeamItem();
- double getInclinationAngle() const override;
};
#endif // BORNAGAIN_GUI_MODEL_DEVICE_BEAMITEMS_H
--
GitLab