diff --git a/Code/BasicFilters/otbStreamingResampleImageFilter.h b/Code/BasicFilters/otbStreamingResampleImageFilter.h
index 72c8529b637ca2b330bca6265afe45362a9d1d23..1ac6e45a8abccaaf76cbf02ed8f037cd7e6a70a1 100644
--- a/Code/BasicFilters/otbStreamingResampleImageFilter.h
+++ b/Code/BasicFilters/otbStreamingResampleImageFilter.h
@@ -176,6 +176,8 @@ protected:
virtual void GenerateInputRequestedRegion();
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
+
private:
StreamingResampleImageFilter(const Self &); //purposely not implemented
void operator =(const Self&); //purposely not implemented
diff --git a/Code/BasicFilters/otbStreamingResampleImageFilter.txx b/Code/BasicFilters/otbStreamingResampleImageFilter.txx
index 3690fe3706eadd2ff11c32d0198d79a00cbf3906..6152a18d59baa66cf9daa782b964a3fa3f717b3b 100644
--- a/Code/BasicFilters/otbStreamingResampleImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingResampleImageFilter.txx
@@ -133,5 +133,19 @@ StreamingResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecisionTy
this->SetOutputSize ( image->GetLargestPossibleRegion().GetSize() );
}
+
+template <class TInputImage, class TOutputImage, class TInterpolatorPrecisionType>
+void
+StreamingResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecisionType>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
+{
+ Superclass::PrintSelf(os, indent);
+ os << indent << "OutputOrigin: " << this->GetOutputOrigin() << std::endl;
+ os << indent << "OutputSpacing: " << this->GetOutputSpacing() << std::endl;
+ os << indent << "OutputStartIndex: " << this->GetOutputStartIndex() << std::endl;
+ os << indent << "OutputSize: " << this->GetOutputSize() << std::endl;
+}
+
+
}
#endif
diff --git a/Code/IO/otbDEMToOrthoImageGenerator.txx b/Code/IO/otbDEMToOrthoImageGenerator.txx
index 28ab56d1be07a7d19c93502a19b8fb646943b2ba..ec38b3395d77da19608e7dfa4121720b037e657e 100644
--- a/Code/IO/otbDEMToOrthoImageGenerator.txx
+++ b/Code/IO/otbDEMToOrthoImageGenerator.txx
@@ -107,7 +107,13 @@ DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
::PrintSelf(std::ostream& os, Indent indent) const
{
Superclass::PrintSelf(os, indent);
- os << indent << "Map projection:" << m_MapProjection->GetWkt() << std::endl;
+ if (m_MapProjection.IsNull())
+ os << indent << "Map projection: NULL" << std::endl;
+ else
+ {
+ os << indent << "Map projection:" << std::endl;
+ m_MapProjection->Print(os, indent.GetNextIndent());
+ }
}
} // namespace otb
diff --git a/Code/Projections/otbGenericMapProjection.h b/Code/Projections/otbGenericMapProjection.h
index b8d1ef6d1f1481066b2bec9c2c71d4baec103210..419c63826f816b4a901c5982c4016aad84427d02 100644
--- a/Code/Projections/otbGenericMapProjection.h
+++ b/Code/Projections/otbGenericMapProjection.h
@@ -106,6 +106,9 @@ public:
protected:
GenericMapProjection();
virtual ~GenericMapProjection();
+
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
+
OssimMapProjectionType* m_MapProjection;
std::string m_ProjectionRefWkt;
diff --git a/Code/Projections/otbGenericMapProjection.txx b/Code/Projections/otbGenericMapProjection.txx
index 61a78a01a54833e74c5ba6773cabd92c190606db..93d74cd43d99de6f8c912ef8d4faaa29f95a7656 100644
--- a/Code/Projections/otbGenericMapProjection.txx
+++ b/Code/Projections/otbGenericMapProjection.txx
@@ -212,6 +212,17 @@ GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions
std::cout << m_MapProjection->print(std::cout);
}
+
+template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
+void
+GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
+{
+ Superclass::PrintSelf(os, indent);
+ os << indent << "ProjectionRefWkt: " << m_ProjectionRefWkt << std::endl;
+}
+
} // namespace otb
#endif
diff --git a/Code/Projections/otbGenericRSResampleImageFilter.h b/Code/Projections/otbGenericRSResampleImageFilter.h
index d32966c1476a64ce7f721604d2dffeeac010aa2b..eeb8646556bc43b35598f8e1bac0be7bb257b59b 100644
--- a/Code/Projections/otbGenericRSResampleImageFilter.h
+++ b/Code/Projections/otbGenericRSResampleImageFilter.h
@@ -277,6 +277,8 @@ protected:
virtual void UpdateTransform();
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
+
private:
GenericRSResampleImageFilter(const Self &); //purposely not implemented
void operator =(const Self&); //purposely not implemented
diff --git a/Code/Projections/otbGenericRSResampleImageFilter.txx b/Code/Projections/otbGenericRSResampleImageFilter.txx
index af1570d695652cf5cac58fd8dc72abc917f793f3..c16a2759c850e65299183f285aaa866848dca632 100644
--- a/Code/Projections/otbGenericRSResampleImageFilter.txx
+++ b/Code/Projections/otbGenericRSResampleImageFilter.txx
@@ -371,12 +371,24 @@ GenericRSResampleImageFilter<TInputImage, TOutputImage>
outputSize[0] = static_cast<unsigned int>(vcl_floor(vcl_abs(sizeCartoX / this->GetOutputSpacing()[0])));
outputSize[1] = static_cast<unsigned int>(vcl_floor(vcl_abs(sizeCartoY / this->GetOutputSpacing()[1])));
this->SetOutputSize(outputSize);
-
- std::cout <<"Output Image params :"
- << " \n OutputSize " << outputSize
- << " \n OutputOrigin " << origin
- << " \n OutputSpacing "<< this->GetOutputSpacing()
- << std::endl;
+}
+
+
+template <class TInputImage, class TOutputImage>
+void
+GenericRSResampleImageFilter<TInputImage, TOutputImage>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
+{
+ Superclass::PrintSelf(os, indent);
+ os << indent << "EstimateInputRpcModel:" << (m_EstimateInputRpcModel ? "On" : "Off") << std::endl;
+ os << indent << "EstimateOutputRpcModel:" << (m_EstimateOutputRpcModel ? "On" : "Off") << std::endl;
+ os << indent << "RpcEstimationUpdated:" << (m_RpcEstimationUpdated ? "True" : "False") << std::endl;
+ os << indent << "OutputOrigin: " << m_Resampler->GetOutputOrigin() << std::endl;
+ os << indent << "OutputSpacing: " << m_Resampler->GetOutputSpacing() << std::endl;
+ os << indent << "OutputStartIndex: " << m_Resampler->GetOutputStartIndex() << std::endl;
+ os << indent << "OutputSize: " << m_Resampler->GetOutputSize() << std::endl;
+ os << indent << "GenericRSTransform: " << std::endl;
+ m_Transform->Print(os, indent.GetNextIndent());
}
}
diff --git a/Code/Projections/otbGenericRSTransform.h b/Code/Projections/otbGenericRSTransform.h
index 189b464ebcb26d767afb670d4267fb3ddb974949..fabed27c16881830e753e85ab728e14a4cbc6889 100644
--- a/Code/Projections/otbGenericRSTransform.h
+++ b/Code/Projections/otbGenericRSTransform.h
@@ -190,13 +190,7 @@ protected:
m_TransformUpToDate = false;
}
- void PrintSelf(std::ostream& os, itk::Indent indent) const
- {
- Superclass::PrintSelf(os, indent);
- os << indent << "Up to date: " << m_TransformUpToDate << std::endl;
- os << indent << "Input transform: " << m_InputTransform << std::endl;
- os << indent << "Output transform: " << m_OutputTransform << std::endl;
- }
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
GenericRSTransform(const Self &); //purposely not implemented
diff --git a/Code/Projections/otbGenericRSTransform.txx b/Code/Projections/otbGenericRSTransform.txx
index ed93d1bdb74be4bf04382bc2e0c57b9ee933d1fa..1b7a74dad8b4f8736363b457ea07a4b62e8d75f0 100644
--- a/Code/Projections/otbGenericRSTransform.txx
+++ b/Code/Projections/otbGenericRSTransform.txx
@@ -346,15 +346,26 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
return inverseTransform;
}
-//TODO
-// template<class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
-// void
-// GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
-// ::PrintSelf() const
-// {
-//
-// std::cout << m_Transform->print(std::cout);
-// }
+template<class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+void
+GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
+{
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Up to date: " << m_TransformUpToDate << std::endl;
+ if (m_TransformUpToDate)
+ {
+ os << indent << "Input transform: "<< std::endl;
+ m_InputTransform->Print(os, indent.GetNextIndent());
+ os << indent << "Output transform: " << std::endl;
+ m_OutputTransform->Print(os, indent.GetNextIndent());
+ }
+ else
+ {
+ os << indent << "Input transform: NULL" << std::endl;
+ os << indent << "Output transform: NULL" << std::endl;
+ }
+}
} // namespace otb
diff --git a/Code/Projections/otbMapProjection.h b/Code/Projections/otbMapProjection.h
index a33b1d74a600c987d8fc15dfcb4c0ceb1f89deef..0f49a245c2f2a5b7634e7ad28c1311af2b7314cc 100644
--- a/Code/Projections/otbMapProjection.h
+++ b/Code/Projections/otbMapProjection.h
@@ -157,6 +157,12 @@ protected:
}
+ virtual void PrintSelf( std::ostream& os, itk::Indent indent ) const
+ {
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Wkt : " << this->GetWkt() << std::endl;
+ }
+
private:
MapProjection(const Self &); //purposely not implemented
void operator =(const Self&); //purposely not implemented
diff --git a/Testing/Code/Projections/otbGenericRSResampleImageFilter.cxx b/Testing/Code/Projections/otbGenericRSResampleImageFilter.cxx
index d18c3ee225eda665e3ed5fd1954e027ba2a29772..37840cfbb4324c30de7d3cf2f0c88edd35d9af9f 100644
--- a/Testing/Code/Projections/otbGenericRSResampleImageFilter.cxx
+++ b/Testing/Code/Projections/otbGenericRSResampleImageFilter.cxx
@@ -48,6 +48,7 @@ int otbGenericRSResampleImageFilterNew(int argc, char* argv[])
{
// SmartPointer instanciation
ImageResamplerType::Pointer resampler = ImageResamplerType::New();
+ std::cout << resampler << std::endl;
return EXIT_SUCCESS;
}
@@ -120,6 +121,7 @@ int otbGenericRSResampleImageFilter(int argc, char* argv[])
resampler->SetOutputRpcGridSize(20);
resampler->EstimateOutputRpcModelOn();
}
+
// Write the resampled image
WriterType::Pointer writer= WriterType::New();
@@ -128,6 +130,8 @@ int otbGenericRSResampleImageFilter(int argc, char* argv[])
writer->SetInput(resampler->GetOutput());
writer->Update();
+ std::cout << resampler << std::endl;
+
return EXIT_SUCCESS;
}
@@ -192,8 +196,8 @@ int otbGenericRSResampleImageFilterFromMap(int argc, char* argv[])
{
resampler->SetInputRpcGridSize(20);
resampler->EstimateInputRpcModelOn();
- }
-
+ }
+
// Write the resampled image
typedef otb::StreamingImageFileWriter<ImageType> WriterType;
WriterType::Pointer writer= WriterType::New();
@@ -202,6 +206,8 @@ int otbGenericRSResampleImageFilterFromMap(int argc, char* argv[])
writer->SetInput(resampler->GetOutput());
writer->Update();
+ std::cout << resampler << std::endl;
+
return EXIT_SUCCESS;
}