Ajout des tess de otbDEMToImageGenerator.

Testing/Code/IO/CMakeLists.txt

@@ -1118,6 +1118,21 @@ ADD_TEST(ioTvDEMHandler ${IO_TESTS}
 # ---  otb::ImageGeometryHandler ---
 ADD_TEST(ioTuImageGeometryHandlerNew ${IO_TESTS} otbImageGeometryHandlerNew )
 
+# ---  otb::DEMToImageGenerator ---
+ADD_TEST(ioTuDEMToImageGeneratorNew ${IO_TESTS} otbDEMToImageGeneratorNew )
+                                                
+ADD_TEST(ioTvDEMToImageGeneratorTest ${IO_TESTS}
+--compare-image ${TOL}  ${BASELINE}/ioTvDEMToImageGenerator.tif
+                        ${TEMP}/ioTvDEMToImageGenerator.tif
+        otbDEMToImageGeneratorTest
+         ${INPUTDATA}/DEM/srtm_directory
+         ${TEMP}/ioTvDEMToImageGenerator.tif
+         44.5
+         6.5
+         500
+         500
+	 0.002	 
+         )
  
 
 #----------------------------------------------------------------------------------
@@ -1184,6 +1199,8 @@ otbSpatialObjectDXFReader.cxx
 otbOSSIMImageMetaDataReaderTest.cxx
 otbDEMHandlerNew.cxx
 otbDEMHandlerTest.cxx
+otbDEMToImageGeneratorNew.cxx
+otbDEMToImageGeneratorTest.cxx
 otbImageGeometryHandlerNew.cxx
 )
 

Testing/Code/IO/otbDEMHandlerNew.cxx

