Skip to content
Snippets Groups Projects
Commit 9e163030 authored by Emmanuel Christophe's avatar Emmanuel Christophe
Browse files

ENH: better templates in Transforms

parent facd9518
Branches
Tags
No related merge requests found
...@@ -172,7 +172,6 @@ void PointSetFileReader<TOutputPointSet> ...@@ -172,7 +172,6 @@ void PointSetFileReader<TOutputPointSet>
point[1] = p.GetY(); point[1] = p.GetY();
point[2] = p.GetZ(); point[2] = p.GetZ();
unsigned long i = output->GetNumberOfPoints(); unsigned long i = output->GetNumberOfPoints();
output->SetPoint( i, point ); output->SetPoint( i, point );
......
...@@ -39,15 +39,15 @@ namespace otb ...@@ -39,15 +39,15 @@ namespace otb
* \ingroup Transform * \ingroup Transform
*/ */
typedef enum //typedef enum
{ //{
PROJDEFAULT=0, // PROJDEFAULT=0,
PROJIDENTITY=1, // PROJIDENTITY=1,
PROJMAPFORWARD=2, // PROJMAPFORWARD=2,
PROJMAPINVERSE=3, // PROJMAPINVERSE=3,
PROJSENSORFORWARD=4, // PROJSENSORFORWARD=4,
PROJSENSORINVERSE=5 // PROJSENSORINVERSE=5
} ProjectionTypeEnum; //} ProjectionTypeEnum;
template <class TFirstTransform, template <class TFirstTransform,
class TSecondTransform, class TSecondTransform,
......
...@@ -82,7 +82,7 @@ NOutputDimensions> ...@@ -82,7 +82,7 @@ NOutputDimensions>
SecondTransformOutputPointType outputPoint; SecondTransformOutputPointType outputPoint;
outputPoint=m_SecondTransform->TransformPoint(geoPoint); outputPoint=m_SecondTransform->TransformPoint(geoPoint);
// otbMsgDevMacro(<< "Converting: " << point1 << " -> " << geoPoint<< " -> " << outputPoint); // otbMsgDevMacro(<< std::setprecision(15) << "Converting: " << point1 << " -> " << geoPoint<< " -> " << outputPoint);
return outputPoint; return outputPoint;
} }
......
...@@ -265,6 +265,8 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions> ...@@ -265,6 +265,8 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
outputPoint[0] = (outputPoint[0] - m_OutputOrigin[0]) / m_OutputSpacing[0]; outputPoint[0] = (outputPoint[0] - m_OutputOrigin[0]) / m_OutputSpacing[0];
outputPoint[1] = (outputPoint[1] - m_OutputOrigin[1]) / m_OutputSpacing[1]; outputPoint[1] = (outputPoint[1] - m_OutputOrigin[1]) / m_OutputSpacing[1];
// otbMsgDevMacro("GenericRSTransform: " << point << " -> " << outputPoint);
return outputPoint; return outputPoint;
} }
......
...@@ -86,7 +86,10 @@ InverseSensorModel< TScalarType, NInputDimensions, NOutputDimensions> ...@@ -86,7 +86,10 @@ InverseSensorModel< TScalarType, NInputDimensions, NOutputDimensions>
outputPoint[0]=ossimDPoint.x; outputPoint[0]=ossimDPoint.x;
outputPoint[1]=ossimDPoint.y; outputPoint[1]=ossimDPoint.y;
if (OutputPointType::PointDimension == 3)
{
outputPoint[2] = ossimGPoint.height();
}
// otbMsgDevMacro(<< "Point in sensor geometry: (" << outputPoint[0] << "," << outputPoint[1] << ")"); // otbMsgDevMacro(<< "Point in sensor geometry: (" << outputPoint[0] << "," << outputPoint[1] << ")");
return outputPoint; return outputPoint;
......
...@@ -37,7 +37,7 @@ template < class TScalarType, ...@@ -37,7 +37,7 @@ template < class TScalarType,
unsigned int NInputDimensions, unsigned int NInputDimensions,
unsigned int NOutputDimensions > unsigned int NOutputDimensions >
SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions> SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
::SensorModelBase() ::SensorModelBase(): Superclass(OutputSpaceDimension, 0)
{ {
m_Model = NULL; m_Model = NULL;
m_DEMHandler = DEMHandlerType::New(); m_DEMHandler = DEMHandlerType::New();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment