Commit 8d10d05d authored by Emmanuel Christophe's avatar Emmanuel Christophe

Corrections commentaires

parent 3a848554
......@@ -26,15 +26,15 @@ namespace otb
{
/** \class Exckert4MapProjection
* \brief This class implements the Eckert4 map projection.
* It converts coordinates in longitude,latitude to Eckert4 map coordinates.
* It converts coordinates in longitude,latitude (WGS84) to Eckert4 map coordinates.
*/
template <InverseOrForwardTransformationEnum transform>
class ITK_EXPORT Eckert4MapProjection : public MapProjection<ossimEckert4Projection,transform>
{
public :
template <InverseOrForwardTransformationEnum transform>
class ITK_EXPORT Eckert4MapProjection : public MapProjection<ossimEckert4Projection,transform>
{
public :
/** Standard class typedefs. */
typedef Eckert4MapProjection Self;
/** Standard class typedefs. */
typedef Eckert4MapProjection Self;
typedef MapProjection<ossimEckert4Projection,transform> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
......@@ -55,15 +55,15 @@ namespace otb
virtual void SetParameters(double falseEasting,double falseNorthing);
virtual void SetDefaults();
protected :
Eckert4MapProjection();
protected :
Eckert4MapProjection();
virtual ~Eckert4MapProjection();
private :
Eckert4MapProjection(const Self&); //purposely not implemented
private :
Eckert4MapProjection(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
};
};
} // namespace otb
......
......@@ -25,29 +25,29 @@ namespace otb
{
template <InverseOrForwardTransformationEnum transform>
Eckert4MapProjection<transform>
Eckert4MapProjection<transform>
::Eckert4MapProjection()
{
}
template <InverseOrForwardTransformationEnum transform>
Eckert4MapProjection<transform>
Eckert4MapProjection<transform>
::~Eckert4MapProjection()
{
}
///False easting specification
template <InverseOrForwardTransformationEnum transform>
void Eckert4MapProjection<transform>
::SetFalseEasting(double falseEasting)
template <InverseOrForwardTransformationEnum transform>
void Eckert4MapProjection<transform>
::SetFalseEasting(double falseEasting)
{
this->m_MapProjection->setFalseEasting(falseEasting);
}
///False Northing specification
template <InverseOrForwardTransformationEnum transform>
void Eckert4MapProjection<transform>
void Eckert4MapProjection<transform>
::SetFalseNorthing(double falseNorthing)
{
this->m_MapProjection->setFalseNorthing(falseNorthing);
......@@ -55,7 +55,7 @@ namespace otb
///Set the defaul parameters
template <InverseOrForwardTransformationEnum transform>
void Eckert4MapProjection<transform>
void Eckert4MapProjection<transform>
::SetDefaults()
{
this->m_MapProjection->setDefaults();
......@@ -63,7 +63,7 @@ namespace otb
///Get the false northing coordinates (avoid negative values)
template <InverseOrForwardTransformationEnum transform>
double Eckert4MapProjection<transform>
double Eckert4MapProjection<transform>
::GetFalseNorthing() const
{
double falseNorthing=this->m_MapProjection->getFalseNorthing();
......@@ -72,7 +72,7 @@ namespace otb
///Get the false easting coordinates (avoid negative values)
template <InverseOrForwardTransformationEnum transform>
double Eckert4MapProjection<transform>
double Eckert4MapProjection<transform>
::GetFalseEasting() const
{
double falseEasting=this->m_MapProjection->getFalseEasting();
......@@ -80,7 +80,7 @@ namespace otb
}
template <InverseOrForwardTransformationEnum transform>
void Eckert4MapProjection<transform>
void Eckert4MapProjection<transform>
::SetParameters(double falseEasting,double falseNorthing)
{
this->m_MapProjection->setFalseEastingNorthing(falseEasting,falseNorthing);
......
......@@ -27,7 +27,7 @@ namespace otb
{
/** \class Lambert2EtenduProjection
* \brief This class implements the Lambert 2 Etendu map projection.
* It converts coordinates in longitude,latitude to Lambert 2 Etendu map coordinates.
* It converts coordinates in longitude,latitude (WGS84) to Lambert 2 Etendu map coordinates.
*
*/
template <InverseOrForwardTransformationEnum transform>
......
......@@ -26,15 +26,15 @@ namespace otb
{
/** \class LambertConformalConicMapProjection
* \brief This class implements the Lambert Conformal Conic map projection.
* It converts coordinates in longitude,latitude to Lambert Conformal Conic map coordinates.
* It converts coordinates in longitude,latitude (WGS84) to Lambert Conformal Conic map coordinates.
*
*/
template <InverseOrForwardTransformationEnum transform>
class ITK_EXPORT LambertConformalConicMapProjection : public MapProjection<ossimLambertConformalConicProjection,transform>
{
public :
/** Standard class typedefs. */
typedef LambertConformalConicMapProjection Self;
template <InverseOrForwardTransformationEnum transform>
class ITK_EXPORT LambertConformalConicMapProjection : public MapProjection<ossimLambertConformalConicProjection,transform>
{
public :
/** Standard class typedefs. */
typedef LambertConformalConicMapProjection Self;
typedef MapProjection<ossimLambertConformalConicProjection,transform> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
......@@ -49,25 +49,25 @@ namespace otb
/** Run-time type information (and related methods). */
itkTypeMacro( LambertConformalConicMapProjection, MapProjection );
void SetStandardParallel1 (double degree);
void SetStandardParallel2 (double degree);
void SetStandardParallels (double parallel1Degree,double parallel2Degree);
void SetFalseEasting(double falseEasting);
void SetFalseNorthing(double falseNorthing);
double GetFalseNorthing() const;
double GetFalseEasting() const;
void SetParameters(double parallel1Degree,double parallel2Degree,double falseEasting,double falseNorthing);
void SetDefaults();
void SetStandardParallel1 (double degree);
void SetStandardParallel2 (double degree);
void SetStandardParallels (double parallel1Degree,double parallel2Degree);
void SetFalseEasting(double falseEasting);
void SetFalseNorthing(double falseNorthing);
double GetFalseNorthing() const;
double GetFalseEasting() const;
void SetParameters(double parallel1Degree,double parallel2Degree,double falseEasting,double falseNorthing);
void SetDefaults();
protected:
LambertConformalConicMapProjection();
virtual ~LambertConformalConicMapProjection();
LambertConformalConicMapProjection();
virtual ~LambertConformalConicMapProjection();
private :
LambertConformalConicMapProjection(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
};
private :
LambertConformalConicMapProjection(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
};
} // namespace otb
......
......@@ -24,22 +24,22 @@ PURPOSE. See the above copyright notices for more information.
namespace otb
{
template <InverseOrForwardTransformationEnum transform>
LambertConformalConicMapProjection<transform>
template <InverseOrForwardTransformationEnum transform>
LambertConformalConicMapProjection<transform>
::LambertConformalConicMapProjection()
{
}
template <InverseOrForwardTransformationEnum transform>
LambertConformalConicMapProjection<transform>
template <InverseOrForwardTransformationEnum transform>
LambertConformalConicMapProjection<transform>
::~LambertConformalConicMapProjection()
{
}
/// Parallel1 specification
template <InverseOrForwardTransformationEnum transform>
void LambertConformalConicMapProjection<transform>
template <InverseOrForwardTransformationEnum transform>
void LambertConformalConicMapProjection<transform>
::SetStandardParallel1(double degree)
{
this->m_MapProjection->setStandardParallel1(degree);
......@@ -47,7 +47,7 @@ namespace otb
/// Parallel2 specification
template <InverseOrForwardTransformationEnum transform>
void LambertConformalConicMapProjection<transform>
void LambertConformalConicMapProjection<transform>
::SetStandardParallel2(double degree)
{
this->m_MapProjection->setStandardParallel2(degree);
......@@ -55,7 +55,7 @@ namespace otb
/// Specification of the 2 parallels
template <InverseOrForwardTransformationEnum transform>
void LambertConformalConicMapProjection<transform>
void LambertConformalConicMapProjection<transform>
::SetStandardParallels(double parallel1Degree,double parallel2Degree)
{
this->m_MapProjection->setStandardParallels(parallel1Degree,parallel2Degree);
......@@ -63,7 +63,7 @@ namespace otb
/// False easting specification
template <InverseOrForwardTransformationEnum transform>
void LambertConformalConicMapProjection<transform>
void LambertConformalConicMapProjection<transform>
::SetFalseEasting(double falseEasting)
{
this->m_MapProjection->setFalseEasting(falseEasting);
......@@ -71,7 +71,7 @@ namespace otb
/// False Northing specification
template <InverseOrForwardTransformationEnum transform>
void LambertConformalConicMapProjection<transform>
void LambertConformalConicMapProjection<transform>
::SetFalseNorthing(double falseNorthing)
{
this->m_MapProjection->setFalseNorthing(falseNorthing);
......@@ -79,7 +79,7 @@ namespace otb
/// Set the parameters
template <InverseOrForwardTransformationEnum transform>
void LambertConformalConicMapProjection<transform>
void LambertConformalConicMapProjection<transform>
::SetParameters(double parallel1Degree,double parallel2Degree,double falseEasting,double falseNorthing)
{
this->m_MapProjection->setParameters(parallel1Degree, parallel2Degree, falseEasting, falseNorthing);
......@@ -87,7 +87,7 @@ namespace otb
/// Set the default parameters
template <InverseOrForwardTransformationEnum transform>
void LambertConformalConicMapProjection<transform>
void LambertConformalConicMapProjection<transform>
::SetDefaults()
{
this->m_MapProjection->setDefaults();
......@@ -95,7 +95,7 @@ namespace otb
/// Get the False Northing (avoid negative coordinates)
template <InverseOrForwardTransformationEnum transform>
double LambertConformalConicMapProjection<transform>
double LambertConformalConicMapProjection<transform>
::GetFalseNorthing() const
{
double falseNorthing=this->m_MapProjection->getFalseNorthing();
......@@ -105,7 +105,7 @@ namespace otb
///Get the False Easting (avoid negative coordinates)
template <InverseOrForwardTransformationEnum transform>
double LambertConformalConicMapProjection<transform>
double LambertConformalConicMapProjection<transform>
::GetFalseEasting() const
{
double falseEasting=this->m_MapProjection->getFalseEasting();
......
......@@ -38,6 +38,9 @@ namespace otb
/** \class otbMapProjection
* \brief This is the base class for all geographic projections (UTM, Lambert, ...)
*
* All derived class assume that the latitude and longitude are given according to the
* WGS84 ellipsoid model.
**/
typedef enum {FORWARD=0, INVERSE=1} InverseOrForwardTransformationEnum;
......
......@@ -26,43 +26,43 @@ namespace otb
{
/** \class MollweidMapProjection
* \brief This class implements the Mollweid map projection.
* It converts coordinates in longitude,latitude to Mollweid map coordinates.
* It converts coordinates in longitude,latitude (WGS84) to Mollweid map coordinates.
*/
template <InverseOrForwardTransformationEnum transform>
class ITK_EXPORT MollweidMapProjection : public MapProjection<ossimMollweidProjection, transform>
{
public :
/** Standard class typedefs. */
typedef MollweidMapProjection Self;
typedef MapProjection<ossimMollweidProjection,transform> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
class ITK_EXPORT MollweidMapProjection : public MapProjection<ossimMollweidProjection, transform>
{
public :
/** Standard class typedefs. */
typedef MollweidMapProjection Self;
typedef MapProjection<ossimMollweidProjection,transform> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
typedef typename Superclass::ScalarType ScalarType;
typedef itk::Point<ScalarType,2 > InputPointType;
typedef itk::Point<ScalarType,2 > OutputPointType;
typedef typename Superclass::ScalarType ScalarType;
typedef itk::Point<ScalarType,2 > InputPointType;
typedef itk::Point<ScalarType,2 > OutputPointType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
itkTypeMacro( MollweidMapProjection, MapProjection );
virtual void SetFalseEasting(double falseEasting);
virtual void SetFalseNorthing(double falseNorthing);
virtual double GetFalseNorthing() const;
virtual double GetFalseEasting() const;
virtual void SetParameters(double falseEasting,double falseNorthing);
virtual void SetDefaults();
/** Run-time type information (and related methods). */
itkTypeMacro( MollweidMapProjection, MapProjection );
virtual void SetFalseEasting(double falseEasting);
virtual void SetFalseNorthing(double falseNorthing);
virtual double GetFalseNorthing() const;
virtual double GetFalseEasting() const;
virtual void SetParameters(double falseEasting,double falseNorthing);
virtual void SetDefaults();
protected:
MollweidMapProjection();
virtual ~MollweidMapProjection();
MollweidMapProjection();
virtual ~MollweidMapProjection();
private :
MollweidMapProjection(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
private :
MollweidMapProjection(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
};
};
} // namespace otb
......
......@@ -25,20 +25,20 @@ namespace otb
{
template <InverseOrForwardTransformationEnum transform>
MollweidMapProjection<transform>
MollweidMapProjection<transform>
::MollweidMapProjection()
{
}
template <InverseOrForwardTransformationEnum transform>
MollweidMapProjection<transform>
MollweidMapProjection<transform>
::~MollweidMapProjection()
{
}
///Set the false easting
template <InverseOrForwardTransformationEnum transform>
void MollweidMapProjection<transform>
void MollweidMapProjection<transform>
::SetFalseEasting(double falseEasting)
{
this->m_MapProjection->setFalseEasting(falseEasting);
......@@ -46,7 +46,7 @@ namespace otb
///Set the false Northing
template <InverseOrForwardTransformationEnum transform>
void MollweidMapProjection<transform>
void MollweidMapProjection<transform>
::SetFalseNorthing(double falseNorthing)
{
this->m_MapProjection->setFalseNorthing(falseNorthing);
......@@ -54,7 +54,7 @@ namespace otb
///Set the default parameters
template <InverseOrForwardTransformationEnum transform>
void MollweidMapProjection<transform>
void MollweidMapProjection<transform>
::SetDefaults()
{
this->m_MapProjection->setDefaults();
......@@ -62,7 +62,7 @@ namespace otb
///\return the false northing (avoid negative coordinates)
template <InverseOrForwardTransformationEnum transform>
double MollweidMapProjection<transform>
double MollweidMapProjection<transform>
::GetFalseNorthing() const
{
double falseNorthing=this->m_MapProjection->getFalseNorthing();
......@@ -72,16 +72,16 @@ namespace otb
///\return the false easting (avoid negative coordinates)
template <InverseOrForwardTransformationEnum transform>
double MollweidMapProjection<transform>
double MollweidMapProjection<transform>
::GetFalseEasting() const
{
double falseEasting=this->m_MapProjection->getFalseEasting();
return falseEasting;
}
}
template <InverseOrForwardTransformationEnum transform>
void MollweidMapProjection<transform>
void MollweidMapProjection<transform>
::SetParameters(double falseEasting,double falseNorthing)
{
this->m_MapProjection->setFalseEastingNorthing(falseEasting,falseNorthing);
......
......@@ -27,15 +27,15 @@ namespace otb
/** \class SinusoidalMapProjection
* \brief This class implements the Sinusoidal map projection.
* It converts coordinates in longitude,latitude to Sinusoidal map coordinates.
* It converts coordinates in longitude,latitude (WGS84) to Sinusoidal map coordinates.
*/
template <InverseOrForwardTransformationEnum transform>
class ITK_EXPORT SinusoidalMapProjection : public MapProjection<ossimSinusoidalProjection, transform>
{
public :
template <InverseOrForwardTransformationEnum transform>
class ITK_EXPORT SinusoidalMapProjection : public MapProjection<ossimSinusoidalProjection, transform>
{
public :
/** Standard class typedefs. */
typedef SinusoidalMapProjection Self;
/** Standard class typedefs. */
typedef SinusoidalMapProjection Self;
typedef MapProjection<ossimSinusoidalProjection, transform> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
......@@ -61,11 +61,11 @@ namespace otb
SinusoidalMapProjection();
virtual ~SinusoidalMapProjection();
private :
SinusoidalMapProjection(const Self&); //purposely not implemented
private :
SinusoidalMapProjection(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
};
};
} // namespace otb
......
......@@ -25,21 +25,21 @@ namespace otb
{
template <InverseOrForwardTransformationEnum transform>
SinusoidalMapProjection<transform>
SinusoidalMapProjection<transform>
::SinusoidalMapProjection()
{
}
template <InverseOrForwardTransformationEnum transform>
SinusoidalMapProjection<transform>
SinusoidalMapProjection<transform>
::~SinusoidalMapProjection()
{
}
///Set the false Easting
template <InverseOrForwardTransformationEnum transform>
void SinusoidalMapProjection<transform>
void SinusoidalMapProjection<transform>
::SetFalseEasting(double falseEasting)
{
this->m_MapProjection->setFalseEasting(falseEasting);
......@@ -47,7 +47,7 @@ namespace otb
///Set the False Northing
template <InverseOrForwardTransformationEnum transform>
void SinusoidalMapProjection<transform>
void SinusoidalMapProjection<transform>
::SetFalseNorthing(double falseNorthing)
{
this->m_MapProjection->setFalseNorthing(falseNorthing);
......@@ -55,15 +55,15 @@ namespace otb
///Set the default parameter
template <InverseOrForwardTransformationEnum transform>
void SinusoidalMapProjection<transform>
void SinusoidalMapProjection<transform>
::SetDefaults()
{
this->m_MapProjection->setDefaults();
this->m_MapProjection->setDefaults();
}
///\return the False Northing (avoid negative coordinates)
template <InverseOrForwardTransformationEnum transform>
double SinusoidalMapProjection<transform>
double SinusoidalMapProjection<transform>
::GetFalseNorthing() const
{
double falseNorthing=this->m_MapProjection->getFalseNorthing();
......@@ -73,7 +73,7 @@ namespace otb
///\return the False Easting (avoid negative coordinates)
template <InverseOrForwardTransformationEnum transform>
double SinusoidalMapProjection<transform>
double SinusoidalMapProjection<transform>
::GetFalseEasting() const
{
double falseEasting=this->m_MapProjection->getFalseEasting();
......@@ -82,8 +82,8 @@ namespace otb
}
template <InverseOrForwardTransformationEnum transform>
void SinusoidalMapProjection<transform>
::SetParameters(double falseEasting,double falseNorthing)
void SinusoidalMapProjection<transform>
::SetParameters(double falseEasting,double falseNorthing)
{
this->m_MapProjection->setFalseEastingNorthing(falseEasting,falseNorthing);
}
......
......@@ -26,16 +26,16 @@ namespace otb
{
/** \class TransMercatorMapProjection
* \brief This class implements the TransMercator map projection.
* It converts coordinates in longitude,latitude to TransMercator map coordinates.
* It converts coordinates in longitude,latitude (WGS84) to TransMercator map coordinates.
*
*/
template <InverseOrForwardTransformationEnum transform>
class ITK_EXPORT TransMercatorMapProjection : public MapProjection<ossimTransMercatorProjection,transform>
{
public :
template <InverseOrForwardTransformationEnum transform>
class ITK_EXPORT TransMercatorMapProjection : public MapProjection<ossimTransMercatorProjection,transform>
{
public :
/** Standard class typedefs. */
typedef TransMercatorMapProjection Self;
/** Standard class typedefs. */
typedef TransMercatorMapProjection Self;
typedef MapProjection<ossimTransMercatorProjection, transform> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
......@@ -62,11 +62,11 @@ namespace otb
TransMercatorMapProjection();
virtual ~TransMercatorMapProjection();
private :
TransMercatorMapProjection(const Self&); //purposely not implemented
private :
TransMercatorMapProjection(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
};
};
} // namespace otb
......
......@@ -23,8 +23,8 @@ PURPOSE. See the above copyright notices for more information.
namespace otb
{
template <InverseOrForwardTransformationEnum transform>
TransMercatorMapProjection<transform>
template <InverseOrForwardTransformationEnum transform>
TransMercatorMapProjection<transform>
::TransMercatorMapProjection()
{
ossimEllipsoid ellipsoid= *(ossimEllipsoidFactory::instance()->create("WE"));
......@@ -35,7 +35,7 @@ namespace otb
/// Desctructor
template <InverseOrForwardTransformationEnum transform>
TransMercatorMapProjection<transform>
TransMercatorMapProjection<transform>
::~TransMercatorMapProjection()
{
}
......@@ -43,7 +43,7 @@ namespace otb
///Set the false Easting
template <InverseOrForwardTransformationEnum transform>
void TransMercatorMapProjection<transform>
void TransMercatorMapProjection<transform>
::SetFalseEasting(double falseEasting)
{
this->m_MapProjection->setFalseEasting(falseEasting);
......@@ -51,7 +51,7 @@ namespace otb
///Set the False Northing
template <InverseOrForwardTransformationEnum transform>
void TransMercatorMapProjection<transform>
void TransMercatorMapProjection<transform>
::SetFalseNorthing(double falseNorthing)
{
this->m_MapProjection->setFalseNorthing(falseNorthing);
...