diff --git a/GUI/Model/Beam/SourceItems.cpp b/GUI/Model/Beam/SourceItems.cpp index 0682bd726e94ceea630f0f6bb4c340ce4930bd00..62d7c01ddea52e579af6615a13b6ba0b231817d1 100644 --- a/GUI/Model/Beam/SourceItems.cpp +++ b/GUI/Model/Beam/SourceItems.cpp @@ -145,7 +145,7 @@ void SourceItem::setSquareFootprint(double value) m_footprint.setCertainItem(new FootprintSquareItem(value)); } -void SourceItem::setFootprint(const IFootprint* footprint) +void SourceItem::setFootprintItem(const IFootprint* footprint) { if (!footprint) return; @@ -241,7 +241,7 @@ void ScanItem::setScan(const BeamScan* scan) axis_item->setMin(axis->min() / Units::deg); axis_item->setMax(axis->max() / Units::deg); - setFootprint(scan->commonFootprint()); + setFootprintItem(scan->commonFootprint()); } void ScanItem::writeTo(QXmlStreamWriter* w) const diff --git a/GUI/Model/Beam/SourceItems.h b/GUI/Model/Beam/SourceItems.h index 636f32e18fec6dc2e7fab139ca4eeb0c5204e9b9..6135a0e96b2a855341b84feb159f612a896f6c6f 100644 --- a/GUI/Model/Beam/SourceItems.h +++ b/GUI/Model/Beam/SourceItems.h @@ -44,7 +44,7 @@ public: void setAzimuthalAngle(double value); PolyItem<FootprintCatalog>& footprintSelection() { return m_footprint; } - void setFootprint(const IFootprint* footprint); + void setFootprintItem(const IFootprint* footprint); void setGaussianFootprint(double value); void setSquareFootprint(double value); diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp index ce1625043ebe62a22635e93f229d4f627eaee6ba..2f7ada9d46193bdab6bc4aa444b2df69464a0d65 100644 --- a/GUI/Model/FromCore/ItemizeSimulation.cpp +++ b/GUI/Model/FromCore/ItemizeSimulation.cpp @@ -185,7 +185,7 @@ void setGISASBeamItem(BeamItem* beam_item, const ScatteringSimulation& simulatio beam_item->setWavelength(beam.wavelength()); beam_item->setInclinationAngle(Units::rad2deg(beam.alpha_i())); beam_item->setAzimuthalAngle(Units::rad2deg(beam.phi_i())); - beam_item->setFootprint(beam.footprint()); + beam_item->setFootprintItem(beam.footprint()); for (const ParameterDistribution& pd : simulation.paramDistributions()) { if (pd.whichParameter() == ParameterDistribution::BeamWavelength)