diff --git a/Device/Coord/CoordSystem2D.h b/Device/Coord/CoordSystem2D.h index 80e2754977d09e41e40cbf31ff096e7323893d2d..344a79ba8d5f52abcc3264363138d701e1796ffc 100644 --- a/Device/Coord/CoordSystem2D.h +++ b/Device/Coord/CoordSystem2D.h @@ -31,8 +31,6 @@ public: CoordSystem2D(const std::vector<const IAxis*>& axes); ~CoordSystem2D() override = default; - size_t rank() const override { return m_axes.size(); } - double calculateMin(size_t i_axis, Coords units) const override; double calculateMax(size_t i_axis, Coords units) const override; @@ -42,6 +40,8 @@ public: IAxis* createConvertedAxis(size_t i_axis, Coords units) const override; + size_t rank() const override { return m_axes.size(); } + protected: CoordSystem2D(const CoordSystem2D& other); @@ -62,13 +62,13 @@ public: SphericalCoords* clone() const override; +private: std::vector<Coords> availableUnits() const override; Coords defaultUnits() const override { return Coords::DEGREES; } std::string nameOfAxis(size_t i_axis, Coords units = Coords::UNDEFINED) const override; -private: SphericalCoords(const SphericalCoords& other); //!< used by clone() double calculateValue(size_t i_axis, Coords units, double value) const override; const R3 m_ki; @@ -86,13 +86,13 @@ public: ImageCoords* clone() const override; +private: std::vector<Coords> availableUnits() const override; Coords defaultUnits() const override { return Coords::MM; } std::string nameOfAxis(size_t i_axis, Coords units = Coords::UNDEFINED) const override; -private: ImageCoords(const ImageCoords& other); //!< used by clone() double calculateValue(size_t i_axis, Coords units, double value) const override; @@ -111,11 +111,11 @@ public: OffspecCoords* clone() const override; +private: Coords defaultUnits() const override { return Coords::DEGREES; } std::string nameOfAxis(size_t i_axis, Coords units = Coords::UNDEFINED) const override; -private: OffspecCoords(const OffspecCoords& other); //!< used by clone() double calculateValue(size_t i_axis, Coords units, double value) const override; }; @@ -131,13 +131,13 @@ public: DepthprobeCoords* clone() const override; +private: std::vector<Coords> availableUnits() const override; Coords defaultUnits() const override { return Coords::DEGREES; } std::string nameOfAxis(size_t i_axis, Coords units = Coords::UNDEFINED) const override; -private: DepthprobeCoords(const DepthprobeCoords& other); //!< used by clone() double calculateValue(size_t, Coords units, double value) const override; const double m_ki0;