From 67a1e030d72655e9554a111c08e1048f63c17a36 Mon Sep 17 00:00:00 2001 From: Joachim Wuttke <j.wuttke@fz-juelich.de> Date: Wed, 24 Jul 2024 09:35:04 +0200 Subject: [PATCH] replace 'BeamWavelengthItem' by 'BeamDistributionItem' --- GUI/Model/Beam/SourceItems.cpp | 4 ++-- GUI/Model/FromCore/ItemizeSimulation.cpp | 2 +- GUI/Model/Job/ParameterTreeBuilder.cpp | 2 +- GUI/Model/Sim/InstrumentItems.cpp | 4 ++-- GUI/View/Device/GISASBeamEditor.cpp | 2 +- GUI/View/Device/ScanEditor.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/GUI/Model/Beam/SourceItems.cpp b/GUI/Model/Beam/SourceItems.cpp index 046e9c7cf7e..9b7b0b086e3 100644 --- a/GUI/Model/Beam/SourceItems.cpp +++ b/GUI/Model/Beam/SourceItems.cpp @@ -155,7 +155,7 @@ void SourceItem::setFootprint(const IFootprint* footprint) BeamItem::BeamItem() { - m_wavelength_item = std::make_unique<BeamWavelengthItem>(); + m_wavelength_item = std::make_unique<BeamDistributionItem>(); m_inclination_angle_item = std::make_unique<BeamInclinationAngleItem>(); } @@ -218,7 +218,7 @@ std::unique_ptr<Beam> BeamItem::createBeam() const ScanItem::ScanItem() { m_grazing_scan_item = std::make_unique<GrazingScanItem>(); - m_wavelength_item = std::make_unique<BeamWavelengthItem>(); + m_wavelength_item = std::make_unique<BeamDistributionItem>(); } void ScanItem::setScan(const BeamScan* scan) diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp index f3c5f939e9e..0148034cf54 100644 --- a/GUI/Model/FromCore/ItemizeSimulation.cpp +++ b/GUI/Model/FromCore/ItemizeSimulation.cpp @@ -28,7 +28,7 @@ #include "Device/Resolution/ResolutionFunction2DGaussian.h" #include "GUI/Model/Axis/BasicAxisItem.h" #include "GUI/Model/Beam/BeamAngleItems.h" -#include "GUI/Model/Beam/BeamWavelengthItem.h" +#include "GUI/Model/Beam/BeamDistributionItem.h" #include "GUI/Model/Beam/DistributionItems.h" #include "GUI/Model/Beam/GrazingScanItem.h" #include "GUI/Model/Beam/SourceItems.h" diff --git a/GUI/Model/Job/ParameterTreeBuilder.cpp b/GUI/Model/Job/ParameterTreeBuilder.cpp index 297fa5a9713..ee7668a70ba 100644 --- a/GUI/Model/Job/ParameterTreeBuilder.cpp +++ b/GUI/Model/Job/ParameterTreeBuilder.cpp @@ -14,7 +14,7 @@ #include "GUI/Model/Job/ParameterTreeBuilder.h" #include "GUI/Model/Beam/BeamAngleItems.h" -#include "GUI/Model/Beam/BeamWavelengthItem.h" +#include "GUI/Model/Beam/BeamDistributionItem.h" #include "GUI/Model/Beam/DistributionItems.h" #include "GUI/Model/Beam/SourceItems.h" #include "GUI/Model/Detector/DetectorItem.h" diff --git a/GUI/Model/Sim/InstrumentItems.cpp b/GUI/Model/Sim/InstrumentItems.cpp index 0d0a86399f3..157d5e15ea9 100644 --- a/GUI/Model/Sim/InstrumentItems.cpp +++ b/GUI/Model/Sim/InstrumentItems.cpp @@ -25,7 +25,7 @@ #include "Device/Detector/OffspecDetector.h" #include "GUI/Model/Axis/PointwiseAxisItem.h" #include "GUI/Model/Beam/BeamAngleItems.h" -#include "GUI/Model/Beam/BeamWavelengthItem.h" +#include "GUI/Model/Beam/BeamDistributionItem.h" #include "GUI/Model/Beam/DistributionItems.h" #include "GUI/Model/Beam/FootprintItems.h" #include "GUI/Model/Beam/GrazingScanItem.h" @@ -199,7 +199,7 @@ std::unique_ptr<PhysicalScan> ScanningInstrumentItem::createScan(const Scale& ax result->setFootprint(footprint_item->createFootprint().get()); { - const BeamWavelengthItem* it = scanItem()->wavelengthItem(); + const BeamDistributionItem* it = scanItem()->wavelengthItem(); ASSERT(it); const auto* distr_item = dynamic_cast<const SymmetricDistributionItem*>(it->distributionItem()); diff --git a/GUI/View/Device/GISASBeamEditor.cpp b/GUI/View/Device/GISASBeamEditor.cpp index 64640e643b7..a1e708bf0da 100644 --- a/GUI/View/Device/GISASBeamEditor.cpp +++ b/GUI/View/Device/GISASBeamEditor.cpp @@ -15,7 +15,7 @@ #include "GUI/View/Device/GISASBeamEditor.h" #include "Base/Util/Assert.h" #include "GUI/Model/Beam/BeamAngleItems.h" -#include "GUI/Model/Beam/BeamWavelengthItem.h" +#include "GUI/Model/Beam/BeamDistributionItem.h" #include "GUI/Model/Beam/SourceItems.h" #include "GUI/View/Device/DistributionEditor.h" #include "GUI/View/Device/FootprintForm.h" diff --git a/GUI/View/Device/ScanEditor.cpp b/GUI/View/Device/ScanEditor.cpp index b2d9bc82523..74675b8959a 100644 --- a/GUI/View/Device/ScanEditor.cpp +++ b/GUI/View/Device/ScanEditor.cpp @@ -16,7 +16,7 @@ #include "Base/Axis/Frame.h" #include "Base/Util/Assert.h" #include "GUI/Model/Axis/PointwiseAxisItem.h" -#include "GUI/Model/Beam/BeamWavelengthItem.h" +#include "GUI/Model/Beam/BeamDistributionItem.h" #include "GUI/Model/Beam/SourceItems.h" #include "GUI/Model/Project/ProjectDocument.h" #include "GUI/Model/Sim/InstrumentsSet.h" -- GitLab