@@ -26,7 +26,7 @@ int otbDEMHandlerNew(int argc, char * argv[])
     {
       const unsigned int Dimension = 2;
       typedef otb::Image<unsigned char,Dimension> ImageType;
-      typedef otb::DEMHandler DEMHandlerType;
+      typedef otb::DEMHandler                      DEMHandlerType;
 
       // Instantiating object
       DEMHandlerType::Pointer object = DEMHandlerType::New();

Testing/Code/IO/otbDEMHandlerTest.cxx

@@ -34,11 +34,11 @@ int otbDEMHandlerTest(int argc, char * argv[])
         bool bOpenDirectory(false);
       
         typedef otb::Image<float,Dimension> ImageType;
-        typedef otb::DEMHandler DEMHandlerType;
+        typedef otb::DEMHandler              DEMHandlerType;
 
         // Instantiating object
-        DEMHandlerType::Pointer DEMHandler = DEMHandlerType::New();
-        bOpenDirectory = DEMHandler->OpenDEMDirectory(srtm_directory);
+        DEMHandlerType::Pointer demHandler = DEMHandlerType::New();
+        bOpenDirectory = demHandler->OpenDEMDirectory(srtm_directory);
         if( bOpenDirectory == false )
         {
                 itkGenericExceptionMacro(<<" OpenDEMDirectory return flase value !!");
@@ -50,14 +50,14 @@ int otbDEMHandlerTest(int argc, char * argv[])
         geoPoint[0] = 44.08;
         geoPoint[1] = 3.6999;
 
-        height=DEMHandler->GetHeightAboveMSL(geoPoint); 
+        height=demHandler->GetHeightAboveMSL(geoPoint); 
 
-				std::ofstream file;
-				file.open(outputfilename);
-				file << "--- HEIGHT ABOVE MSL TEST ---" << std::endl;
-				file << " geoPoint: "<<geoPoint[0]<<" ; "<<geoPoint[1]<< std::endl;
+	std::ofstream file;
+	file.open(outputfilename);
+	file << "--- HEIGHT ABOVE MSL TEST ---" << std::endl;
+	file << " geoPoint: "<<geoPoint[0]<<" ; "<<geoPoint[1]<< std::endl;
         file << " -> Height: "<<height<< std::endl;
-				file.close();
+	file.close();
 
         std::cout << "Height: "<<height<<std::endl;
      

Testing/Code/IO/otbDEMToImageGeneratorNew.cxx

+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+#include "itkExceptionObject.h"
+
+#include "otbDEMToImageGenerator.h"
+#include "otbImage.h"
+
+int otbDEMToImageGeneratorNew(int argc, char * argv[])
+{
+  try
+    {
+      const unsigned int Dimension = 2;
+      typedef otb::Image<unsigned char,Dimension>     ImageType;
+      typedef otb::DEMToImageGenerator<ImageType>     DEMToImageGeneratorType;
+
+      // Instantiating object
+      DEMToImageGeneratorType::Pointer object = DEMToImageGeneratorType::New();
+    }
+
+  catch( itk::ExceptionObject & err ) 
+    { 
+    std::cout << "Exception itk::ExceptionObject thrown !" << std::endl; 
+    std::cout << err << std::endl; 
+    return EXIT_FAILURE;
+    } 
+
+  catch( ... ) 
+    { 
+    std::cout << "Unknown exception thrown !" << std::endl; 
+    return EXIT_FAILURE;
+    } 
+  return EXIT_SUCCESS;
+}

Testing/Code/IO/otbDEMToImageGeneratorTest.cxx

+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+#include "itkExceptionObject.h"
+
+#include "otbDEMToImageGenerator.h"
+#include "otbImageFileWriter.h"
+#include "otbImage.h"
+
+int otbDEMToImageGeneratorTest(int argc, char * argv[])
+{
+  if(argc<7)
+    {
+      std::cout << argv[0] <<" folder path , output filename , X Output Orign point , Y Output Origin point , X Output Size, Y Output size , Spacing"  << std::endl;
+      return EXIT_FAILURE;
+    }
+  
+  char * folderPath = argv[1];
+  char * outputName = argv[2];
+  
+  const unsigned int Dimension = 2;
+  typedef otb::Image<double , Dimension>           ImageType;
+  typedef otb::DEMToImageGenerator<ImageType>      DEMToImageGeneratorType;
+  typedef DEMToImageGeneratorType::DEMHandlerType  DEMHandlerType;
+  typedef DEMHandlerType::PointType                PointType;
+  typedef DEMToImageGeneratorType::SizeType        SizeType;
+  typedef DEMToImageGeneratorType::SpacingType     SpacingType;
+  typedef otb::ImageFileWriter<ImageType>          WriterType;
+  
+  // Instantiating object
+  DEMToImageGeneratorType::Pointer object = DEMToImageGeneratorType::New();
+  WriterType::Pointer              writer = WriterType::New();
+  
+  PointType origin;
+  origin[0] = ::atof(argv[3]);
+  origin[1] = ::atof(argv[4]);
+  SizeType size;
+  size[0] = ::atoi(argv[5]);
+  size[1] = ::atoi(argv[6]);
+  SpacingType spacing(::atof(argv[7]));
+ 
+  object->SetDEMDirectoryPath(folderPath);
+  object->SetOutputOrigin(origin);
+  object->SetOutputSize(size);
+  object->SetOutputSpacing(spacing);
+
+  writer->SetFileName( outputName );
+  writer->SetInput( object->GetOutput() );
+
+   try
+    {
+      writer->Update();
+    }
+  
+  catch( itk::ExceptionObject & err ) 
+    { 
+      std::cout << "Exception itk::ExceptionObject thrown !" << std::endl; 
+      std::cout << err << std::endl; 
+    return EXIT_FAILURE;
+    } 
+  
+  catch( ... ) 
+    { 
+      std::cout << "Unknown exception thrown !" << std::endl; 
+      return EXIT_FAILURE;
+    } 
+  return EXIT_SUCCESS;
+}

Testing/Code/IO/otbIOTests.cxx

@@ -77,4 +77,6 @@ REGISTER_TEST(otbOSSIMImageMetaDataReaderTest);
 REGISTER_TEST(otbDEMHandlerNew);
 REGISTER_TEST(otbDEMHandlerTest);
 REGISTER_TEST(otbImageGeometryHandlerNew);
+REGISTER_TEST(otbDEMToImageGeneratorNew);
+REGISTER_TEST(otbDEMToImageGeneratorTest);
 }