From 19b81a2a4010e9b587f212cbfa60da0b31876028 Mon Sep 17 00:00:00 2001
From: Dmitry Yurov <d.yurov@fz-juelich.de>
Date: Tue, 4 Dec 2018 13:32:19 +0100
Subject: [PATCH] Made InstrumentItem::setShape a protected method
Redmine: #2217
---
GUI/coregui/Models/InstrumentItems.h | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/GUI/coregui/Models/InstrumentItems.h b/GUI/coregui/Models/InstrumentItems.h
index ef700354ab8..dbe3430407a 100644
--- a/GUI/coregui/Models/InstrumentItems.h
+++ b/GUI/coregui/Models/InstrumentItems.h
@@ -41,7 +41,6 @@ public:
virtual std::unique_ptr<Instrument> createInstrument() const = 0;
virtual std::vector<int> shape() const = 0;
- virtual void setShape(const std::vector<int>& shape) = 0;
virtual void clearMasks() {}
virtual void importMasks(const MaskContainerItem*) {}
virtual void updateToRealData(const RealDataItem* item);
@@ -52,6 +51,8 @@ protected:
void initBeamGroup(const QString& beam_model);
void initBackgroundGroup();
+
+ virtual void setShape(const std::vector<int>& shape) = 0;
};
class BA_CORE_API_ SpecularInstrumentItem : public InstrumentItem
@@ -64,11 +65,13 @@ public:
std::unique_ptr<Instrument> createInstrument() const override;
std::vector<int> shape() const override;
- void setShape(const std::vector<int>& shape) override;
void updateToRealData(const RealDataItem* item) override;
bool alignedWith(const RealDataItem* item) const override;
std::unique_ptr<IUnitConverter> createUnitConverter() const;
+
+protected:
+ void setShape(const std::vector<int>& shape) override;
};
class BA_CORE_API_ Instrument2DItem : public InstrumentItem
@@ -97,6 +100,8 @@ class BA_CORE_API_ GISASInstrumentItem : public Instrument2DItem
public:
GISASInstrumentItem();
std::vector<int> shape() const override;
+
+protected:
void setShape(const std::vector<int>& data_shape) override;
};
@@ -107,6 +112,8 @@ public:
OffSpecInstrumentItem();
std::vector<int> shape() const override;
+
+protected:
void setShape(const std::vector<int>& data_shape) override;
};
--
GitLab