Commit bd264ea6 authored by Romain Garrigues's avatar Romain Garrigues
Browse files

nomsg

parent b94abac2
......@@ -15,10 +15,10 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbDEMReader_cxx
#define __otbDEMReader_cxx
#ifndef __otbDEMHandler_cxx
#define __otbDEMHandler_cxx
#include "otbDEMReader.h"
#include "otbDEMHandler.h"
#include "otbMacro.h"
namespace otb
......@@ -26,16 +26,16 @@ namespace otb
DEMReader
::DEMReader()
DEMHandler
::DEMHandler()
{
m_ElevManager=ossimElevManager::instance();
}
DEMReader
::~DEMReader()
DEMHandler
::~DEMHandler()
{
// not needed, m_ElevManager created with instance() method
// delete m_ElevManager;
......@@ -44,7 +44,7 @@ DEMReader
bool
DEMReader
DEMHandler
::OpenDEMDirectory(const char* DEMDirectory)
{
ossimFilename ossimDEMDir;
......@@ -59,7 +59,7 @@ DEMReader
double
DEMReader
DEMHandler
::GetHeightAboveMSL(const PointType& geoPoint)
{
float height;
......@@ -72,12 +72,12 @@ DEMReader
void
DEMReader
DEMHandler
::PrintSelf(std::ostream& os, Indent indent) const
{
Superclass::PrintSelf(os,indent);
os << indent << "DEMReader" << std::endl;
os << indent << "DEMHandler" << std::endl;
}
} // namespace otb
......
......@@ -15,8 +15,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbDEMReader_h
#define __otbDEMReader_h
#ifndef __otbDEMHandler_h
#define __otbDEMHandler_h
#include "itkIndent.h"
#include "itkImageSource.h"
......@@ -30,7 +30,7 @@
namespace otb
{
/** \class DEMReader
/** \class DEMHandler
*
* \brief Class for Reading a DEM data
*
......@@ -41,12 +41,12 @@ namespace otb
*
*/
class ITK_EXPORT DEMReader: public itk::Object
class ITK_EXPORT DEMHandler: public itk::Object
{
public :
/** Standard class typedefs. */
typedef itk::Indent Indent;
typedef DEMReader Self;
typedef DEMHandler Self;
typedef itk::Object Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
......@@ -57,7 +57,7 @@ public :
itkNewMacro(Self);
/** Run-time type information (and related methods). */
itkTypeMacro(DEMReader,Object);
itkTypeMacro(DEMHandler,Object);
/** Try to open the DEM directory. */
bool OpenDEMDirectory(const char* DEMDirectory);
......@@ -66,8 +66,8 @@ public :
virtual double GetHeightAboveMSL(const PointType& geoPoint);
protected:
DEMReader();
~DEMReader();
DEMHandler();
~DEMHandler();
void PrintSelf(std::ostream& os, Indent indent) const;
......
......@@ -19,7 +19,7 @@
#define __otbInverseSensorModel_h
#include "otbSensorModelBase.h"
#include "otbDEMReader.h"
#include "otbDEMHandler.h"
#include "itkMacro.h"
#include "itkSmartPointer.h"
......@@ -66,7 +66,7 @@ public :
typedef typename Superclass::OutputPointType OutputPointType;
//typedef otb::Image<double, NInputDimensions> ImageType;
typedef DEMReader DEMHandlerType;
typedef DEMHandler DEMHandlerType;
typedef typename DEMHandlerType::Pointer DEMHandlerPointerType;
/** Method for creation through the object factory. */
......
......@@ -76,8 +76,7 @@ int otbOrthoRectificationFilter( int argc, char* argv[] )
typedef otb::ImageFileReader<ImageType> ReaderType;
// typedef otb::ImageFileWriter<ImageType> WriterType;
typedef otb::StreamingImageFileWriter<ImageType> WriterType;
typedef itk::Transform<double,2,2> TransformType;
// typedef otb::InverseSensorModel<double> ModelType;
typedef itk::LinearInterpolateImageFunction<ImageType, double > InterpolatorType;
......
......@@ -3,7 +3,7 @@
* PURPOSE:
*
* Application pour projeter une rgion d'une image en coordonnes gographiques
* en utilisant un Interpolator+regionextractor+Iterator+DEMReader.
* en utilisant un Interpolator+regionextractor+Iterator+DEMHandler.
* Prise en compte du MNT
*/
......@@ -26,7 +26,7 @@
#include "otbMapProjections.h"
#include "otbMapProjection.h"
#include "otbDEMReader.h"
#include "otbDEMHandler.h"
int otbSensorImageDEMToCarto( int argc, char* argv[] )
{
......@@ -121,11 +121,11 @@ ossimKeywordlist geom_kwl;
ModelType::OutputPointType inputpoint;
/********************************************************/
/* Cration d'un DEMReader */
/* Cration d'un DEMHandler */
/********************************************************/
typedef otb::DEMReader DEMReaderType;
DEMReaderType::Pointer otbElevManager=DEMReaderType::New();
typedef otb::DEMHandler DEMHandlerType;
DEMHandlerType::Pointer otbElevManager=DEMHandlerType::New();
double height;
/********************************************************/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment