Commit 901f84a1 authored by Otmane Lahlou's avatar Otmane Lahlou

ENH : rename the namespace Transform to TransformDirection to avoid conflicts

parent e4f86577
......@@ -29,7 +29,7 @@ namespace otb
*
* It converts coordinates in longitude, latitude (WGS84) to Eckert4 map coordinates.
*/
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
class ITK_EXPORT Eckert4MapProjection : public MapProjection<ossimEckert4Projection, transform>
{
public:
......
......@@ -24,20 +24,20 @@
namespace otb
{
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
Eckert4MapProjection<transform>
::Eckert4MapProjection()
{
}
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
Eckert4MapProjection<transform>
::~Eckert4MapProjection()
{
}
///False easting specification
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void Eckert4MapProjection<transform>
::SetFalseEasting(double falseEasting)
{
......@@ -45,7 +45,7 @@ void Eckert4MapProjection<transform>
}
///False Northing specification
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void Eckert4MapProjection<transform>
::SetFalseNorthing(double falseNorthing)
{
......@@ -53,7 +53,7 @@ void Eckert4MapProjection<transform>
}
///Set the defaul parameters
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void Eckert4MapProjection<transform>
::SetDefaults()
{
......@@ -61,7 +61,7 @@ void Eckert4MapProjection<transform>
}
///Get the false northing coordinates (avoid negative values)
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
double Eckert4MapProjection<transform>
::GetFalseNorthing() const
{
......@@ -70,7 +70,7 @@ double Eckert4MapProjection<transform>
}
///Get the false easting coordinates (avoid negative values)
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
double Eckert4MapProjection<transform>
::GetFalseEasting() const
{
......@@ -78,7 +78,7 @@ double Eckert4MapProjection<transform>
return falseEasting;
}
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void Eckert4MapProjection<transform>
::SetParameters(double falseEasting, double falseNorthing)
{
......
......@@ -36,7 +36,7 @@
namespace otb
{
namespace Transform
namespace TransformDirection
{
enum TransformationDirection
{
......@@ -58,7 +58,7 @@ enum TransformationDirection
*
**/
template <Transform::TransformationDirection TDirectionOfMapping,
template <TransformDirection::TransformationDirection TDirectionOfMapping,
class TScalarType = double,
unsigned int NInputDimensions = 2,
unsigned int NOutputDimensions = 2>
......@@ -90,7 +90,7 @@ public:
virtual OssimMapProjectionType* GetMapProjection();
virtual const OssimMapProjectionType* GetMapProjection() const;
static const Transform::TransformationDirection DirectionOfMapping = TDirectionOfMapping;
static const TransformDirection::TransformationDirection DirectionOfMapping = TDirectionOfMapping;
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
......
......@@ -26,7 +26,7 @@
namespace otb
{
template<Transform::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
template<TransformDirection::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
unsigned int NOutputDimensions>
GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutputDimensions>
::GenericMapProjection() : Superclass(SpaceDimension, ParametersDimension)
......@@ -36,7 +36,7 @@ GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutput
reinstanciateProjection = true;
}
template<Transform::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
template<TransformDirection::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
unsigned int NOutputDimensions>
GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutputDimensions>
::~GenericMapProjection()
......@@ -47,7 +47,7 @@ GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutput
}
}
template<Transform::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
template<TransformDirection::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
unsigned int NOutputDimensions>
typename GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutputDimensions>::OssimMapProjectionType*
GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutputDimensions>
......@@ -62,7 +62,7 @@ GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutput
return this->m_MapProjection;
}
template<Transform::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
template<TransformDirection::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
unsigned int NOutputDimensions>
const typename GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions,
NOutputDimensions>::OssimMapProjectionType*
......@@ -78,7 +78,7 @@ GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutput
return this->m_MapProjection;
}
template<Transform::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
template<TransformDirection::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
unsigned int NOutputDimensions>
std::string
GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutputDimensions>
......@@ -92,7 +92,7 @@ GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutput
return wkt;
}
template<Transform::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
template<TransformDirection::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
unsigned int NOutputDimensions>
void
GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutputDimensions>
......@@ -104,7 +104,7 @@ GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutput
this->Modified();
}
template<Transform::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
template<TransformDirection::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
unsigned int NOutputDimensions>
bool
GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutputDimensions>
......@@ -140,7 +140,7 @@ GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutput
return false;
}
template<Transform::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
template<TransformDirection::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
unsigned int NOutputDimensions>
typename GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType
GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutputDimensions>
......@@ -150,7 +150,7 @@ GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutput
// otbMsgDevMacro(<< "DirectionOfMapping: " <<
// DirectionOfMapping);
if (DirectionOfMapping == Transform::INVERSE)
if (DirectionOfMapping == TransformDirection::INVERSE)
{
// otbMsgDevMacro(<< "Cartographic coordinates: (" << point[0] << "," << point[1] << ")");
......@@ -171,7 +171,7 @@ GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutput
outputPoint[2] = point[2];
}
}
if (DirectionOfMapping == Transform::FORWARD)
if (DirectionOfMapping == TransformDirection::FORWARD)
{
// otbMsgDevMacro(<< "Geographic coordinates (lon, lat) : (" << point[1] << "," << point[0] << ")");
//from "itk::point" to "ossim::ossimGpt"
......@@ -194,7 +194,7 @@ GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutput
return outputPoint;
}
template<Transform::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
template<TransformDirection::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
unsigned int NOutputDimensions>
void
GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutputDimensions>
......@@ -204,7 +204,7 @@ GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutput
}
template<Transform::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
template<TransformDirection::TransformationDirection TDirectionOfMapping, class TScalarType, unsigned int NInputDimensions,
unsigned int NOutputDimensions>
void
GenericMapProjection<TDirectionOfMapping, TScalarType, NInputDimensions, NOutputDimensions>
......
......@@ -82,7 +82,7 @@ public:
/** Run-time type information (and related methods). */
itkTypeMacro(GenericRSTransform, itk::Transform);
typedef Transform::TransformationDirection DirectionOfMappingEnumType;
typedef TransformDirection::TransformationDirection DirectionOfMappingEnumType;
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
......
......@@ -113,7 +113,7 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
// First, try to make a geo transform
if (!m_InputProjectionRef.empty()) //map projection
{
typedef otb::GenericMapProjection<Transform::INVERSE, ScalarType, InputSpaceDimension, InputSpaceDimension>
typedef otb::GenericMapProjection<TransformDirection::INVERSE, ScalarType, InputSpaceDimension, InputSpaceDimension>
InverseMapProjectionType;
typename InverseMapProjectionType::Pointer mapTransform = InverseMapProjectionType::New();
mapTransform->SetWkt(m_InputProjectionRef);
......@@ -191,7 +191,7 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
//*****************************
if (!m_OutputProjectionRef.empty()) //map projection
{
typedef otb::GenericMapProjection<Transform::FORWARD, ScalarType, InputSpaceDimension,
typedef otb::GenericMapProjection<TransformDirection::FORWARD, ScalarType, InputSpaceDimension,
OutputSpaceDimension> ForwardMapProjectionType;
typename ForwardMapProjectionType::Pointer mapTransform = ForwardMapProjectionType::New();
mapTransform->SetWkt(m_OutputProjectionRef);
......
......@@ -30,7 +30,7 @@ namespace otb
* \brief Convert coordinates from geocentric (X, Y, Z) to geographic (lon, lat, h)
*
*/
template <Transform::TransformationDirection TDirectionOfMapping,
template <TransformDirection::TransformationDirection TDirectionOfMapping,
class TScalarType = double,
unsigned int NInputDimensions = 3,
unsigned int NOutputDimensions = 3>
......@@ -58,7 +58,7 @@ public:
/** Run-time type information (and related methods). */
itkTypeMacro(GeocentricTransform, itk::Transform);
static const Transform::TransformationDirection DirectionOfMapping = TDirectionOfMapping;
static const TransformDirection::TransformationDirection DirectionOfMapping = TDirectionOfMapping;
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
......
......@@ -23,7 +23,7 @@
namespace otb
{
template<Transform::TransformationDirection TransformDirection, class TScalarType, unsigned int NInputDimensions,
template<TransformDirection::TransformationDirection TransformDirection, class TScalarType, unsigned int NInputDimensions,
unsigned int NOutputDimensions>
GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
::GeocentricTransform() : Superclass(SpaceDimension, ParametersDimension)
......@@ -31,7 +31,7 @@ GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDi
m_Ellipsoid = new ossimEllipsoid();
}
template<Transform::TransformationDirection TransformDirection, class TScalarType, unsigned int NInputDimensions,
template<TransformDirection::TransformationDirection TransformDirection, class TScalarType, unsigned int NInputDimensions,
unsigned int NOutputDimensions>
GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
::~GeocentricTransform()
......@@ -42,7 +42,7 @@ GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDi
}
}
template<Transform::TransformationDirection TransformDirection, class TScalarType, unsigned int NInputDimensions,
template<TransformDirection::TransformationDirection TransformDirection, class TScalarType, unsigned int NInputDimensions,
unsigned int NOutputDimensions>
typename GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType
GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
......@@ -50,11 +50,11 @@ GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDi
{
OutputPointType outputPoint;
if (DirectionOfMapping == Transform::INVERSE)
if (DirectionOfMapping == TransformDirection::INVERSE)
{
m_Ellipsoid->XYZToLatLonHeight(point[0], point[1], point[2], outputPoint[1], outputPoint[0], outputPoint[2]);
}
if (DirectionOfMapping == Transform::FORWARD)
if (DirectionOfMapping == TransformDirection::FORWARD)
{
m_Ellipsoid->latLonHeightToXYZ(point[1], point[0], point[2], outputPoint[0], outputPoint[1], outputPoint[2]);
}
......
......@@ -29,7 +29,7 @@ namespace otb
* It converts coordinates in longitude, latitude (WGS84) to Lambert 2 Etendu map coordinates.
*
*/
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
class ITK_EXPORT Lambert2EtenduProjection : public LambertConformalConicMapProjection<transform>
{
public:
......
......@@ -24,7 +24,7 @@
namespace otb
{
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
Lambert2EtenduProjection<transform>
::Lambert2EtenduProjection()
{
......@@ -46,7 +46,7 @@ Lambert2EtenduProjection<transform>
this->SetParameters(parall1, parall2, falseEasting, falseNorthing);
}
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
Lambert2EtenduProjection<transform>
::~Lambert2EtenduProjection()
{
......
......@@ -29,7 +29,7 @@ namespace otb
* It converts coordinates in longitude, latitude (WGS84) to Lambert 3 map coordinates.
*
*/
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
class ITK_EXPORT Lambert3CartoSudProjection : public LambertConformalConicMapProjection<transform>
{
public:
......
......@@ -24,7 +24,7 @@
namespace otb
{
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
Lambert3CartoSudProjection<transform>
::Lambert3CartoSudProjection()
{
......@@ -46,7 +46,7 @@ Lambert3CartoSudProjection<transform>
this->SetParameters(parall1, parall2, falseEasting, falseNorthing);
}
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
Lambert3CartoSudProjection<transform>
::~Lambert3CartoSudProjection()
{
......
......@@ -29,7 +29,7 @@ namespace otb
* It converts coordinates in longitude, latitude (WGS84) to Lambert 93 map coordinates.
*
*/
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
class ITK_EXPORT Lambert93Projection : public LambertConformalConicMapProjection<transform>
{
public:
......
......@@ -24,7 +24,7 @@
namespace otb
{
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
Lambert93Projection<transform>
::Lambert93Projection()
{
......@@ -46,7 +46,7 @@ Lambert93Projection<transform>
this->SetParameters(parall1, parall2, falseEasting, falseNorthing);
}
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
Lambert93Projection<transform>
::~Lambert93Projection()
{
......
......@@ -29,7 +29,7 @@ namespace otb
* It converts coordinates in longitude, latitude (WGS84) to Lambert Conformal Conic map coordinates.
*
*/
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
class ITK_EXPORT LambertConformalConicMapProjection : public MapProjection<ossimLambertConformalConicProjection,
transform>
{
......
......@@ -24,20 +24,20 @@
namespace otb
{
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
LambertConformalConicMapProjection<transform>
::LambertConformalConicMapProjection()
{
}
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
LambertConformalConicMapProjection<transform>
::~LambertConformalConicMapProjection()
{
}
/// Parallel1 specification
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void LambertConformalConicMapProjection<transform>
::SetStandardParallel1(double degree)
{
......@@ -45,7 +45,7 @@ void LambertConformalConicMapProjection<transform>
}
/// Parallel2 specification
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void LambertConformalConicMapProjection<transform>
::SetStandardParallel2(double degree)
{
......@@ -53,7 +53,7 @@ void LambertConformalConicMapProjection<transform>
}
/// Specification of the 2 parallels
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void LambertConformalConicMapProjection<transform>
::SetStandardParallels(double parallel1Degree, double parallel2Degree)
{
......@@ -61,7 +61,7 @@ void LambertConformalConicMapProjection<transform>
}
/// False easting specification
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void LambertConformalConicMapProjection<transform>
::SetFalseEasting(double falseEasting)
{
......@@ -69,7 +69,7 @@ void LambertConformalConicMapProjection<transform>
}
/// False Northing specification
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void LambertConformalConicMapProjection<transform>
::SetFalseNorthing(double falseNorthing)
{
......@@ -77,7 +77,7 @@ void LambertConformalConicMapProjection<transform>
}
/// Set the parameters
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void LambertConformalConicMapProjection<transform>
::SetParameters(double parallel1Degree, double parallel2Degree, double falseEasting, double falseNorthing)
{
......@@ -85,7 +85,7 @@ void LambertConformalConicMapProjection<transform>
}
/// Set the default parameters
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void LambertConformalConicMapProjection<transform>
::SetDefaults()
{
......@@ -93,7 +93,7 @@ void LambertConformalConicMapProjection<transform>
}
/// Get the False Northing (avoid negative coordinates)
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
double LambertConformalConicMapProjection<transform>
::GetFalseNorthing() const
{
......@@ -103,7 +103,7 @@ double LambertConformalConicMapProjection<transform>
}
///Get the False Easting (avoid negative coordinates)
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
double LambertConformalConicMapProjection<transform>
::GetFalseEasting() const
{
......
......@@ -54,7 +54,7 @@ namespace otb
**/
template <class TOssimMapProjection,
Transform::TransformationDirection TDirectionOfMapping,
TransformDirection::TransformationDirection TDirectionOfMapping,
class TScalarType = double,
unsigned int NInputDimensions = 2,
unsigned int NOutputDimensions = 2>
......@@ -86,7 +86,7 @@ public:
virtual const OssimMapProjectionType* GetMapProjection() const;
virtual OssimMapProjectionType* GetMapProjection();
static const Transform::TransformationDirection DirectionOfMapping = TDirectionOfMapping;
static const TransformDirection::TransformationDirection DirectionOfMapping = TDirectionOfMapping;
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
......
This diff is collapsed.
This diff is collapsed.
......@@ -28,7 +28,7 @@ namespace otb
* \brief This class implements the Mollweid map projection.
* It converts coordinates in longitude, latitude (WGS84) to Mollweid map coordinates.
*/
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
class ITK_EXPORT MollweidMapProjection : public MapProjection<ossimMollweidProjection, transform>
{
public:
......
......@@ -24,20 +24,20 @@
namespace otb
{
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
MollweidMapProjection<transform>
::MollweidMapProjection()
{
}
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
MollweidMapProjection<transform>
::~MollweidMapProjection()
{
}
///Set the false easting
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void MollweidMapProjection<transform>
::SetFalseEasting(double falseEasting)
{
......@@ -45,7 +45,7 @@ void MollweidMapProjection<transform>
}
///Set the false Northing
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void MollweidMapProjection<transform>
::SetFalseNorthing(double falseNorthing)
{
......@@ -53,7 +53,7 @@ void MollweidMapProjection<transform>
}
///Set the default parameters
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void MollweidMapProjection<transform>
::SetDefaults()
{
......@@ -61,7 +61,7 @@ void MollweidMapProjection<transform>
}
///\return the false northing (avoid negative coordinates)
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
double MollweidMapProjection<transform>
::GetFalseNorthing() const
{
......@@ -71,7 +71,7 @@ double MollweidMapProjection<transform>
}
///\return the false easting (avoid negative coordinates)
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
double MollweidMapProjection<transform>
::GetFalseEasting() const
{
......@@ -80,7 +80,7 @@ double MollweidMapProjection<transform>
return falseEasting;
}
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void MollweidMapProjection<transform>
::SetParameters(double falseEasting, double falseNorthing)
{
......
......@@ -29,7 +29,7 @@ namespace otb
* It converts coordinates in longitude, latitude (WGS84) to SVY21 map coordinates.
*
*/
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
class ITK_EXPORT SVY21MapProjection : public TransMercatorMapProjection<transform>
{
public:
......
......@@ -24,7 +24,7 @@
namespace otb
{
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
SVY21MapProjection<transform>
::SVY21MapProjection()
{
......@@ -45,7 +45,7 @@ SVY21MapProjection<transform>
this->SetParameters(falseEasting, falseNorthing, scaleFactor);
}
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
SVY21MapProjection<transform>
::~SVY21MapProjection()
{
......
......@@ -29,7 +29,7 @@ namespace otb
* \brief This class implements the Sinusoidal map projection.
* It converts coordinates in longitude, latitude (WGS84) to Sinusoidal map coordinates.
*/
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
class ITK_EXPORT SinusoidalMapProjection : public MapProjection<ossimSinusoidalProjection, transform>
{
public:
......
......@@ -24,20 +24,20 @@
namespace otb
{
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
SinusoidalMapProjection<transform>
::SinusoidalMapProjection()
{
}
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
SinusoidalMapProjection<transform>
::~SinusoidalMapProjection()
{
}
///Set the false Easting
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void SinusoidalMapProjection<transform>
::SetFalseEasting(double falseEasting)
{
......@@ -45,7 +45,7 @@ void SinusoidalMapProjection<transform>
}
///Set the False Northing
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void SinusoidalMapProjection<transform>
::SetFalseNorthing(double falseNorthing)
{
......@@ -53,7 +53,7 @@ void SinusoidalMapProjection<transform>
}
///Set the default parameter
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void SinusoidalMapProjection<transform>
::SetDefaults()
{
......@@ -61,7 +61,7 @@ void SinusoidalMapProjection<transform>
}
///\return the False Northing (avoid negative coordinates)
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
double SinusoidalMapProjection<transform>
::GetFalseNorthing() const
{
......@@ -71,7 +71,7 @@ double SinusoidalMapProjection<transform>
}
///\return the False Easting (avoid negative coordinates)
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
double SinusoidalMapProjection<transform>
::GetFalseEasting() const
{
......@@ -80,7 +80,7 @@ double SinusoidalMapProjection<transform>
return falseEasting;
}
template <Transform::TransformationDirection transform>
template <TransformDirection::TransformationDirection transform>
void SinusoidalMapProjection<transform>
::SetParameters(double falseEasting, double falseNorthing)
{
......
......@@ -43,7 +43,7 @@ namespace otb
* \brief to do
**/
template <Transform::TransformationDirection TTransformDirection,
template <TransformDirection::TransformationDirection TTransformDirection,
class TScalarType = double,
unsigned int NInputDimensions = 2,
unsigned int NOutputDimensions = 2>
......@@ -70,7 +70,7 @@ public:
/** Run-time type information (and related methods). */
itkTypeMacro(TileMapTransform, Transform);
static const Transform::TransformationDirection DirectionOfMapping = TTransformDirection;
static const TransformDirection::TransformationDirection DirectionOfMapping = TTransformDirection;
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
......
......@@ -24,7 +24,7 @@
namespace otb
{
template<Transform::TransformationDirection TTransformDirection, class TScalarType,
template<TransformDirection::TransformationDirection TTransformDirection, class TScalarType,
unsigned int NInputDimensions, unsigned int NOutputDimensions>
TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
::TileMapTransform() : Superclass(SpaceDimension, ParametersDimension)
......@@ -32,7 +32,7 @@ TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDime
m_TileMapTransform = new OssimTileMapTransformType();
}
template<Transform::TransformationDirection TTransformDirection, class TScalarType,
template<TransformDirection::TransformationDirection TTransformDirection, class TScalarType,
unsigned int NInputDimensions, unsigned int NOutputDimensions>
TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
::~TileMapTransform()
......@@ -40,7 +40,7 @@ TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDime
delete m_TileMapTransform;
}
template<Transform::TransformationDirection TTransformDirection, class TScalarType,
template<TransformDirection::TransformationDirection TTransformDirection, class TScalarType,
unsigned int NInputDimensions, unsigned int NOutputDimensions>
typename TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType
TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
......@@ -48,7 +48,7 @@ TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDime
{
OutputPointType outputPoint;
if (DirectionOfMapping == Transform::INVERSE)
if (DirectionOfMapping == TransformDirection::INVERSE)
{
// otbMsgDevMacro(<< "Cartographic coordinates: (" << point[0] << "," << point[1] << ")");
......@@ -65,7 +65,7 @@ TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDime