Skip to content
Snippets Groups Projects
Commit 54139244 authored by Julien Michel's avatar Julien Michel
Browse files

Correction warning de compilation enum.

parent 757a18ac
Branches
Tags
No related merge requests found
...@@ -75,8 +75,9 @@ itkNewMacro( Self ); ...@@ -75,8 +75,9 @@ itkNewMacro( Self );
/** Run-time type information (and related methods). */ /** Run-time type information (and related methods). */
itkTypeMacro( MapProjection, Transform ); itkTypeMacro( MapProjection, Transform );
typedef InverseOrForwardTransformationEnum DirectionOfMappingEnumType;
itkStaticConstMacro(DirectionOfMapping,InverseOrForwardTransformationEnum,transform); itkStaticConstMacro(DirectionOfMapping,DirectionOfMappingEnumType,transform);
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions); itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions); itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
itkStaticConstMacro(SpaceDimension, unsigned int, NInputDimensions); itkStaticConstMacro(SpaceDimension, unsigned int, NInputDimensions);
......
...@@ -136,34 +136,40 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi ...@@ -136,34 +136,40 @@ MapProjection<TOssimMapProjection, TScalarType, NInputDimensions, NOutputDimensi
{ {
OutputPointType outputPoint; OutputPointType outputPoint;
if (DirectionOfMapping == INVERSE) switch(DirectionOfMapping)
{ {
//On transforme le type "itk::point" en type "ossim::ossimDpt" case INVERSE:
ossimDpt ossimDPoint(point[0], point[1]); {
//On transforme le type "itk::point" en type "ossim::ossimDpt"
//On le projte sur la carte ossimDpt ossimDPoint(point[0], point[1]);
ossimGpt ossimGPoint;
ossimGPoint=m_MapProjection->inverse(ossimDPoint); //On le projte sur la carte
ossimGpt ossimGPoint;
outputPoint[0]=ossimGPoint.lat; ossimGPoint=m_MapProjection->inverse(ossimDPoint);
outputPoint[1]=ossimGPoint.lon;
} outputPoint[0]=ossimGPoint.lat;
else if (DirectionOfMapping == FORWARD) outputPoint[1]=ossimGPoint.lon;
break;
}
case FORWARD:
{ {
//On transforme le type "itk::point" en type "ossim::ossimGpt" //On transforme le type "itk::point" en type "ossim::ossimGpt"
ossimGpt ossimGPoint(point[0], point[1]); ossimGpt ossimGPoint(point[0], point[1]);
//On le projte sur la carte //On le projte sur la carte
ossimDpt ossimDPoint; ossimDpt ossimDPoint;
ossimDPoint=m_MapProjection->forward(ossimGPoint); ossimDPoint=m_MapProjection->forward(ossimGPoint);
outputPoint[0]=ossimDPoint.x; outputPoint[0]=ossimDPoint.x;
outputPoint[1]=ossimDPoint.y; outputPoint[1]=ossimDPoint.y;
break;
} }
else default:
{ {
itkExceptionMacro(<<"Model is INVERSE or FORWARD only !!"); itkExceptionMacro(<<"Model is INVERSE or FORWARD only !!");
} break;
}
}
return outputPoint; return outputPoint;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment