Skip to content
Snippets Groups Projects
Commit 19b81a2a authored by Yurov, Dmitry's avatar Yurov, Dmitry
Browse files

Made InstrumentItem::setShape a protected method

Redmine: #2217
parent 142152dd
No related branches found
No related tags found
No related merge requests found
...@@ -41,7 +41,6 @@ public: ...@@ -41,7 +41,6 @@ public:
virtual std::unique_ptr<Instrument> createInstrument() const = 0; virtual std::unique_ptr<Instrument> createInstrument() const = 0;
virtual std::vector<int> shape() const = 0; virtual std::vector<int> shape() const = 0;
virtual void setShape(const std::vector<int>& shape) = 0;
virtual void clearMasks() {} virtual void clearMasks() {}
virtual void importMasks(const MaskContainerItem*) {} virtual void importMasks(const MaskContainerItem*) {}
virtual void updateToRealData(const RealDataItem* item); virtual void updateToRealData(const RealDataItem* item);
...@@ -52,6 +51,8 @@ protected: ...@@ -52,6 +51,8 @@ protected:
void initBeamGroup(const QString& beam_model); void initBeamGroup(const QString& beam_model);
void initBackgroundGroup(); void initBackgroundGroup();
virtual void setShape(const std::vector<int>& shape) = 0;
}; };
class BA_CORE_API_ SpecularInstrumentItem : public InstrumentItem class BA_CORE_API_ SpecularInstrumentItem : public InstrumentItem
...@@ -64,11 +65,13 @@ public: ...@@ -64,11 +65,13 @@ public:
std::unique_ptr<Instrument> createInstrument() const override; std::unique_ptr<Instrument> createInstrument() const override;
std::vector<int> shape() const override; std::vector<int> shape() const override;
void setShape(const std::vector<int>& shape) override;
void updateToRealData(const RealDataItem* item) override; void updateToRealData(const RealDataItem* item) override;
bool alignedWith(const RealDataItem* item) const override; bool alignedWith(const RealDataItem* item) const override;
std::unique_ptr<IUnitConverter> createUnitConverter() const; std::unique_ptr<IUnitConverter> createUnitConverter() const;
protected:
void setShape(const std::vector<int>& shape) override;
}; };
class BA_CORE_API_ Instrument2DItem : public InstrumentItem class BA_CORE_API_ Instrument2DItem : public InstrumentItem
...@@ -97,6 +100,8 @@ class BA_CORE_API_ GISASInstrumentItem : public Instrument2DItem ...@@ -97,6 +100,8 @@ class BA_CORE_API_ GISASInstrumentItem : public Instrument2DItem
public: public:
GISASInstrumentItem(); GISASInstrumentItem();
std::vector<int> shape() const override; std::vector<int> shape() const override;
protected:
void setShape(const std::vector<int>& data_shape) override; void setShape(const std::vector<int>& data_shape) override;
}; };
...@@ -107,6 +112,8 @@ public: ...@@ -107,6 +112,8 @@ public:
OffSpecInstrumentItem(); OffSpecInstrumentItem();
std::vector<int> shape() const override; std::vector<int> shape() const override;
protected:
void setShape(const std::vector<int>& data_shape) override; void setShape(const std::vector<int>& data_shape) override;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment