diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp index ce8774f430727c15694f9dc502c98579fc365386..1f209bba2e384678bb79b5a49beb69a6beeac018 100644 --- a/GUI/Model/Device/InstrumentItems.cpp +++ b/GUI/Model/Device/InstrumentItems.cpp @@ -114,9 +114,9 @@ InstrumentItem* InstrumentItem::createItemCopy() const return copy; } -bool InstrumentItem::alignedWith(const DatafileItem* item) const +bool InstrumentItem::alignedWith(const DatafileItem* dfileItem) const { - return axdims() == item->axdims(); + return axdims() == dfileItem->axdims(); } void InstrumentItem::writeTo(QXmlStreamWriter* w) const @@ -367,21 +367,21 @@ std::vector<int> SpecularInstrumentItem::axdims() const return {scanItem()->inclinationAxisItem()->size()}; } -void SpecularInstrumentItem::updateToRealData(const DatafileItem* item) +void SpecularInstrumentItem::updateToRealData(const DatafileItem* dfileItem) { - if (axdims().size() != item->axdims().size()) + if (axdims().size() != dfileItem->axdims().size()) throw std::runtime_error("Specular instrument type is incompatible with passed data shape"); - const auto& dataAxis = item->dataItem()->c_field()->axis(0); + const auto& dataAxis = dfileItem->dataItem()->c_field()->axis(0); scanItem()->updateToData(dataAxis); scanItem()->grazingScanItem()->updateAxIndicators(makeFrame()); } -bool SpecularInstrumentItem::alignedWith(const DatafileItem* item) const +bool SpecularInstrumentItem::alignedWith(const DatafileItem* dfileItem) const { - if (!item->holdsDimensionalData()) + if (!dfileItem->holdsDimensionalData()) return scanItem()->grazingScanItem()->uniformAlphaAxisSelected() - && axdims() == item->axdims(); + && axdims() == dfileItem->axdims(); if (!scanItem()->grazingScanItem()->pointwiseAlphaAxisSelected()) return false; @@ -394,7 +394,7 @@ bool SpecularInstrumentItem::alignedWith(const DatafileItem* item) const if (!instrumentAxis) return false; - const auto& native_axis = item->dataItem()->c_field()->axis(0); + const auto& native_axis = dfileItem->dataItem()->c_field()->axis(0); return *instrumentAxis == native_axis; } @@ -586,12 +586,12 @@ std::vector<int> OffspecInstrumentItem::axdims() const return {scanItem()->grazingScanItem()->nBins(), detectorItem()->ySize()}; } -void OffspecInstrumentItem::updateToRealData(const DatafileItem* dataItem) +void OffspecInstrumentItem::updateToRealData(const DatafileItem* dfileItem) { - if (!dataItem) + if (!dfileItem) return; - const auto data_shape = dataItem->axdims(); + const auto data_shape = dfileItem->axdims(); if (axdims().size() != data_shape.size()) throw std::runtime_error("Offspec instrument type is incompatible with passed data shape"); @@ -689,12 +689,12 @@ std::vector<int> GISASInstrumentItem::axdims() const return {(int)detectorItem()->phiAxis().nbins(), (int)detectorItem()->alphaAxis().nbins()}; } -void GISASInstrumentItem::updateToRealData(const DatafileItem* item) +void GISASInstrumentItem::updateToRealData(const DatafileItem* dfileItem) { - if (!item) + if (!dfileItem) return; - const auto data_shape = item->axdims(); + const auto data_shape = dfileItem->axdims(); if (axdims().size() != data_shape.size()) throw std::runtime_error("GISAS instrument type is incompatible with passed data shape."); ASSERT(detectorItem()); diff --git a/GUI/Model/Device/InstrumentItems.h b/GUI/Model/Device/InstrumentItems.h index 2619fcafc496bf301b192ecc77bd1cd61c9c717f..e075b06d1967cecebb458405ca030f931eec2d79 100644 --- a/GUI/Model/Device/InstrumentItems.h +++ b/GUI/Model/Device/InstrumentItems.h @@ -46,9 +46,9 @@ public: virtual std::vector<int> axdims() const = 0; - virtual void updateToRealData(const DatafileItem* item) = 0; + virtual void updateToRealData(const DatafileItem* dfileItem) = 0; - virtual bool alignedWith(const DatafileItem* item) const; + virtual bool alignedWith(const DatafileItem* dfileItem) const; virtual Frame makeFrame() const = 0; @@ -131,8 +131,8 @@ public: QString instrumentType() const override { return "Specular"; } std::vector<int> axdims() const override; - void updateToRealData(const DatafileItem* item) override; - bool alignedWith(const DatafileItem* item) const override; + void updateToRealData(const DatafileItem* dfileItem) override; + bool alignedWith(const DatafileItem* dfileItem) const override; Frame makeFrame() const override; ISimulation* createSimulation(const MultiLayer& sample) const override; @@ -147,7 +147,7 @@ public: QString instrumentType() const override { return "Depth probe"; } std::vector<int> axdims() const override; - void updateToRealData(const DatafileItem* item) override; + void updateToRealData(const DatafileItem* dfileItem) override; Frame makeFrame() const override; ISimulation* createSimulation(const MultiLayer& sample) const override; void writeTo(QXmlStreamWriter* w) const override; @@ -166,7 +166,7 @@ public: QString instrumentType() const override { return "Off specular"; } std::vector<int> axdims() const override; - void updateToRealData(const DatafileItem* item) override; + void updateToRealData(const DatafileItem* dfileItem) override; Frame makeFrame() const override; ISimulation* createSimulation(const MultiLayer& sample) const override; void writeTo(QXmlStreamWriter* w) const override; @@ -185,7 +185,7 @@ public: QString instrumentType() const override { return "GISAS"; } std::vector<int> axdims() const override; - void updateToRealData(const DatafileItem* item) override; + void updateToRealData(const DatafileItem* dfileItem) override; Frame makeFrame() const override; ISimulation* createSimulation(const MultiLayer& sample) const override; void writeTo(QXmlStreamWriter* w) const override;