Commit 3685422f authored by Stéphane Albert's avatar Stéphane Albert
Browse files

BUG: MANTIS-1140: Reverted commit 73c5defc.

parent 68c43d05
......@@ -73,7 +73,9 @@ public:
*
* @return true if the operation has succeeded; false otherwise.
*/
template <typename T> bool TransformFromViewport(T & out, const T & in, bool isPhysical = true) const;
virtual bool TransformFromViewport( Point2d & out,
const Point2d & in,
bool isPhysical = true ) const;
/**
* Transform given point from viewport coordinate-system to this
......@@ -88,8 +90,44 @@ public:
*
* @return true if the operation has succeeded; false otherwise.
*/
template <typename T> bool TransformToViewport(T & out, const T & in, bool isPhysical = true) const;
virtual bool TransformFromViewport( Point2f & out,
const Point2f & in,
bool isPhysical = true ) const;
/**
* Transform given point from viewport coordinate-system to this
* actor coordinate-system.
*
* By default this method return false. It should be implemented in
* derived classes if needed.
*
* @param out The transformed point (in this actor coordinate-system).
* @param in The given point (in viewport coordinate-system).
* @param isPhysical Indicate physical coordates are desired.
*
* @return true if the operation has succeeded; false otherwise.
*/
virtual bool TransformToViewport( Point2d & out,
const Point2d & in,
bool isPhysical = true ) const;
/**
* Transform given point from this actor coordinate-system to
* viewport coordinate-system.
*
* By default this method return false. It should be implemented in
* derived classes if needed.
*
* @param out The transformed point (in viewport coordinate-system).
* @param in The given point (in viewport coordinate-system).
* @param isPhysical Indicate physical coordates are desired.
*
* @return true if the operation has succeeded; false otherwise.
*/
virtual bool TransformToViewport( Point2f & out,
const Point2f & in,
bool isPhysical = true ) const;
/**
*/
virtual std::string GetWkt() const;
......
......@@ -34,9 +34,9 @@ GeoInterface
}
template<> bool
bool
GeoInterface
::TransformFromViewport<GeoInterface::Point2d>( Point2d &,
::TransformFromViewport( Point2d &,
const Point2d &,
bool ) const
{
......@@ -44,9 +44,9 @@ GeoInterface
}
template <> bool
bool
GeoInterface
::TransformFromViewport<GeoInterface::Point2f>( Point2f & out,
::TransformFromViewport( Point2f & out,
const Point2f & in,
bool isPhysical ) const
{
......@@ -64,9 +64,9 @@ GeoInterface
}
template <> bool
bool
GeoInterface
::TransformToViewport<GeoInterface::Point2d>( Point2d &,
::TransformToViewport( Point2d &,
const Point2d &,
bool ) const
{
......@@ -74,9 +74,9 @@ GeoInterface
}
template <> bool
bool
GeoInterface
::TransformToViewport<GeoInterface::Point2f>( Point2f & out,
::TransformToViewport( Point2f & out,
const Point2f & in,
bool isPhysical ) const
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment