diff --git a/GUI/Model/Beam/BeamAngleItems.cpp b/GUI/Model/Beam/BeamAngleItems.cpp index 57437989299565fda45b0f0def93208446ca71d9..3bea44667ffcfd558b15964c6254786c07f4bf2c 100644 --- a/GUI/Model/Beam/BeamAngleItems.cpp +++ b/GUI/Model/Beam/BeamAngleItems.cpp @@ -17,23 +17,6 @@ #include "Base/Util/Assert.h" #include "GUI/Model/Beam/DistributionItems.h" -BeamAzimuthalAngleItem::BeamAzimuthalAngleItem() -{ - m_distribution.simpleInit("Distribution", "", DistributionCatalog::Type::None); -} - -void BeamAzimuthalAngleItem::readFrom(QXmlStreamReader* r) -{ - BeamDistributionItem::readFrom(r); -} - -double BeamAzimuthalAngleItem::scaleFactor() const -{ - return Units::deg; -} - -// ------------------------------------------------------------------------------------------------ - BeamInclinationAngleItem::BeamInclinationAngleItem() { m_distribution.simpleInit("Distribution", "", DistributionCatalog::Type::None); diff --git a/GUI/Model/Beam/BeamAngleItems.h b/GUI/Model/Beam/BeamAngleItems.h index 836afbde8bd8516e423b44d1e5c9936fda0540c9..be21c02efff0397de41a3fa6447e5bbd2f7e158f 100644 --- a/GUI/Model/Beam/BeamAngleItems.h +++ b/GUI/Model/Beam/BeamAngleItems.h @@ -17,15 +17,6 @@ #include "GUI/Model/Beam/BeamDistributionItem.h" -class BeamAzimuthalAngleItem : public BeamDistributionItem { -public: - BeamAzimuthalAngleItem(); - - void readFrom(QXmlStreamReader* r) override; - - double scaleFactor() const override; -}; - class BeamInclinationAngleItem : public BeamDistributionItem { public: BeamInclinationAngleItem(); diff --git a/GUI/Model/Beam/SourceItems.cpp b/GUI/Model/Beam/SourceItems.cpp index 29467e5b7bee79aeab91ecc8b3de04434936d588..1a94638fc867546374c48cff3f56c889de5a313a 100644 --- a/GUI/Model/Beam/SourceItems.cpp +++ b/GUI/Model/Beam/SourceItems.cpp @@ -53,7 +53,7 @@ SourceItem::SourceItem() m_intensity.init("Intensity", "Beam intensity in neutrons/photons per sec.", 1e8, 3, RealLimits::limited(0.0, 1e32), "intensity"); - m_azimuthal_angle_item = std::make_unique<BeamAzimuthalAngleItem>(); + m_azimuthal_angle_item = std::make_unique<BeamDistributionItem>(); m_footprint.simpleInit("Type", "Footprint type", FootprintCatalog::Type::Gaussian); } @@ -121,7 +121,7 @@ void SourceItem::setAzimuthalAngle(double value) m_azimuthal_angle_item->resetToValue(value); } -BeamAzimuthalAngleItem* SourceItem::azimuthalAngleItem() const +BeamDistributionItem* SourceItem::azimuthalAngleItem() const { ASSERT(m_azimuthal_angle_item); return m_azimuthal_angle_item.get(); diff --git a/GUI/Model/Beam/SourceItems.h b/GUI/Model/Beam/SourceItems.h index 94c38dd2c929fb03aa8dbfa4682d952de28bed87..60a3a1e4afe154fab485c9f79ec2a6947e70ee7a 100644 --- a/GUI/Model/Beam/SourceItems.h +++ b/GUI/Model/Beam/SourceItems.h @@ -23,7 +23,6 @@ class BasicAxisItem; class Beam; -class BeamAzimuthalAngleItem; class BeamDistributionItem; class BeamScan; class Frame; @@ -44,7 +43,7 @@ public: double azimuthalAngle() const; void setAzimuthalAngle(double value); - BeamAzimuthalAngleItem* azimuthalAngleItem() const; + BeamDistributionItem* azimuthalAngleItem() const; bool expandBeamParameters = true; @@ -64,7 +63,7 @@ protected: SourceItem(); std::unique_ptr<BeamDistributionItem> m_wavelength_item; - std::unique_ptr<BeamAzimuthalAngleItem> m_azimuthal_angle_item; + std::unique_ptr<BeamDistributionItem> m_azimuthal_angle_item; DoubleProperty m_intensity;