diff --git a/Code/Projections/otbMapProjection.txx b/Code/Projections/otbMapProjection.txx index 87c06c35af4a9032c836e55f671cad043f06252f..98b5a7a67be563b0ce931d956649b5e1ee8717f6 100644 --- a/Code/Projections/otbMapProjection.txx +++ b/Code/Projections/otbMapProjection.txx @@ -40,8 +40,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi } -///M�thode pour attribuer une ellipse � la projection(4 m�thodes) -//Par defaut: +/// Method to set the projection ellipsoid template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> ::SetEllipsoid() @@ -49,8 +48,7 @@ void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDi ossimEllipsoid ellipsoid=ossimEllipsoid(); m_MapProjection->setEllipsoid(ellipsoid); } - -//Par copie: +/// Method to set the projection ellipsoid by copy template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> ::SetEllipsoid(const ossimEllipsoid &ellipsoid) @@ -58,7 +56,7 @@ void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDi m_MapProjection->setEllipsoid(ellipsoid); } -//En connaissant son "code" +///// Method to set the projection ellipsoid by knowing its code template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> ::SetEllipsoid(std::string code) @@ -76,7 +74,7 @@ void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDi m_MapProjection= new OssimMapProjectionType(ellipse); } -//En connaissant ses axes +///// Method to set the projection ellipsoid by knowing its axis template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> ::SetEllipsoid(const double &major_axis, const double &minor_axis) @@ -87,49 +85,6 @@ void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDi m_MapProjection= new OssimMapProjectionType(ellipse); } -///M�thode qui transforme un point g�ographique en un point cartographique: -//Encapsulation de la m�thode "forward" -/*template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> -typename MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform>::OutputPointType -MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> -::Forward(const InputPointType & point) const -{ - - //On transforme le type "itk::point" en type "ossim::ossimGpt" - ossimGpt ossimGPoint(point[0], point[1]); - - //On le proj�te sur la carte - ossimDpt ossimDPoint; - ossimDPoint=m_MapProjection->forward(ossimGPoint); - - OutputPointType outputPoint; - outputPoint[0]=ossimDPoint.x; - outputPoint[1]=ossimDPoint.y; - - return outputPoint; -}*/ - -///M�thode qui transforme un point cartographique en un point g�ographique: -//Encapsulation de la m�thode "inverse" -/*template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> -typename MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform>::InputPointType -MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> -::Inverse(const OutputPointType & point) const -{ - //On transforme le type "itk::point" en type "ossim::ossimDpt" - ossimDpt ossimDPoint(point[0], point[1]); - - //On le proj�te sur la carte - ossimGpt ossimGPoint; - ossimGPoint=m_MapProjection->inverse(ossimDPoint); - - InputPointType inputPoint; - inputPoint[0]=ossimGPoint.lat; - inputPoint[1]=ossimGPoint.lon; - - return inputPoint; -}*/ - template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> typename MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform>::OutputPointType MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -141,26 +96,26 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi { case INVERSE: { - otbGenericMsgDebugMacro(<< "Point en x/y carto : (" << point[0] << "," << point[1] << ")"); + otbGenericMsgDebugMacro(<< "Cartographic coordinates: (" << point[0] << "," << point[1] << ")"); - //On transforme le type "itk::point" en type "ossim::ossimDpt" + //from "itk::point" to "ossim::ossimDpt" ossimDpt ossimDPoint(point[0], point[1]); - //On le proj�te sur la carte + //map projection ossimGpt ossimGPoint; ossimGPoint=m_MapProjection->inverse(ossimDPoint); outputPoint[0]=ossimGPoint.lon; outputPoint[1]=ossimGPoint.lat; - otbGenericMsgDebugMacro(<< "Point en lon/lat : (" << outputPoint[0] << "," << outputPoint[1] << ")"); + otbGenericMsgDebugMacro(<< "Geographic coordinates (long/lat) : (" << outputPoint[0] << "," << outputPoint[1] << ")"); break; } case FORWARD: { - //On transforme le type "itk::point" en type "ossim::ossimGpt" + //from "itk::point" to "ossim::ossimGpt" ossimGpt ossimGPoint(point[1], point[0]); - //On le proj�te sur la carte + //map projection ossimDpt ossimDPoint; ossimDPoint=m_MapProjection->forward(ossimGPoint); @@ -180,7 +135,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi -///M�thode qui retourne le point g�ographique correspondant � l'index (0;0) +///\return The geographic point corresponding to (0,0) template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> typename MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform>::InputPointType MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -195,7 +150,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi return otbOrigin; } -///M�thode pour r�cup�rer le FalseNorthing(pour �viter les coordonn�es n�gatives) +///\return The False Northing(avoid negative coordinates) template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> double MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -206,7 +161,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi return falseNorthing; } -///M�thode pour r�cup�rer le FalseEasting(pour �viter les coordonn�es n�gatives) +///\return The FalseEasting(avoid negative coordinates) template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> double MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -217,7 +172,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi return falseEasting; } -///M�thode pour r�cup�rer le StandardParallel1(# selon le type de projection) +///\return The StandardParallel1(depends on the projection type) template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> double MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -228,7 +183,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi return standardParallel1; } -///M�thode pour r�cup�rer le StandardParallel2(# selon le type de projection) +///\return The StandardParallel2(depends on the projection type) template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> double MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -239,7 +194,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi return standardParallel2; } -///M�thode pour r�cup�rer le nom de la projection +///\return The projection name template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> std::string MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -251,7 +206,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi return projectionName; } -///M�thode pour v�rifier si... +///Check if the projection is geographic template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> bool MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -260,7 +215,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi return (m_MapProjection->isGeographic()); } -///M�thode pour r�cup�rer le "major axis" d'une ellipse +///\return the major axis of the ellipsoid template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> double MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -271,7 +226,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi return majorAxis; } -///M�thode pour r�cup�rer le "minor axis" d'une ellipse +///\return the minor axis of the ellipsoid template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> double MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -282,7 +237,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi return minorAxis; } -///M�thode pour r�cup�rer le "Flattening" d'une ellipse +///\return the flatening of the ellipsoid template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> double MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -293,7 +248,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi return flattening; } -///M�thode qui retourne la r�solution (m�tres/pixel) +///\return The resolution in meters template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> typename MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform>::OutputPointType MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -308,7 +263,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi return metersPerPixels; } -///M�thode qui retourne la r�solution (degr�s/pixel) +///\return The resolution in degree template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> typename MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform>::OutputPointType MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -323,7 +278,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi return DecimalDegreesPerPixels; } -///M�thode pour attribuer les axes � l'ellipse +///Set the ellipsoid axis template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> ::SetAB(double a, double b) @@ -331,7 +286,7 @@ void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDi m_MapProjection->setAB(a,b); } -///M�thode pour attribuer l'origine +///Set the origin template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> ::SetOrigin(const InputPointType &origin) @@ -340,7 +295,7 @@ void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDi m_MapProjection->setOrigin(ossimOrigin); } -///M�thode pour fixer une r�solution de la carte +///Set the map resolution in meters template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> ::SetMetersPerPixel(const OutputPointType &point) @@ -348,7 +303,7 @@ void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDi m_MapProjection->setMetersPerPixel(ossimDPoint); } -///M�thode pour fixer une r�solution de la carte +///Set the map resolution in degree template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> ::SetDecimalDegreesPerPixel(const OutputPointType &point) @@ -357,7 +312,7 @@ void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDi m_MapProjection->setDecimalDegreesPerPixel(ossimDPoint); } -///M�thode pour calculer approximativement la r�solution(degr�/pixel) +///\return an approximation of the resolution in degree template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> ::ComputeDegreesPerPixel(const InputPointType &ground, const OutputPointType &metersPerPixel, double &deltaLat, double &deltaLon) @@ -368,7 +323,7 @@ void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDi m_MapProjection->computeDegreesPerPixel(ossimGround,ossimMetersPerPixel,deltaLat,deltaLon); } -///M�thode pour calculer approximativement la r�solution(m�tre/pixel) +///\return an approximation of the resolution in meters template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -382,7 +337,7 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi metersPerPixel[1]=ossimMetersPerPixel.y; } -///M�thode pour calculer approximativement la r�solution(m�tre/pixel) +///\return an approximation of the resolution in meters template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, Transform> @@ -393,24 +348,6 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi metersPerPixel[0]=ossimMetersPerPixel.x; metersPerPixel[1]=ossimMetersPerPixel.y; } - -///Non impl�ment� dans ossim. -// template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, InverseOrForwardTransformationEnum>::SetMatrix(double rotation, const OutputPointType &scale, const OutputPointType &translation) -// { -// ossimDpt ossimScale(scale[0], scale[1]); -// ossimDpt ossimTranslation(translation[0], translation[1]); -// m_MapProjection->setMatrix(rotation,ossimScale, ossimTranslation); -// } - -///M�thode pour attribuer un falseEasting -// template<class TOssimMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, InverseOrForwardTransformationEnum Transform> void MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensions, InverseOrForwardTransformationEnum>::SetFalseEasting(double falseEasting) -// { std::string projectionName=m_MapProjection->getProjectionName(); -// if (projectionName=="ossimUtmProjection") -// {m_MapProjection->setFalseEasting(falseEasting); -// } -// else {std::cout << "Erreur:M�thode non applicable � cette projection" << std::endl;} -// } - } // namespace otb #endif diff --git a/Code/Projections/otbMapToMapProjection.txx b/Code/Projections/otbMapToMapProjection.txx index e6b3790a36e2f72206085e47033b2e7353dfb795..f0a299aab6eb2f4fc71fb9fde4a691e02b4f4b02 100644 --- a/Code/Projections/otbMapToMapProjection.txx +++ b/Code/Projections/otbMapToMapProjection.txx @@ -36,7 +36,7 @@ MapToMapProjection<TInputMapProjection, TOutputMapProjection, TScalarType, NInpu { } -///M�thode pour passer de la projection 1 � la projection 2 +///Pass from projection 1 to projection 2 template<class TInputMapProjection, class TOutputMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions> typename MapToMapProjection<TInputMapProjection, TOutputMapProjection, TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType MapToMapProjection<TInputMapProjection, TOutputMapProjection, TScalarType, NInputDimensions, NOutputDimensions>::ComputeProjection1ToProjection2(const InputPointType &point1) @@ -44,15 +44,15 @@ MapToMapProjection<TInputMapProjection, TOutputMapProjection, TScalarType, NInpu InputPointType geopoint; OutputPointType point2; - //On projette le point en (lat,lon) + //(lat,lon) projection geopoint=m_InputMapProjection->Inverse(point1); - //Puis on le reprojette en coord carto. + //map projection point2=m_OutputMapProjection->Forward(geopoint); return point2; } -///M�thode pour passer de la projection 2 � la projection 1 +///Pass from projection 2 to projection 1 template<class TInputMapProjection, class TOutputMapProjection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions> typename MapToMapProjection<TInputMapProjection, TOutputMapProjection, TScalarType, NInputDimensions, NOutputDimensions>::InputPointType MapToMapProjection<TInputMapProjection, TOutputMapProjection, TScalarType, NInputDimensions, NOutputDimensions>::ComputeProjection2ToProjection1(const OutputPointType &point2) @@ -61,9 +61,9 @@ MapToMapProjection<TInputMapProjection, TOutputMapProjection, TScalarType, NInpu OutputPointType geopoint; InputPointType point1; - //On projette le point en (lat,lon) + //(lat,lon) projection geopoint=m_OutputMapProjection->Inverse(point2); - //Puis on le reprojette en coord carto. + //map projection point1=m_InputMapProjection->Forward(geopoint); return point1; diff --git a/Code/Projections/otbMollweidMapProjection.cxx b/Code/Projections/otbMollweidMapProjection.cxx index fcf7bfa87b5d5aa2e359b681f9753a59d3c33936..15b4ae12ea69b0f17ed2038b2322fa88a50fd134 100644 --- a/Code/Projections/otbMollweidMapProjection.cxx +++ b/Code/Projections/otbMollweidMapProjection.cxx @@ -33,28 +33,28 @@ MollweidMapProjection delete m_MollweidProjection; } -///Sp�cification du false easting +///Set the false easting void MollweidMapProjection ::SetFalseEasting(double falseEasting) { m_MollweidProjection->setFalseEasting(falseEasting); } -///Sp�cification du false Northing +///Set the false Northing void MollweidMapProjection ::SetFalseNorthing(double falseNorthing) { m_MollweidProjection->setFalseNorthing(falseNorthing); } -///Instanciation avec les param�tres par d�faut +///Set the default parameters void MollweidMapProjection ::SetDefaults() { m_MollweidProjection->setDefaults(); } -///M�thode pour r�cup�rer le FalseNorthing(pour �viter les coordonn�es n�gatives) +///\return the false northing (avoid negative coordinates) double MollweidMapProjection ::GetFalseNorthing() const { @@ -63,7 +63,7 @@ double MollweidMapProjection return falseNorthing; } -///M�thode pour r�cup�rer le FalseEasting(pour �viter les coordonn�es n�gatives) +///\return the false easting (avoid negative coordinates) double MollweidMapProjection ::GetFalseEasting() const { diff --git a/Code/Projections/otbMollweidMapProjection.h b/Code/Projections/otbMollweidMapProjection.h index 2e025dc3da325ad3229155ebc5840546b51bf878..c76008c205065a8a4fe7d42a4d5624749a9b2a20 100644 --- a/Code/Projections/otbMollweidMapProjection.h +++ b/Code/Projections/otbMollweidMapProjection.h @@ -24,7 +24,10 @@ namespace otb { - + /** \class MollweidMapProjection + * \brief This class implements the Mollweid map projection. + * It converts coordinates in longitude,latitude to Mollweid map coordinates. + */ class ITK_EXPORT MollweidMapProjection : public MapProjection<ossimMollweidProjection> { public : diff --git a/Code/Projections/otbOrthoRectificationFilter.h b/Code/Projections/otbOrthoRectificationFilter.h index c0726f0e3a0d35ed6b0593fb3ca42fb992814e79..00eb78b65d254b425616b4293f07581058f1f134 100644 --- a/Code/Projections/otbOrthoRectificationFilter.h +++ b/Code/Projections/otbOrthoRectificationFilter.h @@ -38,7 +38,7 @@ namespace otb * \brief Class for Orthorectifying an image * * This class is used to apply map projection and sensor model transformation -* to orthorectify an image, with or without DEM +* to orthorectify an image, with or without DEM. * */ diff --git a/Code/Projections/otbSensorModelBase.h b/Code/Projections/otbSensorModelBase.h index 6b6d24a23dfb45573e18adafdacb181acf3ba023..48029465754b9378f8fe0b717836beb63e9bf0bd 100755 --- a/Code/Projections/otbSensorModelBase.h +++ b/Code/Projections/otbSensorModelBase.h @@ -29,7 +29,11 @@ namespace otb { - + /** \class SensorModelBase + * \brief Base class for the sensor model projection classes. + * This class allows to transform a geographic point in (lat,long) to a point in the sensor geometry. + * (lat,lon) -> (i,j) ou (lat,lon,h) -> (i,j) + */ template <class TScalarType, unsigned int NInputDimensions=3, unsigned int NOutputDimensions=2, diff --git a/Code/Projections/otbSensorModelBase.txx b/Code/Projections/otbSensorModelBase.txx index 35419c7e03848597f4d4c214bd030a040c612392..b2684be9d0848989de667ee6db10f3efc3708f4a 100755 --- a/Code/Projections/otbSensorModelBase.txx +++ b/Code/Projections/otbSensorModelBase.txx @@ -18,12 +18,6 @@ #ifndef __otbSensorModelBase_txx #define __otbSensorModelBase_txx - -/**SensorModelBase.cxx -* Purpose: -* Cette classe permet de projeter un point au sol en un point sur un point sur l'image capteur. -* (lat,lon) -> (i,j) ou (lat,lon,h) -> (i,j) -**/ #include "otbSensorModelBase.h" #include "otbMacro.h" @@ -64,7 +58,7 @@ SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions,NParametersDimen } -/// M�thode GetGeometryKeywordlist +/// Get the Geometry Keyword list template < class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, @@ -76,7 +70,7 @@ SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions,NParametersDimen return m_ImageKeywordlist; } -/// M�thode GetGeometryKeywordlist +/// Get the Geometry Keyword list template < class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, @@ -119,7 +113,7 @@ SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions,NParametersDimen } -/// M�thode SetGeometry :Cr�er et instancier le mod�le de capteur gr�ce aux metadata. +///Instatiate the sensor model from metadata. template < class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions, diff --git a/Code/Projections/otbSinusoidalMapProjection.cxx b/Code/Projections/otbSinusoidalMapProjection.cxx index d27388c4b93832a30fc075bfe16742f02fb2283f..e2d4b127afc87e5a7f34baa81aa82393db86065c 100644 --- a/Code/Projections/otbSinusoidalMapProjection.cxx +++ b/Code/Projections/otbSinusoidalMapProjection.cxx @@ -34,28 +34,28 @@ SinusoidalMapProjection delete m_SinusoidalProjection; } -///Sp�cification du false easting +///Set the false easting void SinusoidalMapProjection ::SetFalseEasting(double falseEasting) { m_SinusoidalProjection->setFalseEasting(falseEasting); } -///Sp�cification du false Northing +///Set the False Northing void SinusoidalMapProjection ::SetFalseNorthing(double falseNorthing) { m_SinusoidalProjection->setFalseNorthing(falseNorthing); } -///Instanciation avec les param�tres par d�faut +///Set the default parameter void SinusoidalMapProjection ::SetDefaults() { m_SinusoidalProjection->setDefaults(); } -///M�thode pour r�cup�rer le FalseNorthing(pour �viter les coordonn�es n�gatives) +///\return the False Northing (avoid negative coordinates) double SinusoidalMapProjection ::GetFalseNorthing() const { @@ -64,7 +64,7 @@ double SinusoidalMapProjection return falseNorthing; } -///M�thode pour r�cup�rer le FalseEasting(pour �viter les coordonn�es n�gatives) +///\return the False Easting (avoid negative coordinates) double SinusoidalMapProjection ::GetFalseEasting() const { diff --git a/Code/Projections/otbSinusoidalMapProjection.h b/Code/Projections/otbSinusoidalMapProjection.h index 7b7defee78e6ae2013cca7ada2b9438c458c27c1..9e292c4df11313790502929f1cf55b60042ad890 100644 --- a/Code/Projections/otbSinusoidalMapProjection.h +++ b/Code/Projections/otbSinusoidalMapProjection.h @@ -25,7 +25,10 @@ namespace otb { - + /** \class SinusoidalMapProjection + * \brief This class implements the Sinusoidal map projection. + * It converts coordinates in longitude,latitude to Sinusoidal map coordinates. + */ class ITK_EXPORT SinusoidalMapProjection : public otb::MapProjection<ossimSinusoidalProjection> { public : diff --git a/Code/Projections/otbTransMercatorMapProjection.cxx b/Code/Projections/otbTransMercatorMapProjection.cxx index 227efb12ab43d5a18b90b579649f11527a5f2523..227035b2d7489b598694042021c422fd9b906836 100644 --- a/Code/Projections/otbTransMercatorMapProjection.cxx +++ b/Code/Projections/otbTransMercatorMapProjection.cxx @@ -27,14 +27,14 @@ TransMercatorMapProjection m_TransMercatorProjection = new ossimTransMercatorProjection(); } -// Destructeur +/// Desctructor TransMercatorMapProjection ::~TransMercatorMapProjection() { delete m_TransMercatorProjection; } -///Ellipsoid propre par d�faut +///Set the default ellipsoid void TransMercatorMapProjection ::SetEllipsoid() { @@ -45,42 +45,42 @@ void TransMercatorMapProjection m_TransMercatorProjection = new ossimTransMercatorProjection(ellipse,origin,80000.0,100000.0,1.0); } -///Sp�cification du false easting +///Set the false easting void TransMercatorMapProjection ::SetFalseEasting(double falseEasting) { m_TransMercatorProjection->setFalseEasting(falseEasting); } -///Sp�cification du false Northing +///Set the False Northing void TransMercatorMapProjection ::SetFalseNorthing(double falseNorthing) { m_TransMercatorProjection->setFalseNorthing(falseNorthing); } -///Sp�cification du scaleFactor +///Set the scale factor void TransMercatorMapProjection ::SetScaleFactor(double scaleFactor) { m_TransMercatorProjection->setScaleFactor(scaleFactor); } -///Instanciation de tous les param�tres +///Set the parameters void TransMercatorMapProjection ::SetParameters(double falseEasting,double falseNorthing,double scaleFactor) { m_TransMercatorProjection->setParameters(falseEasting, falseNorthing, scaleFactor); } -///Instanciation avec les param�tres par d�faut +///Set the default parameters void TransMercatorMapProjection ::SetDefaults() { m_TransMercatorProjection->setDefaults(); } -///Instanciation avec les param�tres par d�faut +///\return the scale factor double TransMercatorMapProjection ::GetScaleFactor() const { @@ -90,7 +90,7 @@ double TransMercatorMapProjection return scaleFactor; } -///M�thode pour r�cup�rer le FalseNorthing(pour �viter les coordonn�es n�gatives) +///\return the false northing (avoid negative coordinates) double TransMercatorMapProjection ::GetFalseNorthing() const { @@ -99,7 +99,7 @@ double TransMercatorMapProjection return falseNorthing; } -///M�thode pour r�cup�rer le FalseEasting(pour �viter les coordonn�es n�gatives) +///\return the false easting (avoid negative coordinates) double TransMercatorMapProjection ::GetFalseEasting() const { diff --git a/Code/Projections/otbTransMercatorMapProjection.h b/Code/Projections/otbTransMercatorMapProjection.h index c8ba43f2079fa15d666ebc90fa17e59d33d1219c..72636d415d887c11c0435bddef4101938fbc1664 100644 --- a/Code/Projections/otbTransMercatorMapProjection.h +++ b/Code/Projections/otbTransMercatorMapProjection.h @@ -24,7 +24,11 @@ namespace otb { - + /** \class TransMercatorMapProjection + * \brief This class implements the TransMercator map projection. + * It converts coordinates in longitude,latitude to TransMercator map coordinates. + * + */ class ITK_EXPORT TransMercatorMapProjection : public MapProjection<ossimTransMercatorProjection> { public : diff --git a/Code/Projections/otbUtmMapProjection.cxx b/Code/Projections/otbUtmMapProjection.cxx index ee5d8b986b15ea33cefe81513865e8e36567abdc..94d2555ee2f6e8331369dc6799d42f6d73975e7e 100644 --- a/Code/Projections/otbUtmMapProjection.cxx +++ b/Code/Projections/otbUtmMapProjection.cxx @@ -15,7 +15,6 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ - #include "otbUtmMapProjection.h" namespace otb @@ -33,7 +32,7 @@ UtmMapProjection delete m_utmprojection; } -///Instanciation de UtmProjection avec une zone (2 m�thodes) +///Set the zone void UtmMapProjection ::SetZone(long zone) { @@ -41,6 +40,7 @@ void UtmMapProjection m_utmprojection= new ossimUtmProjection(zone); } +///Set the zone void UtmMapProjection ::SetZone(const InputPointType &ground) { @@ -50,14 +50,14 @@ void UtmMapProjection m_utmprojection->setZone(ossimGround); } -///Sp�cification de l' h�misph�re +///Set the hemisphere void UtmMapProjection ::SetHemisphere(char hemisphere) { m_utmprojection->setHemisphere(hemisphere); } -///R�cup�rer la Zone +///\return the zone long UtmMapProjection ::GetZone() { @@ -67,7 +67,7 @@ long UtmMapProjection return zone; } -///R�cup�rer l'h�misph�re +///\return the hemisphere const char UtmMapProjection ::GetHemisphere() const { diff --git a/Code/Projections/otbUtmMapProjection.h b/Code/Projections/otbUtmMapProjection.h index 16b415dd35a3f64f88b8b267eb10191b99365760..f248b313a8f0b7a5ebf9e0707abb8fca2d8f9dcf 100644 --- a/Code/Projections/otbUtmMapProjection.h +++ b/Code/Projections/otbUtmMapProjection.h @@ -24,7 +24,10 @@ namespace otb { - +/** \class UtmMapProjection + * \brief This class implements the UTM map projection. + * It converts coordinates in longitude,latitude to UTM map coordinates. + */ class ITK_EXPORT UtmMapProjection : public MapProjection<ossimUtmProjection> { public :