diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3c893e7822b9764ae38649a9b9eec6aa6857752..5d6fb4bf31684ed6999c80a224f82877b2d76452 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -422,127 +422,134 @@ ENDIF(OTB_USE_EXTERNAL_BOOST)
# GDAL Library
#-------------------------------
-FIND_PATH(GDAL_INCLUDE_DIRS gdal.h $ENV{GDAL_INCLUDE_DIRS} /usr/include/gdal)
-
-IF (NOT GDAL_INCLUDE_DIRS)
-MESSAGE(FATAL_ERROR
- "Cannot find GDAL include directory. Please set GDAL_INCLUDE_DIRS.")
-ENDIF (NOT GDAL_INCLUDE_DIRS)
-
-INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIRS})
-
-FIND_LIBRARY(GDAL_LIBRARY NAMES gdal gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 PATHS /usr/lib/gdal)
-
-IF (NOT GDAL_LIBRARY)
-MESSAGE(FATAL_ERROR
- "Cannot find GDAL library. Please set GDAL_LIBRARY.")
-ENDIF (NOT GDAL_LIBRARY)
-MESSAGE(STATUS "GDAL library found: ${GDAL_LIBRARY}")
-
-# Find geotiff headers
-FIND_PATH(GEOTIFF_INCLUDE_DIRS geotiff.h $ENV{GDAL_INCLUDE_DIRS} ${GDAL_INCLUDE_DIRS} /usr/include/geotiff)
-IF (NOT GEOTIFF_INCLUDE_DIRS)
-MESSAGE(FATAL_ERROR
- "Cannot find geotiff headers. Please set GEOTIFF_INCLUDE_DIRS.")
-ENDIF (NOT GEOTIFF_INCLUDE_DIRS)
-INCLUDE_DIRECTORIES(${GEOTIFF_INCLUDE_DIRS})
-
-# Find tiff headers
-FIND_PATH(TIFF_INCLUDE_DIRS tiffio.h $ENV{GDAL_INCLUDE_DIRS} ${GDAL_INCLUDE_DIRS} /usr/include)
-IF (NOT TIFF_INCLUDE_DIRS)
-MESSAGE(FATAL_ERROR
- "Cannot find libtiff headers. Please set TIFF_INCLUDE_DIRS.")
-ENDIF (NOT TIFF_INCLUDE_DIRS)
-INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIRS})
-
-# Find jpeg headers
-FIND_PATH(JPEG_INCLUDE_DIRS jpeglib.h $ENV{GDAL_INCLUDE_DIRS} ${GDAL_INCLUDE_DIRS} /usr/include)
-IF (NOT JPEG_INCLUDE_DIRS)
-MESSAGE(FATAL_ERROR
- "Cannot find jpeg headers. Please set JPEG_INCLUDE_DIRS.")
-ENDIF (NOT JPEG_INCLUDE_DIRS)
-INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIRS})
-
-# Find ogr headers
-FIND_PATH(OGR_INCLUDE_DIRS ogrsf_frmts.h $ENV{GDAL_INCLUDE_DIRS} ${GDAL_INCLUDE_DIRS} /usr/include)
-IF (NOT OGR_INCLUDE_DIRS)
-MESSAGE(FATAL_ERROR
- "Cannot find ogr headers. Please set OGR_INCLUDE_DIRS.")
-ENDIF (NOT OGR_INCLUDE_DIRS)
-INCLUDE_DIRECTORIES(${OGR_INCLUDE_DIRS})
-
-# Check if ${GDAL_LIBRARY} has tiff library
-TRY_COMPILE(GDAL_HAS_TIFF
-${CMAKE_CURRENT_BINARY_DIR}/CMake
-${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestGDALHasTiff.cxx
-CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${TIFF_INCLUDE_DIRS};${GDAL_INCLUDE_DIRS}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
-OUTPUT_VARIABLE OUTPUT)
-IF(GDAL_HAS_TIFF)
-MESSAGE(STATUS "Testing if GDAL has tiff -- yes")
-SET(TIFF_LIBRARY ${GDAL_LIBRARY})
-ELSE(GDAL_HAS_TIFF)
-MESSAGE(STATUS "Testing if GDAL has tiff -- no")
-FIND_LIBRARY(TIFF_LIBRARY tiff PATHS)
-IF (NOT TIFF_LIBRARY)
-MESSAGE(FATAL_ERROR
- "Cannot find tiff library. Please set TIFF_LIBRARY.")
-ENDIF (NOT TIFF_LIBRARY)
-ENDIF(GDAL_HAS_TIFF)
-
-# Check if ${GDAL_LIBRARY} has geotiff library
-TRY_COMPILE(GDAL_HAS_GEOTIFF
-${CMAKE_CURRENT_BINARY_DIR}/CMake
-${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestGDALHasGeoTiff.cxx
-CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${GEOTIFF_INCLUDE_DIRS};${GDAL_INCLUDE_DIRS}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
-OUTPUT_VARIABLE OUTPUT)
-IF(GDAL_HAS_GEOTIFF)
-MESSAGE(STATUS "Testing if GDAL has geotiff -- yes")
-SET(GEOTIFF_LIBRARY ${GDAL_LIBRARY})
-ELSE(GDAL_HAS_GEOTIFF)
-MESSAGE(STATUS "Testing if GDAL has geotiff -- no")
-FIND_LIBRARY(GEOTIFF_LIBRARY geotiff PATHS)
-IF (NOT GEOTIFF_LIBRARY)
-MESSAGE(FATAL_ERROR
- "Cannot find geotiff library. Please set GEOTIFF_LIBRARY.")
-ENDIF (NOT GEOTIFF_LIBRARY)
-ENDIF(GDAL_HAS_GEOTIFF)
-
-# Check if ${GDAL_LIBRARY} has jpeg library
-TRY_COMPILE(GDAL_HAS_JPEG
-${CMAKE_CURRENT_BINARY_DIR}/CMake
-${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestGDALHasJpeg.cxx
-CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${JPEG_INCLUDE_DIRS};${GDAL_INCLUDE_DIRS}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
-OUTPUT_VARIABLE OUTPUT)
-IF(GDAL_HAS_JPEG)
-MESSAGE(STATUS "Testing if GDAL has jpeg -- yes")
-SET(JPEG_LIBRARY ${GDAL_LIBRARY})
-ELSE(GDAL_HAS_JPEG)
-MESSAGE(STATUS "Testing if GDAL has jpeg -- no")
-FIND_LIBRARY(JPEG_LIBRARY jpeg PATHS)
-IF (NOT JPEG_LIBRARY)
-MESSAGE(FATAL_ERROR
- "Cannot find jpeg library. Please set JPEG_LIBRARY.")
-ENDIF (NOT JPEG_LIBRARY)
-ENDIF(GDAL_HAS_JPEG)
-
-# Check if ${GDAL_LIBRARY} has jpeg library
-TRY_COMPILE(GDAL_HAS_OGR
-${CMAKE_CURRENT_BINARY_DIR}/CMake
-${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestGDALHasOGR.cxx
-CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${OGR_INCLUDE_DIRS};${GDAL_INCLUDE_DIRS}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
-OUTPUT_VARIABLE OUTPUT)
-IF(GDAL_HAS_OGR)
-MESSAGE(STATUS "Testing if GDAL has OGR -- yes")
-SET(OGR_LIBRARY ${GDAL_LIBRARY})
-ELSE(GDAL_HAS_OGR)
-MESSAGE(STATUS "Testing if GDAL has OGR -- no")
-MESSAGE(FATAL_ERROR "OGR MESSAGE: ${OUTPUT}")
-FIND_LIBRARY(OGR_LIBRARY ogr PATHS)
-IF (NOT OGR_LIBRARY)
-MESSAGE(FATAL_ERROR
- "Cannot find ogr library. Please set OGR_LIBRARY.")
-ENDIF (NOT OGR_LIBRARY)
-ENDIF(GDAL_HAS_OGR)
+# Option for internal/external BOOST
+OPTION(OTB_USE_EXTERNAL_GDAL "Use an outside build of GDAL." ON)
+MARK_AS_ADVANCED(OTB_USE_EXTERNAL_GDAL)
+
+IF(OTB_USE_EXTERNAL_GDAL)
+ FIND_PATH(GDAL_INCLUDE_DIRS gdal.h $ENV{GDAL_INCLUDE_DIRS} /usr/include/gdal)
+
+ IF (NOT GDAL_INCLUDE_DIRS)
+ MESSAGE(FATAL_ERROR
+ "Cannot find GDAL include directory. Please set GDAL_INCLUDE_DIRS.")
+ ENDIF (NOT GDAL_INCLUDE_DIRS)
+
+ INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIRS})
+
+ FIND_LIBRARY(GDAL_LIBRARY NAMES gdal gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 PATHS /usr/lib/gdal)
+
+ IF (NOT GDAL_LIBRARY)
+ MESSAGE(FATAL_ERROR
+ "Cannot find GDAL library. Please set GDAL_LIBRARY.")
+ ENDIF (NOT GDAL_LIBRARY)
+ MESSAGE(STATUS "GDAL library found: ${GDAL_LIBRARY}")
+
+ # Find geotiff headers
+ FIND_PATH(GEOTIFF_INCLUDE_DIRS geotiff.h $ENV{GDAL_INCLUDE_DIRS} ${GDAL_INCLUDE_DIRS} /usr/include/geotiff)
+ IF (NOT GEOTIFF_INCLUDE_DIRS)
+ MESSAGE(FATAL_ERROR
+ "Cannot find geotiff headers. Please set GEOTIFF_INCLUDE_DIRS.")
+ ENDIF (NOT GEOTIFF_INCLUDE_DIRS)
+ INCLUDE_DIRECTORIES(${GEOTIFF_INCLUDE_DIRS})
+
+ # Find tiff headers
+ FIND_PATH(TIFF_INCLUDE_DIRS tiffio.h $ENV{GDAL_INCLUDE_DIRS} ${GDAL_INCLUDE_DIRS} /usr/include)
+ IF (NOT TIFF_INCLUDE_DIRS)
+ MESSAGE(FATAL_ERROR
+ "Cannot find libtiff headers. Please set TIFF_INCLUDE_DIRS.")
+ ENDIF (NOT TIFF_INCLUDE_DIRS)
+ INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIRS})
+
+ # Find jpeg headers
+ FIND_PATH(JPEG_INCLUDE_DIRS jpeglib.h $ENV{GDAL_INCLUDE_DIRS} ${GDAL_INCLUDE_DIRS} /usr/include)
+ IF (NOT JPEG_INCLUDE_DIRS)
+ MESSAGE(FATAL_ERROR
+ "Cannot find jpeg headers. Please set JPEG_INCLUDE_DIRS.")
+ ENDIF (NOT JPEG_INCLUDE_DIRS)
+ INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIRS})
+
+ # Find ogr headers
+ FIND_PATH(OGR_INCLUDE_DIRS ogrsf_frmts.h $ENV{GDAL_INCLUDE_DIRS} ${GDAL_INCLUDE_DIRS} /usr/include)
+ IF (NOT OGR_INCLUDE_DIRS)
+ MESSAGE(FATAL_ERROR
+ "Cannot find ogr headers. Please set OGR_INCLUDE_DIRS.")
+ ENDIF (NOT OGR_INCLUDE_DIRS)
+ INCLUDE_DIRECTORIES(${OGR_INCLUDE_DIRS})
+
+ # Check if ${GDAL_LIBRARY} has tiff library
+ TRY_COMPILE(GDAL_HAS_TIFF
+ ${CMAKE_CURRENT_BINARY_DIR}/CMake
+ ${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestGDALHasTiff.cxx
+ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${TIFF_INCLUDE_DIRS};${GDAL_INCLUDE_DIRS}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
+ OUTPUT_VARIABLE OUTPUT)
+ IF(GDAL_HAS_TIFF)
+ MESSAGE(STATUS "Testing if GDAL has tiff -- yes")
+ SET(TIFF_LIBRARY ${GDAL_LIBRARY})
+ ELSE(GDAL_HAS_TIFF)
+ MESSAGE(STATUS "Testing if GDAL has tiff -- no")
+ FIND_LIBRARY(TIFF_LIBRARY tiff PATHS)
+ IF (NOT TIFF_LIBRARY)
+ MESSAGE(FATAL_ERROR
+ "Cannot find tiff library. Please set TIFF_LIBRARY.")
+ ENDIF (NOT TIFF_LIBRARY)
+ ENDIF(GDAL_HAS_TIFF)
+
+ # Check if ${GDAL_LIBRARY} has geotiff library
+ TRY_COMPILE(GDAL_HAS_GEOTIFF
+ ${CMAKE_CURRENT_BINARY_DIR}/CMake
+ ${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestGDALHasGeoTiff.cxx
+ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${GEOTIFF_INCLUDE_DIRS};${GDAL_INCLUDE_DIRS}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
+ OUTPUT_VARIABLE OUTPUT)
+ IF(GDAL_HAS_GEOTIFF)
+ MESSAGE(STATUS "Testing if GDAL has geotiff -- yes")
+ SET(GEOTIFF_LIBRARY ${GDAL_LIBRARY})
+ ELSE(GDAL_HAS_GEOTIFF)
+ MESSAGE(STATUS "Testing if GDAL has geotiff -- no")
+ FIND_LIBRARY(GEOTIFF_LIBRARY geotiff PATHS)
+ IF (NOT GEOTIFF_LIBRARY)
+ MESSAGE(FATAL_ERROR
+ "Cannot find geotiff library. Please set GEOTIFF_LIBRARY.")
+ ENDIF (NOT GEOTIFF_LIBRARY)
+ ENDIF(GDAL_HAS_GEOTIFF)
+
+ # Check if ${GDAL_LIBRARY} has jpeg library
+ TRY_COMPILE(GDAL_HAS_JPEG
+ ${CMAKE_CURRENT_BINARY_DIR}/CMake
+ ${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestGDALHasJpeg.cxx
+ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${JPEG_INCLUDE_DIRS};${GDAL_INCLUDE_DIRS}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
+ OUTPUT_VARIABLE OUTPUT)
+ IF(GDAL_HAS_JPEG)
+ MESSAGE(STATUS "Testing if GDAL has jpeg -- yes")
+ SET(JPEG_LIBRARY ${GDAL_LIBRARY})
+ ELSE(GDAL_HAS_JPEG)
+ MESSAGE(STATUS "Testing if GDAL has jpeg -- no")
+ FIND_LIBRARY(JPEG_LIBRARY jpeg PATHS)
+ IF (NOT JPEG_LIBRARY)
+ MESSAGE(FATAL_ERROR
+ "Cannot find jpeg library. Please set JPEG_LIBRARY.")
+ ENDIF (NOT JPEG_LIBRARY)
+ ENDIF(GDAL_HAS_JPEG)
+
+ # Check if ${GDAL_LIBRARY} has jpeg library
+ TRY_COMPILE(GDAL_HAS_OGR
+ ${CMAKE_CURRENT_BINARY_DIR}/CMake
+ ${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestGDALHasOGR.cxx
+ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${OGR_INCLUDE_DIRS};${GDAL_INCLUDE_DIRS}" "-DLINK_LIBRARIES:STRING=${GDAL_LIBRARY}"
+ OUTPUT_VARIABLE OUTPUT)
+ IF(GDAL_HAS_OGR)
+ MESSAGE(STATUS "Testing if GDAL has OGR -- yes")
+ SET(OGR_LIBRARY ${GDAL_LIBRARY})
+ ELSE(GDAL_HAS_OGR)
+ MESSAGE(STATUS "Testing if GDAL has OGR -- no")
+ MESSAGE(FATAL_ERROR "OGR MESSAGE: ${OUTPUT}")
+ FIND_LIBRARY(OGR_LIBRARY ogr PATHS)
+ IF (NOT OGR_LIBRARY)
+ MESSAGE(FATAL_ERROR
+ "Cannot find ogr library. Please set OGR_LIBRARY.")
+ ENDIF (NOT OGR_LIBRARY)
+ ENDIF(GDAL_HAS_OGR)
+ELSE(OTB_USE_EXTERNAL_GDAL)
+ENDIF(OTB_USE_EXTERNAL_GDAL)
#-------------------------------
diff --git a/Code/IO/otbDEMHandler.cxx b/Code/IO/otbDEMHandler.cxx
index 8fe5ace4e1eafd4150238f5913c1e43f11fc6c7a..c589fd4398b9169009d3cdb1f0fa508ac2c1aa18 100644
--- a/Code/IO/otbDEMHandler.cxx
+++ b/Code/IO/otbDEMHandler.cxx
@@ -18,26 +18,26 @@ PURPOSE. See the above copyright notices for more information.
#include "otbDEMHandler.h"
#include "otbMacro.h"
+#include "elevation/ossimElevManager.h"
+#include "base/ossimGeoidManager.h"
+#include "base/ossimFilename.h"
+#include "base/ossimDirectory.h"
+#include "base/ossimGeoidEgm96.h"
+
namespace otb
{
-
DEMHandler
-::DEMHandler()
+::DEMHandler():
+ m_ElevManager(ossimElevManager::instance())
{
- m_ElevManager=ossimElevManager::instance();
}
-
DEMHandler
::~DEMHandler()
{
- // not needed, m_ElevManager created with instance() method
- // delete m_ElevManager;
}
-
-
void
DEMHandler
::OpenDEMDirectory(const char* DEMDirectory)
@@ -52,14 +52,35 @@ DEMHandler
m_Mutex.Unlock();
itkExceptionMacro("Failed to open DEM Directory: "<<ossimDEMDir);
}
-
m_Mutex.Unlock();
}
+void
+DEMHandler
+::OpenGeoidFile(const char* geoidFile)
+{
+ if ((ossimGeoidManager::instance()->findGeoidByShortName("geoid1996")) == 0)
+ {
+ otbMsgDevMacro( << "Opening geoid: " << geoidFile);
+ ossimFilename geoid(geoidFile);
+ ossimGeoid* geoidPtr = new ossimGeoidEgm96(geoid);
+ if (geoidPtr->getErrorStatus() == ossimErrorCodes::OSSIM_OK)
+ {
+ m_Mutex.Lock();
+ ossimGeoidManager::instance()->addGeoid(geoidPtr);
+ m_Mutex.Unlock();
+ }
+ else
+ {
+ delete geoidPtr;
+ }
+ }
+}
+
double
DEMHandler
-::GetHeightAboveMSL(const PointType& geoPoint)
+::GetHeightAboveMSL(const PointType& geoPoint) const
{
double height;
ossimGpt ossimWorldPoint;
@@ -71,10 +92,23 @@ DEMHandler
return height;
}
+double
+DEMHandler
+::GetHeightAboveEllipsoid(const PointType& geoPoint) const
+{
+ double height;
+ ossimGpt ossimWorldPoint;
+ ossimWorldPoint.lon=geoPoint[0];
+ ossimWorldPoint.lat=geoPoint[1];
+ m_Mutex.Lock();
+ height=m_ElevManager->getHeightAboveEllipsoid(ossimWorldPoint);
+ m_Mutex.Unlock();
+ return height;
+}
void
DEMHandler
-::PrintSelf(std::ostream& os, Indent indent) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os,indent);
os << indent << "DEMHandler" << std::endl;
diff --git a/Code/IO/otbDEMHandler.h b/Code/IO/otbDEMHandler.h
index 6009bafa6decc5a2e517efee357ced2a4157a672..de02500dcb6181ae21a259b6e85660299b055ade 100644
--- a/Code/IO/otbDEMHandler.h
+++ b/Code/IO/otbDEMHandler.h
@@ -23,13 +23,13 @@
#include "otbImage.h"
#include <iostream>
#include <stdio.h>
-#include "elevation/ossimElevManager.h"
-#include "base/ossimFilename.h"
-#include "base/ossimDirectory.h"
+
#include "itkImageRegionIteratorWithIndex.h"
#include "itkIndent.h"
#include "itkSimpleFastMutexLock.h"
+class ossimElevManager;
+
namespace otb
{
/** \class DEMHandler
@@ -47,13 +47,12 @@ class ITK_EXPORT DEMHandler: public itk::Object
{
public :
/** Standard class typedefs. */
- typedef itk::Indent Indent;
typedef DEMHandler Self;
- typedef itk::Object Superclass;
+ typedef itk::Object Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
- typedef itk::Point<double, 2> PointType;
+ typedef itk::Point<double, 2> PointType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -64,14 +63,20 @@ public :
/** Try to open the DEM directory. */
virtual void OpenDEMDirectory(const char* DEMDirectory);
+ /** Open geoid file. */
+ virtual void OpenGeoidFile(const char* geoidFile);
+
/** Compute the height above MSL(Mean Sea Level) of a geographic point. */
- virtual double GetHeightAboveMSL(const PointType& geoPoint);
+ virtual double GetHeightAboveMSL(const PointType& geoPoint) const;
+
+ /** Compute the height above ellipsoid of a geographic point. */
+ virtual double GetHeightAboveEllipsoid(const PointType& geoPoint) const;
protected:
DEMHandler();
~DEMHandler();
- void PrintSelf(std::ostream& os, Indent indent) const;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
ossimElevManager* m_ElevManager;
diff --git a/Code/IO/otbDEMToImageGenerator.h b/Code/IO/otbDEMToImageGenerator.h
index 6f7ae1db0e8aab00f4ccc683ca17af5fa77d7f60..b2d0d9ee7d3ac53a94eba4fa7a1e78019b81891a 100644
--- a/Code/IO/otbDEMToImageGenerator.h
+++ b/Code/IO/otbDEMToImageGenerator.h
@@ -51,7 +51,6 @@ class ITK_EXPORT DEMToImageGenerator:
{
public :
/** Standard class typedefs. */
- typedef itk::Indent Indent;
typedef TDEMImage DEMImageType;
typedef typename DEMImageType::Pointer DEMImagePointerType;
typedef typename DEMImageType::PixelType PixelType;
@@ -60,7 +59,8 @@ public :
typedef itk::ImageSource<DEMImageType> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
- typedef Image<PixelType,2> OutputImageType;
+// typedef Image<PixelType,2> OutputImageType;
+ typedef DEMImageType OutputImageType;
typedef typename Superclass::Pointer OutputImagePointer;
typedef typename OutputImageType::SpacingType SpacingType;
@@ -100,10 +100,11 @@ public :
protected:
DEMToImageGenerator();
- ~DEMToImageGenerator();
+ ~DEMToImageGenerator(){};
- void PrintSelf(std::ostream& os, Indent indent) const;
- void GenerateData();
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
+ int threadId);
virtual void GenerateOutputInformation();
DEMHandlerType::Pointer m_DEMHandler;
diff --git a/Code/IO/otbDEMToImageGenerator.txx b/Code/IO/otbDEMToImageGenerator.txx
index 6b936449b491aca93753e869b3d96d5cef075284..896a234938164d8199c2b514a952924212fc0be6 100644
--- a/Code/IO/otbDEMToImageGenerator.txx
+++ b/Code/IO/otbDEMToImageGenerator.txx
@@ -20,11 +20,12 @@
#include "otbDEMToImageGenerator.h"
#include "otbMacro.h"
+#include "base/ossimCommon.h"
+#include "itkProgressReporter.h"
namespace otb
{
-
template<class TDEMImage>
DEMToImageGenerator<TDEMImage>
::DEMToImageGenerator()
@@ -39,13 +40,6 @@ DEMToImageGenerator<TDEMImage>
m_DefaultUnknownValue = static_cast<PixelType>(-32768); // Value defined in the norm for points strm doesn't have information.
}
-template<class TDEMImage>
-DEMToImageGenerator<TDEMImage>
-::~DEMToImageGenerator()
-{
- // Nothing to be done...
-}
-
// DEM folder specification method
template<class TDEMImage>
void
@@ -77,20 +71,19 @@ void DEMToImageGenerator<TDEMImage>
output->SetOrigin(m_OutputOrigin);
}
-// GenerateData method
template <class TDEMImage>
void
DEMToImageGenerator<TDEMImage>
-::GenerateData()
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
+ int threadId)
{
DEMImagePointerType DEMImage = this->GetOutput();
- // allocate the output buffer
- DEMImage->SetBufferedRegion( DEMImage->GetRequestedRegion() );
- DEMImage->Allocate();
- DEMImage->FillBuffer(0);
// Create an iterator that will walk the output region
- ImageIteratorType outIt = ImageIteratorType(DEMImage,DEMImage->GetRequestedRegion());
+ ImageIteratorType outIt = ImageIteratorType(DEMImage, outputRegionForThread);
+
+ // support progress methods/callbacks
+ itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
// Walk the output image, evaluating the height at each pixel
IndexType currentindex;
@@ -118,13 +111,15 @@ DEMToImageGenerator<TDEMImage>
// Back to the MNT default value
DEMImage->SetPixel(currentindex, m_DefaultUnknownValue);
}
+ progress.CompletedPixel();
}
}
+
template <class TDEMImage>
void
DEMToImageGenerator<TDEMImage>
-::PrintSelf(std::ostream& os, Indent indent) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os,indent);
diff --git a/Code/IO/otbDEMToOrthoImageGenerator.h b/Code/IO/otbDEMToOrthoImageGenerator.h
index 8dd60f5e84f7485ce309ea895200d66c78c4e00d..67dc24051f2f1b9a8df8325c3bdb926319a6fea7 100644
--- a/Code/IO/otbDEMToOrthoImageGenerator.h
+++ b/Code/IO/otbDEMToOrthoImageGenerator.h
@@ -100,11 +100,14 @@ public :
protected:
DEMToOrthoImageGenerator();
- ~DEMToOrthoImageGenerator();
+ ~DEMToOrthoImageGenerator(){};
void PrintSelf(std::ostream& os, Indent indent) const;
- void GenerateData();
virtual void GenerateOutputInformation();
+// void AllocateOutputs();
+ void BeforeThreadedGenerateData();
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
+ int threadId);
DEMHandlerPointerType m_DEMHandler;
PointType m_OutputOrigin;
diff --git a/Code/IO/otbDEMToOrthoImageGenerator.txx b/Code/IO/otbDEMToOrthoImageGenerator.txx
index e84bb9a45b97ccb31362a1575bb5c3af25e37a2a..64664f2c6af0300ed0e368423c4d49900d28c5a2 100644
--- a/Code/IO/otbDEMToOrthoImageGenerator.txx
+++ b/Code/IO/otbDEMToOrthoImageGenerator.txx
@@ -21,6 +21,7 @@
#include "otbDEMToOrthoImageGenerator.h"
#include "otbMacro.h"
// #include <iomanip>
+#include "itkProgressReporter.h"
namespace otb
{
@@ -41,14 +42,6 @@ DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
m_MapProjection = NULL;
}
-template<class TDEMImage, class TMapProjection>
-DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
-::~DEMToOrthoImageGenerator()
-{
- // Nothing to be done...
-}
-
-
// GenerateOutputInformation method
template <class TDEMImage, class TMapProjection>
void DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
@@ -71,27 +64,40 @@ void DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
output->SetOrigin(m_OutputOrigin);
}
-// GenerateData method
template <class TDEMImage, class TMapProjection>
void
DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
-::GenerateData()
+::BeforeThreadedGenerateData()
{
-
if (!m_MapProjection)
{
itkExceptionMacro( <<
"Please set map projection!" );
}
-
DEMImagePointerType DEMImage = this->GetOutput();
// allocate the output buffer
DEMImage->SetBufferedRegion( DEMImage->GetRequestedRegion() );
DEMImage->Allocate();
DEMImage->FillBuffer(0);
+}
+
+// GenerateData method
+template <class TDEMImage, class TMapProjection>
+void
+DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
+ int threadId)
+{
+
+
+ DEMImagePointerType DEMImage = this->GetOutput();
+
// Create an iterator that will walk the output region
- ImageIteratorType outIt = ImageIteratorType(DEMImage,DEMImage->GetRequestedRegion());
+ ImageIteratorType outIt = ImageIteratorType(DEMImage, outputRegionForThread);
+
+ // support progress methods/callbacks
+ itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
// Walk the output image, evaluating the height at each pixel
IndexType currentindex;
@@ -124,6 +130,7 @@ DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
// Back to the MNT default value
DEMImage->SetPixel(currentindex, m_DefaultUnknownValue);
}
+ progress.CompletedPixel();
}
}
diff --git a/Code/IO/otbImageGeometryHandler.cxx b/Code/IO/otbImageGeometryHandler.cxx
deleted file mode 100644
index 48b942608a3d81b4e69d236f38a850dccffcfda8..0000000000000000000000000000000000000000
--- a/Code/IO/otbImageGeometryHandler.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*=========================================================================
-
- 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 "otbImageGeometryHandler.h"
-#include "otbMacro.h"
-#include "imaging/ossimImageHandlerRegistry.h"
-
-namespace otb
-{
-
-void ImageGeometryHandler::SetFileName(char *src)
-{
- otbDebugMacro(<<"Creation handler... ");
- handler = ossimImageHandlerRegistry::instance()->open(ossimFilename(src));
- if (!handler)
- {
- itkExceptionMacro(<< "Unable to open input image: " << src);
- }
-}
-
-
-ossimKeywordlist ImageGeometryHandler::GetGeometryKeywordlist()
-{
- otbDebugMacro( << "Get geometry handler " );
- handler->getImageGeometry(m_geom_kwl);
- return m_geom_kwl;
-}
-
-}
-
-
-
diff --git a/Code/IO/otbImageGeometryHandler.h b/Code/IO/otbImageGeometryHandler.h
deleted file mode 100644
index bcf40c514bc0e36d7bf36a95fe9c296a502efd6f..0000000000000000000000000000000000000000
--- a/Code/IO/otbImageGeometryHandler.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*=========================================================================
-
- 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.
-
-=========================================================================*/
-#ifndef __otbImageGeometryHandler_h
-#define __otbImageGeometryHandler_h
-
-
-#include "base/ossimKeywordlist.h"
-#include "base/ossimFilename.h"
-
-#include "imaging/ossimImageHandler.h"
-
-#include "itkExceptionObject.h"
-#include "itkMacro.h"
-#include "itkObject.h"
-#include "itkObjectFactory.h"
-
-/**
- * \class ImageGeometryHandler
- * \brief used for orthorectification
- *
- */
-
-namespace otb
-{
-class ITK_EXPORT ImageGeometryHandler: public itk::Object
-{
-public :
-
- typedef ImageGeometryHandler Self;
- typedef itk::Object Superclass;
-
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- itkTypeMacro( ImageGeometryHandler, Object);
- itkNewMacro(Self);
-
- /** Open image from filename*/
- void SetFileName(char *src);
-
- /** Get the image keyword list*/
- ossimKeywordlist GetGeometryKeywordlist();
-
-
-protected:
- ImageGeometryHandler() {};
- virtual ~ImageGeometryHandler() {};
-
- ossimImageHandler *handler;
- ossimKeywordlist m_geom_kwl;
- ossimFilename m_filename;
-};
-
-}
-
-
-#endif
diff --git a/Code/IO/otbSHPVectorDataIO.h b/Code/IO/otbSHPVectorDataIO.h
index 3aee2d692e6e3dd1c9f26d5f6c1d065a72341876..42b55c9b298eb8fb4cc21bf3b129b72a117eab20 100644
--- a/Code/IO/otbSHPVectorDataIO.h
+++ b/Code/IO/otbSHPVectorDataIO.h
@@ -30,7 +30,7 @@ namespace otb
/** \class SHPVectorDataIO
*
- * \brief ImageIO object for reading (not writing) SHP format vector data
+ * \brief ImageIO object for reading and writing SHP format vector data
*
*/
template <class TData> class ITK_EXPORT SHPVectorDataIO
@@ -76,8 +76,6 @@ public:
typedef typename Superclass::SpacingType SpacingType;
typedef typename Superclass::PointType OriginType;
- /** */
-
/*-------- This part of the interface deals with reading data. ------ */
@@ -103,7 +101,7 @@ public:
* file specified. */
virtual bool CanWriteFile(const char*);
- /** Determine the file type. Returns true if the ImageIO can stream write the specified file */
+ /** Determine the file type. Returns true if the VectorDataIO can stream write the specified file */
virtual bool CanStreamWrite()
{
return false;
@@ -113,8 +111,7 @@ public:
/* * Assumes SetFileName has been called with a valid file name. *\/ */
/* virtual void WriteVectorDataInformation(); */
- /** Writes the data to disk from the memory buffer provided. Make sure
- * that the IORegion has been set properly. */
+ /** Writes the data to disk from the memory buffer provided */
virtual void Write(VectorDataConstPointerType data);
protected:
@@ -148,9 +145,9 @@ private:
unsigned int m_Kept;
- /** Is this necessary ? */
+ /* Is this necessary ? */
- /** Internal method to read header informations */
+ /* Internal method to read header informations */
/* bool InternalReadHeaderInformation(std::fstream & file, const bool reportError); */
/* bool m_FlagWriteVectorDataInformation; */
diff --git a/Code/IO/otbSHPVectorDataIO.txx b/Code/IO/otbSHPVectorDataIO.txx
index e88b2f69e73cb712ba8ccf607f0ac5f4c3a335df..38b241724f148cf1c522481af32eea1b66077af6 100644
--- a/Code/IO/otbSHPVectorDataIO.txx
+++ b/Code/IO/otbSHPVectorDataIO.txx
@@ -36,12 +36,12 @@ namespace otb
{
template<class TData>
SHPVectorDataIO<TData>
-::SHPVectorDataIO()
+::SHPVectorDataIO():
+ m_DataSource(NULL),
+ m_Kept(0)
{
// OGR factory registration
OGRRegisterAll();
- m_DataSource = NULL;
-
}
template<class TData>
@@ -57,8 +57,6 @@ template<class TData>
bool
SHPVectorDataIO<TData>::CanReadFile( const char* filename )
{
-
-
OGRDataSource * poDS = OGRSFDriverRegistrar::Open(filename, FALSE);
if (poDS == NULL)
{
@@ -556,6 +554,9 @@ SHPVectorDataIO<TData>
}//end While feature
otbMsgDevMacro(<<layer->GetFeatureCount()<<" features read, average insertion time "<<chrono.GetMeanTime()<<" s");
}// end For each layer
+
+ OGRDataSource::DestroyDataSource(m_DataSource);
+ m_DataSource = NULL;
}
@@ -578,9 +579,13 @@ SHPVectorDataIO<TData>
otbPoint[1] = static_cast<typename DataNodeType::PrecisionType>(ogrPoint->getY());
if (DataNodeType::Dimension > 2)
+ {
+ if (PointType::PointDimension != 3)
{
- otbPoint[2]=static_cast<typename DataNodeType::PrecisionType>(ogrPoint->getZ());
+ itkGenericExceptionMacro(<<"OTB vector data can't contain the OGR information (2D instead of 2.5D)");
}
+ otbPoint[2]=static_cast<typename DataNodeType::PrecisionType>(ogrPoint->getZ());
+ }
DataNodePointerType node = DataNodeType::New();
node->SetPoint(otbPoint);
@@ -615,9 +620,13 @@ SHPVectorDataIO<TData>
vertex[1] = ogrTmpPoint->getY();
if (DataNodeType::Dimension > 2)
+ {
+ if (LineType::VertexType::PointDimension != 3)
{
- vertex[2]= ogrTmpPoint->getZ();
+ itkGenericExceptionMacro(<<"OTB vector data can't contain the OGR information (2D instead of 2.5D)");
}
+ vertex[2]= ogrTmpPoint->getZ();
+ }
line->AddVertex(vertex);
}
@@ -657,6 +666,10 @@ SHPVectorDataIO<TData>
if (DataNodeType::Dimension > 2)
{
+ if (PolygonType::VertexType::PointDimension != 3)
+ {
+ itkGenericExceptionMacro(<<"OTB vector data can't contain the OGR information (2D instead of 2.5D)");
+ }
vertex[2]= ogrTmpPoint->getZ();
}
@@ -678,6 +691,10 @@ SHPVectorDataIO<TData>
vertex[1] = ogrTmpPoint->getY();
if (DataNodeType::Dimension > 2)
{
+ if (PolygonType::VertexType::PointDimension != 3)
+ {
+ itkGenericExceptionMacro(<<"OTB vector data can't contain the OGR information (2D instead of 2.5D)");
+ }
vertex[2]= ogrTmpPoint->getZ();
}
ring->AddVertex(vertex);
@@ -787,39 +804,18 @@ void SHPVectorDataIO<TData>::Write(const VectorDataConstPointerType data)
OGRGeometryCollection * ogrCollection = NULL;
// OGRGeometry * ogrCurrentGeometry = NULL;
-// TreeIteratorType it(tree);
-// it.GoToBegin();
// Get the input tree root
InternalTreeNodeType * inputRoot = const_cast<InternalTreeNodeType *>(tree->GetRoot());
ProcessNodeWrite(inputRoot, ogrCollection, ogrCurrentLayer, oSRS);
-
-// if (ogrCurrentLayer!=NULL && ogrCollection != NULL && !ogrFeatures.empty())
-// {
-// ogrFeatures.back()->SetGeometry(ogrCollection);
-// delete ogrCollection;
-// ogrCollection = NULL;
-// }
-//
-// if (ogrCurrentLayer!=NULL && ogrFeatures.size()>0)
-// {
-// std::vector<OGRFeature*>::iterator fIt = ogrFeatures.begin();
-//
-// while (fIt!=ogrFeatures.end())
-// {
-// if (ogrCurrentLayer->CreateFeature(*fIt) != OGRERR_NONE)
-// {
-// itkExceptionMacro(<<"Failed to create ogr feature in file "<<this->m_FileName);
-// }
-// OGRFeature::DestroyFeature(*fIt);
-// ++fIt;
-// }
-// }
-// ogrFeatures.clear();
-
OGRDataSource::DestroyDataSource( m_DataSource );
m_DataSource = NULL;
+ if (oSRS != NULL)
+ {
+ delete oSRS;
+ }
+
chrono.Stop();
std::cout<<"SHPVectorDataIO: file saved in "<<chrono.GetMeanTime()<<" seconds. (" << m_Kept << " elements)"<<std::endl;
diff --git a/Code/IO/otbSHPVectorDataIOFactory.txx b/Code/IO/otbSHPVectorDataIOFactory.txx
index 46a57387c511cda5e54af5b35e2e12b8af313fb6..3296392fa11b8bc7e053b5eb134250d4d7dabbf5 100644
--- a/Code/IO/otbSHPVectorDataIOFactory.txx
+++ b/Code/IO/otbSHPVectorDataIOFactory.txx
@@ -49,7 +49,7 @@ template<class TData>
const char*
SHPVectorDataIOFactory<TData>::GetDescription() const
{
- return "SHP VectorDataIO Factory, allows the loading of SHP vector data into OTB";
+ return "SHP VectorDataIO Factory, allows the loading of ESRI shapefile vector data into OTB";
}
} // end namespace otb
diff --git a/Code/IO/otbVectorDataFileReader.h b/Code/IO/otbVectorDataFileReader.h
index 4337903c1cdf721203bcc89be90738730baf0009..57b0b02bf2be92dd073b84ff15efba6bdf579a98 100644
--- a/Code/IO/otbVectorDataFileReader.h
+++ b/Code/IO/otbVectorDataFileReader.h
@@ -71,7 +71,7 @@ public:
* appropriate suffix is enough to get the reader to instantiate the
* correct VectorDataIO and read the file properly. However, some files (like
* raw binary format) have no accepted suffix, so you will have to
- * manually create the ImageIO instance of the write type.
+ * manually create the VectorDataIO instance of the write type.
*
* \sa VectorDataIOBase
*
diff --git a/Code/IO/otbVectorDataFileReader.txx b/Code/IO/otbVectorDataFileReader.txx
index 47b72438f2b4ac564b143c85ced70e2273b1a291..ca29e5c25fd351996cda36f16924da0951596682 100644
--- a/Code/IO/otbVectorDataFileReader.txx
+++ b/Code/IO/otbVectorDataFileReader.txx
@@ -33,12 +33,13 @@ namespace otb
*/
template <class TOutputVectorData>
VectorDataFileReader<TOutputVectorData>
-::VectorDataFileReader()
+::VectorDataFileReader() :
+ m_VectorDataIO(NULL),
+ m_UserSpecifiedVectorDataIO(false),
+ m_FileName("")
{
- m_VectorDataIO = 0;
- m_FileName = "";
- m_UserSpecifiedVectorDataIO = false;
}
+
/**
* Destructor
*/
@@ -72,7 +73,9 @@ VectorDataFileReader<TOutputVectorData>
}
// Test if the file can be open for reading access.
- //Only if m_FileName speciy a filname (not a dirname)
+ //Only if m_FileName speciy a filename (not a dirname)
+ // FIXME shapefile should be able to open a directory and load the
+ // individual shapefiles as layers
if ( System::IsAFileName( this->m_FileName ) == true )
{
std::ifstream readTester;
diff --git a/Code/Learning/foo.cxx b/Code/Learning/foo.cxx
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Code/SARPolarimetry/foo.cxx b/Code/SARPolarimetry/foo.cxx
deleted file mode 100644
index 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000
--- a/Code/SARPolarimetry/foo.cxx
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Examples/IO/CMakeLists.txt b/Examples/IO/CMakeLists.txt
index 32251f9e5109b50c6da9ea4b4f465d35ae75f51b..7ce006a8e5800ae2d4654fc970caa7dbd615f595 100644
--- a/Examples/IO/CMakeLists.txt
+++ b/Examples/IO/CMakeLists.txt
@@ -154,14 +154,14 @@ ADD_TEST(ioTeDEMToImageGeneratorTest ${EXE_TESTS1}
${TEMP}/DEMToImageGenerator.tif
DEMToImageGeneratorTest
${TEMP}/DEMToImageGenerator.tif
- ${TEMP}/pretty_DEMToImageGenerator.png
+ ${TEMP}/pretty_DEMToImageGenerator.png
6.5
45.5
500
500
- 0.002
- -0.002
- ${INPUTDATA}/DEM_srtm
+ 0.002
+ -0.002
+ ${INPUTDATA}/DEM_srtm
)
IF(OTB_USE_LIBLAS)
@@ -172,7 +172,7 @@ ADD_TEST(ioTeLidarToImageExampleTest ${EXE_TESTS1}
LidarToImageExampleTest
${DATA}/TO_core_last_zoom.las
${TEMP}/lidar-image-4.hdr
- ${TEMP}/lidar-image-4.png
+ ${TEMP}/lidar-image-4.png
1.0
5
4
@@ -183,7 +183,7 @@ ADD_TEST(ioTeLidarToImageExample2Test ${EXE_TESTS1}
LidarToImageExampleTest
${DATA}/TO_core_last_zoom.las
${TEMP}/lidar-image-8.hdr
- ${TEMP}/lidar-image-8.png
+ ${TEMP}/lidar-image-8.png
1.0
5
8
@@ -207,12 +207,10 @@ ENDIF( OTB_USE_CURL )
INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Testing/Code)
ADD_EXECUTABLE(otbIOExamplesTests1 otbIOExamplesTests1.cxx)
-# TARGET_LINK_LIBRARIES(otbIOExamplesTests1 OTBIO OTBBasicFilters OTBCommon OTBDisparityMap OTBSpatialReasoning OTBChangeDetection OTBFeatureExtraction OTBLearning OTBMultiScale OTBProjections ITKAlgorithms ITKStatistics ${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES})
TARGET_LINK_LIBRARIES(otbIOExamplesTests1 OTBIO OTBCommon OTBTesting)
IF( OTB_USE_CURL )
ADD_EXECUTABLE(otbIOExamplesTests2 otbIOExamplesTests2.cxx)
-# TARGET_LINK_LIBRARIES(otbIOExamplesTests2 OTBCommon OTBIO ${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES} ${CURL_LIBRARY} )
TARGET_LINK_LIBRARIES(otbIOExamplesTests2 OTBCommon OTBIO ${CURL_LIBRARY} OTBTesting)
ENDIF( OTB_USE_CURL )
diff --git a/Examples/IO/DEMToImageGenerator.cxx b/Examples/IO/DEMToImageGenerator.cxx
index e7d8956682091dc2a885a7e291f2569be9f5db60..8d2639fa061001d1c49182cefe56180b90a4c1aa 100644
--- a/Examples/IO/DEMToImageGenerator.cxx
+++ b/Examples/IO/DEMToImageGenerator.cxx
@@ -59,7 +59,7 @@ int main(int argc, char * argv[])
{
if (argc<10)
{
- std::cout << argv[0] <<" output filename , pretty output filename , Longitude Output Orign point , Latitude Output Origin point , X Output Size, Y Output size , X Spacing , Y Spacing, DEM folder path" << std::endl;
+ std::cout << argv[0] <<" output filename , pretty output filename , Longitude Output Origin point , Latitude Output Origin point , X Output Size, Y Output size , X Spacing , Y Spacing, DEM folder path" << std::endl;
return EXIT_FAILURE;
}
// Software Guide : BeginLatex
diff --git a/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.cxx b/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.cxx
index e3234c3092315e11df5c4a0bdeabb92b21faf0e2..0056de39674ee03c1817ed5dec68563668ea9d0d 100644
--- a/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.cxx
+++ b/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.cxx
@@ -41,8 +41,10 @@ int otbFlexibleDistanceWithMissingValue( int argc, char * argv[] )
y.Fill( 2. );
DistanceType::Pointer dist = DistanceType::New();
+ double distanceValue = dist->Evaluate( x, y );
+ std::cout << "Distance: " << distanceValue << std::endl;
- if ( dist->Evaluate( x, y ) == 3. )
+ if ( distanceValue == 3. )
return EXIT_SUCCESS;
else
return EXIT_FAILURE;
diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index dda43aef1a4ffa075edaa88d602236b91742a7d4..e1dc49cea5c7e0cff015a7d09a4ca334e75902e0 100755
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -1417,13 +1417,11 @@ ADD_TEST(ioTvDEMHandler ${IO_TESTS12}
${TEMP}/ioDEMGetHeightAboveMSL.txt
otbDEMHandlerTest
${INPUTDATA}/DEM/srtm_directory
+ ${INPUTDATA}/DEM/egm96.grd
${TEMP}/ioDEMGetHeightAboveMSL.txt
- 3.6999 44.08
+ 3.6999 44.08
)
-# --- otb::ImageGeometryHandler ---
-ADD_TEST(ioTuImageGeometryHandlerNew ${IO_TESTS12} otbImageGeometryHandlerNew )
-
# --- otb::DEMToImageGenerator ---
ADD_TEST(ioTuDEMToImageGeneratorNew ${IO_TESTS12} otbDEMToImageGeneratorNew )
@@ -1434,11 +1432,11 @@ ADD_TEST(ioTvDEMToImageGeneratorTest ${IO_TESTS12}
${INPUTDATA}/DEM/srtm_directory
${TEMP}/ioTvDEMToImageGenerator.tif
6.5
- 44.5
+ 45.5
500
500
0.002
- 0.002
+ -0.002
)
ADD_TEST(ioTvossimElevManagerTest ${IO_TESTS12}
@@ -1447,13 +1445,13 @@ ADD_TEST(ioTvossimElevManagerTest ${IO_TESTS12}
otbOssimElevManagerTest
${INPUTDATA}/DEM/srtm_directory
${TEMP}/ioTvossimElevManagerTest.tif
- 6.5
- 44.5
- 0.002
- 0.002
- 500
- 500
- )
+ 6.5
+ 45.5
+ 0.002
+ -0.002
+ 500
+ 500
+ )
ADD_TEST(ioTvossimElevManagerTest2 ${IO_TESTS12}
--compare-ascii ${EPSILON_9} ${BASELINE_FILES}/ioTvossimElevManagerTest2.txt
@@ -2026,7 +2024,6 @@ otbDEMHandlerNew.cxx
otbDEMHandlerTest.cxx
otbDEMToImageGeneratorNew.cxx
otbDEMToImageGeneratorTest.cxx
-otbImageGeometryHandlerNew.cxx
otbOssimElevManagerTest.cxx
otbOssimElevManagerTest2.cxx
otbDEMToOrthoImageGeneratorNew.cxx
diff --git a/Testing/Code/IO/otbDEMHandlerTest.cxx b/Testing/Code/IO/otbDEMHandlerTest.cxx
index 6954d9f89b3db6bc059468421ca7f36f79b40e6e..139d93f07b9cb9f82b2971ff2d642f979ca4704b 100644
--- a/Testing/Code/IO/otbDEMHandlerTest.cxx
+++ b/Testing/Code/IO/otbDEMHandlerTest.cxx
@@ -27,8 +27,10 @@ int otbDEMHandlerTest(int argc, char * argv[])
{
const unsigned int Dimension = 2;
char * srtm_directory(argv[1]);
- const char * outputfilename(argv[2]);
- double height(0.);
+ char * geoidFile(argv[2]);
+ const char * outputfilename(argv[3]);
+ double height = 0.0;
+ double height2 = 0.0;
typedef otb::Image<float,Dimension> ImageType;
typedef otb::DEMHandler DEMHandlerType;
@@ -36,23 +38,31 @@ int otbDEMHandlerTest(int argc, char * argv[])
// Instantiating object
DEMHandlerType::Pointer demHandler = DEMHandlerType::New();
demHandler->OpenDEMDirectory(srtm_directory);
+ demHandler->OpenGeoidFile(geoidFile);
typedef otb::UtmInverseProjection utmProjection;
typedef utmProjection::InputPointType InputPoint;
InputPoint geoPoint;
- geoPoint[0] = atof(argv[3]);//3.6999;
- geoPoint[1] = atof(argv[4]);//44.08;
+ geoPoint[0] = atof(argv[4]);//3.6999;
+ geoPoint[1] = atof(argv[5]);//44.08;
- height=demHandler->GetHeightAboveMSL(geoPoint);
+ height = demHandler->GetHeightAboveMSL(geoPoint);
+ height2 = demHandler->GetHeightAboveEllipsoid(geoPoint);
std::ofstream file;
file.open(outputfilename);
file << "--- HEIGHT ABOVE MSL TEST ---" << std::endl;
- file << " geoPoint: "<<geoPoint[1]<<" ; "<<geoPoint[0]<< std::endl;
- file << " -> Height: "<<height<< std::endl;
+ file << " geoPoint: " << geoPoint[1] << " ; " << geoPoint[0] << std::endl;
+ file << " -> Height above MSL: " << height << std::endl;
+ std::cout << "Height above MSL: " << height << std::endl;
+
+ file << " -> Height above Ellipsoid: " << height2 << std::endl;
+ std::cout << "Height above Ellipsoid: " << height2 << std::endl;
+
+
file.close();
- std::cout << "Height: "<<height<<std::endl;
+
return EXIT_SUCCESS;
diff --git a/Testing/Code/IO/otbDEMToImageGeneratorTest.cxx b/Testing/Code/IO/otbDEMToImageGeneratorTest.cxx
index 1c5151b83c3d24aa8a3c34a6136db75080fbbf36..c0f0171fdf91ac61309083d15a13d02a6211d522 100644
--- a/Testing/Code/IO/otbDEMToImageGeneratorTest.cxx
+++ b/Testing/Code/IO/otbDEMToImageGeneratorTest.cxx
@@ -18,8 +18,9 @@
#include "itkExceptionObject.h"
#include "otbDEMToImageGenerator.h"
-#include "otbImageFileWriter.h"
+#include "otbStreamingImageFileWriter.h"
#include "otbImage.h"
+#include "otbStandardFilterWatcher.h"
int otbDEMToImageGeneratorTest(int argc, char * argv[])
{
@@ -39,7 +40,7 @@ int otbDEMToImageGeneratorTest(int argc, char * argv[])
typedef DEMHandlerType::PointType PointType;
typedef DEMToImageGeneratorType::SizeType SizeType;
typedef DEMToImageGeneratorType::SpacingType SpacingType;
- typedef otb::ImageFileWriter<ImageType> WriterType;
+ typedef otb::StreamingImageFileWriter<ImageType> WriterType;
// Instantiating object
DEMToImageGeneratorType::Pointer object = DEMToImageGeneratorType::New();
@@ -61,6 +62,7 @@ int otbDEMToImageGeneratorTest(int argc, char * argv[])
object->SetOutputOrigin(origin);
object->SetOutputSize(size);
object->SetOutputSpacing(spacing);
+ otb::StandardFilterWatcher watcher(object, "DEM to image generator");
writer->SetFileName( outputName );
writer->SetInput( object->GetOutput() );
diff --git a/Testing/Code/IO/otbDEMToOrthoImageGeneratorTest.cxx b/Testing/Code/IO/otbDEMToOrthoImageGeneratorTest.cxx
index 9a015a52f4b5dc649dc14473e8015c3dd94bfbbd..90fdc098fd1e9099a884aff9ea0f1aa4336d1c62 100644
--- a/Testing/Code/IO/otbDEMToOrthoImageGeneratorTest.cxx
+++ b/Testing/Code/IO/otbDEMToOrthoImageGeneratorTest.cxx
@@ -19,8 +19,9 @@
#include "otbDEMToOrthoImageGenerator.h"
#include "otbMapProjections.h"
-#include "otbImageFileWriter.h"
+#include "otbStreamingImageFileWriter.h"
#include "otbImage.h"
+#include "otbStandardFilterWatcher.h"
int otbDEMToOrthoImageGeneratorTest(int argc, char * argv[])
{
@@ -41,7 +42,7 @@ int otbDEMToOrthoImageGeneratorTest(int argc, char * argv[])
typedef DEMHandlerType::PointType PointType;
typedef DEMToImageGeneratorType::SizeType SizeType;
typedef DEMToImageGeneratorType::SpacingType SpacingType;
- typedef otb::ImageFileWriter<ImageType> WriterType;
+ typedef otb::StreamingImageFileWriter<ImageType> WriterType;
// Instantiating object
MapProjectionType::Pointer mapProj = MapProjectionType::New();
@@ -69,12 +70,12 @@ int otbDEMToOrthoImageGeneratorTest(int argc, char * argv[])
object->SetOutputSize(size);
object->SetOutputSpacing(spacing);
object->SetMapProjection(mapProj);
+ otb::StandardFilterWatcher watcher(object, "DEM to ortho image generator");
writer->SetFileName( outputName );
writer->SetInput( object->GetOutput() );
writer->Update();
-
return EXIT_SUCCESS;
}
diff --git a/Testing/Code/IO/otbIOTests12.cxx b/Testing/Code/IO/otbIOTests12.cxx
index 7f47514133c569ee1cdb2c8fbebf94678bbe987d..69f54463e7eedd71d18394219552697df20a4911 100644
--- a/Testing/Code/IO/otbIOTests12.cxx
+++ b/Testing/Code/IO/otbIOTests12.cxx
@@ -33,7 +33,6 @@ void RegisterTests()
REGISTER_TEST(otbDEMHandlerTest);
REGISTER_TEST(otbDEMToImageGeneratorNew);
REGISTER_TEST(otbDEMToImageGeneratorTest);
- REGISTER_TEST(otbImageGeometryHandlerNew);
REGISTER_TEST(otbOssimElevManagerTest);
REGISTER_TEST(otbOssimElevManagerTest2);
REGISTER_TEST(otbDEMToOrthoImageGeneratorNew);
diff --git a/Testing/Code/IO/otbImageGeometryHandlerNew.cxx b/Testing/Code/IO/otbImageGeometryHandlerNew.cxx
deleted file mode 100644
index 58ca8c0fa899a4c0e11b1f43a889cd28a872b6a0..0000000000000000000000000000000000000000
--- a/Testing/Code/IO/otbImageGeometryHandlerNew.cxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/*=========================================================================
-
- 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 "otbImageGeometryHandler.h"
-
-int otbImageGeometryHandlerNew(int argc, char * argv[])
-{
- // Instantiating object
- otb::ImageGeometryHandler::Pointer object = otb::ImageGeometryHandler::New();
-
- return EXIT_SUCCESS;
-}
diff --git a/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx b/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx
index da992ebf2c76f2b63106a83e7f28cc4ec3010319..724941a13e972518a8299b919e727a3138d3042f 100644
--- a/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx
+++ b/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx
@@ -46,7 +46,6 @@
#include "itkImageRegionIteratorWithIndex.h"
#include "itkLinearInterpolateImageFunction.h"
-#include "otbImageGeometryHandler.h"
#include "otbInverseSensorModel.h"
// this is the most important class and is called as the first line of all applications.
diff --git a/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx b/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx
index c5f46027187227da8761402734f0a1209aabd7c1..842e69612d56815827aeb118495c22a20f9e9100 100644
--- a/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx
+++ b/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx
@@ -46,7 +46,6 @@
#include "itkImageRegionIteratorWithIndex.h"
#include "itkLinearInterpolateImageFunction.h"
-#include "otbImageGeometryHandler.h"
#include "otbInverseSensorModel.h"
// this is the most important class and is called as the first line of all applications.
diff --git a/Testing/Code/otbTestMain.h b/Testing/Code/otbTestMain.h
index 046eb89476d4b871c66230715cbb7e1a3811efe6..49698436cdcc36e7175b0fcb10a28c070da3c831 100644
--- a/Testing/Code/otbTestMain.h
+++ b/Testing/Code/otbTestMain.h
@@ -309,7 +309,7 @@ int main(int ac, char* av[] )
if (result!=EXIT_SUCCESS)
{
std::cout << "-> Test EXIT FAILURE ("<<result<<")."<<std::endl;
- itkGenericExceptionMacro(<<"Bad function return, no regression test !");
+ itkGenericExceptionMacro(<<"Function returns EXIT_FAILURE (no regression test)");
}
}
catch ( itk::ExceptionObject & e )
@@ -530,7 +530,7 @@ int main(int ac, char* av[] )
std::map<std::string,int>::reverse_iterator baseline = baselines.rbegin();
multiResult = 1;
std::cout<<"Number of baseline files: "<<baselines.size()<<std::endl;
-
+
while (baseline!=baselines.rend() && (multiResult!=0))
{
std::cout<<"Testing non-regression on file: "<<(baseline->first).c_str()<<std::endl;
@@ -553,7 +553,7 @@ int main(int ac, char* av[] )
lEpsilon,
ignoredLines);
}
-
+
result += multiResult;
}
}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
index 38f5f9cdeb409e31d2f3a9da1422d5bb2398174a..e736b31c7021a63a3cbbea31f885e038af48c8a4 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
@@ -25,6 +25,7 @@
#include <ossim/base/ossimKeywordNames.h>
#include <ossim/imaging/ossimJpegTileSource.h>
#include <ossim/imaging/ossimRadarSatTileSource.h>
+// #include <ossim/imaging/ossimRadarSat2TileSource.h>
#include <ossim/imaging/ossimTerraSarTileSource.h>
static const ossimTrace traceDebug("ossimImageHandlerFactory:debug");
@@ -53,9 +54,9 @@ ossimImageHandlerFactory* ossimImageHandlerFactory::instance()
ossimImageHandler* ossimImageHandlerFactory::open(const ossimFilename& fileName)const
{
-
+
ossimFilename copyFilename = fileName;
-
+
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -76,7 +77,7 @@ ossimImageHandler* ossimImageHandlerFactory::open(const ossimFilename& fileName)
// if we have any imagehandlers that require an encoded string and is contrlled in this factory then
// we need to move this.
if(!copyFilename.exists()) return 0;
-
+
if(copyFilename.ext() == "gz")
{
copyFilename = copyFilename.setExtension("");
@@ -92,7 +93,7 @@ ossimImageHandler* ossimImageHandlerFactory::open(const ossimFilename& fileName)
return result;
}
delete result;
-
+
// test if TileMap
if(traceDebug())
@@ -122,6 +123,20 @@ ossimImageHandler* ossimImageHandlerFactory::open(const ossimFilename& fileName)
}
delete result;
+ // test if Radarsat2
+// if(traceDebug())
+// {
+// ossimNotify(ossimNotifyLevel_DEBUG)
+// << "Radarsat2"
+// << std::endl;
+// }
+// result = new ossimRadarSat2TileSource;
+// if(result->open(copyFilename))
+// {
+// return result;
+// }
+// delete result;
+
// test if TerraSAR
if(traceDebug())
{
@@ -310,16 +325,16 @@ ossimImageHandler* ossimImageHandlerFactory::open(const ossimFilename& fileName)
ossimNotify(ossimNotifyLevel_DEBUG)
<< "trying adrg" << std::endl;
}
-
+
// test if ADRG
result = new ossimAdrgTileSource();
-
+
if(result->open(copyFilename))
{
return result;
}
delete result;
-
+
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -331,7 +346,7 @@ ossimImageHandler* ossimImageHandlerFactory::open(const ossimFilename& fileName)
{
return result;
}
-
+
delete result;
if(traceDebug())
{
@@ -483,6 +498,21 @@ ossimImageHandler* ossimImageHandlerFactory::open(const ossimKeywordlist& kwl,
delete result;
+ // RadarSat2
+// if(traceDebug())
+// {
+// ossimNotify(ossimNotifyLevel_DEBUG)
+// << "trying RadarSat2"
+// << std::endl;
+// }
+// result = new ossimRadarSat2TileSource;
+// if(result->loadState(kwl, prefix))
+// {
+// return result;
+// }
+//
+// delete result;
+
// TerraSAR
if(traceDebug())
{
@@ -510,9 +540,9 @@ ossimImageHandler* ossimImageHandlerFactory::open(const ossimKeywordlist& kwl,
{
return result;
}
-
+
delete result;
-
+
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -675,7 +705,7 @@ ossimObject* ossimImageHandlerFactory::createObject(const ossimString& typeName)
void ossimImageHandlerFactory::getSupportedExtensions(ossimImageHandlerFactoryBase::UniqueStringList& extensionList)const
{
extensionList.push_back("img");
- extensionList.push_back("ccf");
+ extensionList.push_back("ccf");
extensionList.push_back("toc");
extensionList.push_back("tif");
extensionList.push_back("tiff");
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerSarFactory.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerSarFactory.cpp
index 49d5924b56bf76fcfa2f7aa83f557bb62a45d7e8..450d5f03243588495e20ec756bde67c73c205aee 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerSarFactory.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerSarFactory.cpp
@@ -10,7 +10,7 @@
#include <ossim/base/ossimTrace.h>
#include <ossim/base/ossimKeywordNames.h>
#include <ossim/imaging/ossimRadarSatTileSource.h>
-#include <ossim/imaging/ossimRadarSat2TileSource.h>
+// #include <ossim/imaging/ossimRadarSat2TileSource.h>
#include <ossim/imaging/ossimTerraSarTileSource.h>
//#include <ossim/imaging/ossimCosmoSkymedTileSource.h>
#include <ossim/imaging/ossimEnvisatAsarTileSource.h>
@@ -103,18 +103,18 @@ ossimImageHandler* ossimImageHandlerSarFactory::open(const ossimFilename& fileNa
delete result;
// Radarsat 2
- if(traceDebug())
- {
- ossimNotify(ossimNotifyLevel_DEBUG)
- << "trying RadarSat2"
- << std::endl;
- }
- result = new ossimRadarSat2TileSource;
- if(result->open(copyFilename))
- {
- return result;
- }
- delete result;
+// if(traceDebug())
+// {
+// ossimNotify(ossimNotifyLevel_DEBUG)
+// << "trying RadarSat2"
+// << std::endl;
+// }
+// result = new ossimRadarSat2TileSource;
+// if(result->open(copyFilename))
+// {
+// return result;
+// }
+// delete result;
// ERS
if(traceDebug())
@@ -189,18 +189,18 @@ ossimImageHandler* ossimImageHandlerSarFactory::open(const ossimKeywordlist& kwl
}
delete result;
- if(traceDebug())
- {
- ossimNotify(ossimNotifyLevel_DEBUG)
- << "trying RadarSat2"
- << std::endl;
- }
- result = new ossimRadarSat2TileSource();
- if(result->loadState(kwl, prefix))
- {
- return result;
- }
- delete result;
+// if(traceDebug())
+// {
+// ossimNotify(ossimNotifyLevel_DEBUG)
+// << "trying RadarSat2"
+// << std::endl;
+// }
+// result = new ossimRadarSat2TileSource();
+// if(result->loadState(kwl, prefix))
+// {
+// return result;
+// }
+// delete result;
if(traceDebug())
{
@@ -272,10 +272,10 @@ ossimObject* ossimImageHandlerSarFactory::createObject(const ossimString& typeNa
{
return new ossimErsSarTileSource();
}
- if(STATIC_TYPE_NAME(ossimRadarSat2TileSource) == typeName)
- {
- return new ossimRadarSat2TileSource();
- }
+// if(STATIC_TYPE_NAME(ossimRadarSat2TileSource) == typeName)
+// {
+// return new ossimRadarSat2TileSource();
+// }
return (ossimObject*)NULL;
}
@@ -339,5 +339,5 @@ void ossimImageHandlerSarFactory::getTypeNameList(std::vector<ossimString>& type
typeList.push_back(STATIC_TYPE_NAME(ossimEnvisatAsarTileSource));
//typeList.push_back(STATIC_TYPE_NAME(ossimCosmoSkymedTileSource));
typeList.push_back(STATIC_TYPE_NAME(ossimErsSarTileSource));
- typeList.push_back(STATIC_TYPE_NAME(ossimRadarSat2TileSource));
+// typeList.push_back(STATIC_TYPE_NAME(ossimRadarSat2TileSource));
}
diff --git a/Utilities/otbossim/src/ossim/projection/ossimSensorModelFactory.cpp b/Utilities/otbossim/src/ossim/projection/ossimSensorModelFactory.cpp
index 774f9f55759f17df46d993682e374f989f58fd19..d333704d2f8b84ba216d5d6143987cba463f7b75 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimSensorModelFactory.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimSensorModelFactory.cpp
@@ -50,7 +50,7 @@ static ossimTrace traceDebug = ossimTrace("ossimSensorModelFactory:debug");
#include <ossim/projection/ossimEnvisatAsarModel.h>
#include <ossim/projection/ossimTerraSarModel.h>
//#include <ossim/projection/ossimCosmoSkymedModel.h>
-#include <ossim/projection/ossimRadarSat2Model.h>
+// #include <ossim/projection/ossimRadarSat2Model.h>
#include <ossim/projection/ossimErsSarModel.h>
#include <ossim/projection/ossimTileMapModel.h>
@@ -208,10 +208,10 @@ ossimSensorModelFactory::createProjection(const ossimString &name) const
// {
// return new ossimCosmoSkymedModel;
// }
- if (name == STATIC_TYPE_NAME(ossimRadarSat2Model))
- {
- return new ossimRadarSat2Model;
- }
+// if (name == STATIC_TYPE_NAME(ossimRadarSat2Model))
+// {
+// return new ossimRadarSat2Model;
+// }
if (name == STATIC_TYPE_NAME(ossimErsSarModel))
{
return new ossimErsSarModel;
@@ -264,7 +264,7 @@ ossimSensorModelFactory::getTypeNameList(std::vector<ossimString>& typeList)
typeList.push_back(STATIC_TYPE_NAME(ossimSpot5Model));
typeList.push_back(STATIC_TYPE_NAME(ossimSarModel));
typeList.push_back(STATIC_TYPE_NAME(ossimRadarSatModel));
- typeList.push_back(STATIC_TYPE_NAME(ossimRadarSat2Model));
+// typeList.push_back(STATIC_TYPE_NAME(ossimRadarSat2Model));
typeList.push_back(STATIC_TYPE_NAME(ossimTerraSarModel));
// typeList.push_back(STATIC_TYPE_NAME(ossimCosmoSkymedModel));
typeList.push_back(STATIC_TYPE_NAME(ossimEnvisatAsarModel));
diff --git a/Utilities/otbossimplugins/ossim/ossimCosmoSkymedModel.cpp b/Utilities/otbossimplugins/ossim/ossimCosmoSkymedModel.cpp
index 78fed5b47fdaca47540bb63b60184dbb699ec2ed..889f50da73fe51237d99dc2bd4fb2f86f1ed50b0 100644
--- a/Utilities/otbossimplugins/ossim/ossimCosmoSkymedModel.cpp
+++ b/Utilities/otbossimplugins/ossim/ossimCosmoSkymedModel.cpp
@@ -379,7 +379,7 @@ bool ossimCosmoSkymedModel::UtcDateTimeStringToCivilDate(const std::string &utcS
outputDate.set_year(atoi(year_str));
outputDate.set_month(atoi(month_str));
outputDate.set_day(atoi(day_str));
- outputDate.set_second(0);
+ outputDate.set_second(0.0);
outputDate.set_decimal(0.0);
return true ;
diff --git a/Utilities/otbossimplugins/ossim/ossimRadarSat2Model.cpp b/Utilities/otbossimplugins/ossim/ossimRadarSat2Model.cpp
index 44a2c5001d44e8bbd0cf06c56981140c59ce525c..225aeae5335947db1a75f42bfc61de7802a16fed 100644
--- a/Utilities/otbossimplugins/ossim/ossimRadarSat2Model.cpp
+++ b/Utilities/otbossimplugins/ossim/ossimRadarSat2Model.cpp
@@ -155,6 +155,17 @@ bool ossimRadarSat2Model::open(const ossimFilename& file)
{
ossimNotify(ossimNotifyLevel_DEBUG)
<< "isRadarSat2...\n";
+ ossimString s;
+ if ( rsDoc.getBeamModeMnemonic(xdoc, s) )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "beam_mode_mnemonic: " << s << "\n";
+ }
+ if ( rsDoc.getAcquisitionType(xdoc, s) )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "acquisition_type: " << s << "\n";
+ }
}
// Set the base class number of lines and samples
diff --git a/Utilities/otbossimplugins/ossim/ossimRadarSat2ProductDoc.cpp b/Utilities/otbossimplugins/ossim/ossimRadarSat2ProductDoc.cpp
index 919a3765a671740eeb7916f590f762e706ff6892..1221db539c766e885ad3c2d252d9a36eb518dbed 100644
--- a/Utilities/otbossimplugins/ossim/ossimRadarSat2ProductDoc.cpp
+++ b/Utilities/otbossimplugins/ossim/ossimRadarSat2ProductDoc.cpp
@@ -628,6 +628,13 @@ bool ossimRadarSat2ProductDoc::getSensor(const ossimXmlDocument* xdoc,
return ossim::getPath(path, xdoc, s);
}
+bool ossimRadarSat2ProductDoc::getBeamModeMnemonic(
+ const ossimXmlDocument* xdoc, ossimString& s) const
+{
+ ossimString path = "/product/sourceAttributes/beamModeMnemonic";
+ return ossim::getPath(path, xdoc, s);
+}
+
bool ossimRadarSat2ProductDoc::getImageId(const ossimXmlDocument* xdoc,
ossimString& s) const
{
@@ -635,6 +642,14 @@ bool ossimRadarSat2ProductDoc::getImageId(const ossimXmlDocument* xdoc,
return ossim::getPath(path, xdoc, s);
}
+bool ossimRadarSat2ProductDoc::getAcquisitionType(
+ const ossimXmlDocument* xdoc, ossimString& s) const
+{
+ ossimString path =
+ "/product/sourceAttributes/radarParameters/acquisitionType";
+ return ossim::getPath(path, xdoc, s);
+}
+
bool ossimRadarSat2ProductDoc::getRadarCenterFrequency(
const ossimXmlDocument* xdoc, ossimString& s) const
{
diff --git a/Utilities/otbossimplugins/ossim/ossimRadarSat2ProductDoc.h b/Utilities/otbossimplugins/ossim/ossimRadarSat2ProductDoc.h
index 867c120b524868926d92770aebebaa8167d01808..d2e162f34fa5b98ead524bb407d5315c059c0868 100644
--- a/Utilities/otbossimplugins/ossim/ossimRadarSat2ProductDoc.h
+++ b/Utilities/otbossimplugins/ossim/ossimRadarSat2ProductDoc.h
@@ -107,9 +107,17 @@ public:
bool getSensor(const ossimXmlDocument* xdoc,
ossimString& s) const;
+ /** /product/sourceAttributes/beamModeMnemonic */
+ bool getBeamModeMnemonic(const ossimXmlDocument* xdoc,
+ ossimString& s) const;
+
bool getImageId(const ossimXmlDocument* xdoc,
ossimString& s) const;
+ /** /product/sourceAttributes/radarParameters/acquisitionType */
+ bool getAcquisitionType(const ossimXmlDocument* xdoc,
+ ossimString& s) const;
+
bool getRadarCenterFrequency(const ossimXmlDocument* xdoc,
ossimString& s) const;
diff --git a/Utilities/otbossimplugins/ossim/otb/SensorParams.cpp b/Utilities/otbossimplugins/ossim/otb/SensorParams.cpp
index a254b5bb640b8364e853f9fa4126d3bada99e827..37c2df41783b187851808c58d6d83f533e304cbe 100644
--- a/Utilities/otbossimplugins/ossim/otb/SensorParams.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/SensorParams.cpp
@@ -1,237 +1,237 @@
-//----------------------------------------------------------------------------
-//
-// "Copyright Centre National d'Etudes Spatiales"
-//
-// License: LGPL
-//
-// See LICENSE.txt file in the top level directory for more details.
-//
-//----------------------------------------------------------------------------
-// $Id$
-
-#include <SensorParams.h>
-#include <ossim/base/ossimKeywordlist.h>
-#include <ossim/base/ossimString.h>
-
-namespace ossimplugins
-{
-
-
-static const char PREFIX[] = "sensor_params.";
-static const char PRF_KW[] = "prf";
-static const char SF_KW[] = "sampling_frequency";
-static const char RWL_KW[] = "radar_wave_length";
-static const char COL_DIR_KW[] = "column_direction";
-static const char LIN_DIR_KW[] = "line_direction";
-static const char SIGHT_DIR_KW[] = "sight_direction";
-static const char SEMI_MAJOR_AXIS_KW[] = "semi_major_axis";
-static const char SEMI_MINOR_AXIS_KW[] = "semi_minor_axis";
-static const char NUM_AZIMUTH_LOOKS_KW[] = "number_azimuth_looks";
-static const char NUM_RANGE_LOOKS_KW[] = "number_range_looks";
-
-SensorParams::SensorParams():
- _prf(0.0),
- _sf(0.0),
- _rwl(0.0),
- _col_direction(1),
- _lin_direction(1),
- _sightDirection(Right),
- _semiMajorAxis(6378137.0),
- _semiMinorAxis(6356752.3141),
- _nAzimuthLook(1),
- _nRangeLook(1)
-{
-}
-
-SensorParams::~SensorParams()
-{
-}
-
-SensorParams::SensorParams(const SensorParams& rhs):
- _prf(rhs._prf),
- _sf(rhs._sf),
- _rwl(rhs._rwl),
- _col_direction(rhs._col_direction),
- _lin_direction(rhs._lin_direction),
- _sightDirection(rhs._sightDirection),
- _semiMajorAxis(rhs._semiMajorAxis),
- _semiMinorAxis(rhs._semiMinorAxis),
- _nAzimuthLook(rhs._nAzimuthLook),
- _nRangeLook(rhs._nRangeLook)
-{
-}
-
-SensorParams& SensorParams::operator=(const SensorParams& rhs)
-{
- _prf = rhs._prf;
- _sf = rhs._sf;
- _rwl = rhs._rwl;
- _col_direction = rhs._col_direction;
- _lin_direction = rhs._lin_direction;
- _sightDirection = rhs._sightDirection;
- _semiMajorAxis = rhs._semiMajorAxis;
- _semiMinorAxis = rhs._semiMinorAxis;
- _nAzimuthLook = rhs._nAzimuthLook;
- _nRangeLook = rhs._nRangeLook;
- _semiMajorAxis = rhs._semiMajorAxis;
- _semiMinorAxis = rhs._semiMinorAxis;
- return *this;
-}
-
-bool SensorParams::saveState(ossimKeywordlist& kwl, const char* prefix) const
-{
- std::string pfx;
- if (prefix)
- {
- pfx = prefix;
- }
- pfx += PREFIX;
-
- kwl.add(pfx.c_str(), PRF_KW, _prf);
- kwl.add(pfx.c_str(), SF_KW, _sf);
- kwl.add(pfx.c_str(), RWL_KW, _rwl);
- kwl.add(pfx.c_str(), COL_DIR_KW, _col_direction);
- kwl.add(pfx.c_str(), LIN_DIR_KW, _lin_direction);
- kwl.add(pfx.c_str(), SIGHT_DIR_KW, static_cast<int>(_sightDirection));
- kwl.add(pfx.c_str(), SEMI_MAJOR_AXIS_KW, _semiMajorAxis);
- kwl.add(pfx.c_str(), SEMI_MINOR_AXIS_KW, _semiMinorAxis);
- kwl.add(pfx.c_str(), NUM_AZIMUTH_LOOKS_KW, _nAzimuthLook);
- kwl.add(pfx.c_str(), NUM_RANGE_LOOKS_KW, _nRangeLook);
-
- return true;
-}
-
-bool SensorParams::loadState(const ossimKeywordlist& kwl, const char* prefix)
-{
- bool result = true;
-
- std::string pfx;
- if (prefix)
- {
- pfx = prefix;
- }
- pfx += PREFIX;
-
- ossimString s;
- const char* lookup = 0;
-
- lookup = kwl.find(pfx.c_str(), PRF_KW);
- if (lookup)
- {
- s = lookup;
- _prf = s.toDouble();
- }
- else
- {
- result = false;
- }
-
- lookup = kwl.find(pfx.c_str(), SF_KW);
- if (lookup)
- {
- s = lookup;
- _sf = s.toDouble();
- }
- else
- {
- result = false;
- }
-
- lookup = kwl.find(pfx.c_str(), RWL_KW);
- if (lookup)
- {
- s = lookup;
- _rwl = s.toDouble();
- }
- else
- {
- result = false;
- }
-
- lookup = kwl.find(pfx.c_str(), COL_DIR_KW);
- if (lookup)
- {
- s = lookup;
- _col_direction = s.toInt();
- }
- else
- {
- result = false;
- }
-
- lookup = kwl.find(pfx.c_str(), LIN_DIR_KW);
- if (lookup)
- {
- s = lookup;
- _lin_direction = s.toInt();
- }
- else
- {
- result = false;
- }
-
- lookup = kwl.find(pfx.c_str(), SIGHT_DIR_KW);
- if (lookup)
- {
- s = lookup;
- if ( s.toInt() == 0 )
- {
- _sightDirection = SensorParams::Left;
- }
- else
- {
- _sightDirection = SensorParams::Right;
- }
- }
- else
- {
- result = false;
- }
-
- lookup = kwl.find(pfx.c_str(), SEMI_MAJOR_AXIS_KW);
- if (lookup)
- {
- s = lookup;
- _semiMajorAxis = s.toDouble();
- }
- else
- {
- result = false;
- }
-
- lookup = kwl.find(pfx.c_str(), SEMI_MINOR_AXIS_KW);
- if (lookup)
- {
- s = lookup;
- _semiMinorAxis = s.toDouble();
- }
- else
- {
- result = false;
- }
-
- lookup = kwl.find(pfx.c_str(), NUM_AZIMUTH_LOOKS_KW);
- if (lookup)
- {
- s = lookup;
- _nAzimuthLook = s.toDouble();
- }
- else
- {
- result = false;
- }
-
- lookup = kwl.find(pfx.c_str(), NUM_RANGE_LOOKS_KW);
- if (lookup)
- {
- s = lookup;
- _nRangeLook = s.toDouble();
- }
- else
- {
- result = false;
- }
-
- return result;
-}
-}
+//----------------------------------------------------------------------------
+//
+// "Copyright Centre National d'Etudes Spatiales"
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+//----------------------------------------------------------------------------
+// $Id$
+
+#include <SensorParams.h>
+#include <ossim/base/ossimKeywordlist.h>
+#include <ossim/base/ossimString.h>
+
+namespace ossimplugins
+{
+
+
+static const char PREFIX[] = "sensor_params.";
+static const char PRF_KW[] = "prf";
+static const char SF_KW[] = "sampling_frequency";
+static const char RWL_KW[] = "radar_wave_length";
+static const char COL_DIR_KW[] = "column_direction";
+static const char LIN_DIR_KW[] = "line_direction";
+static const char SIGHT_DIR_KW[] = "sight_direction";
+static const char SEMI_MAJOR_AXIS_KW[] = "semi_major_axis";
+static const char SEMI_MINOR_AXIS_KW[] = "semi_minor_axis";
+static const char NUM_AZIMUTH_LOOKS_KW[] = "number_azimuth_looks";
+static const char NUM_RANGE_LOOKS_KW[] = "number_range_looks";
+
+SensorParams::SensorParams():
+ _prf(0.0),
+ _sf(0.0),
+ _rwl(0.0),
+ _col_direction(1),
+ _lin_direction(1),
+ _sightDirection(Right),
+ _semiMajorAxis(6378137.0),
+ _semiMinorAxis(6356752.3141),
+ _nAzimuthLook(1),
+ _nRangeLook(1)
+{
+}
+
+SensorParams::~SensorParams()
+{
+}
+
+SensorParams::SensorParams(const SensorParams& rhs):
+ _prf(rhs._prf),
+ _sf(rhs._sf),
+ _rwl(rhs._rwl),
+ _col_direction(rhs._col_direction),
+ _lin_direction(rhs._lin_direction),
+ _sightDirection(rhs._sightDirection),
+ _semiMajorAxis(rhs._semiMajorAxis),
+ _semiMinorAxis(rhs._semiMinorAxis),
+ _nAzimuthLook(rhs._nAzimuthLook),
+ _nRangeLook(rhs._nRangeLook)
+{
+}
+
+SensorParams& SensorParams::operator=(const SensorParams& rhs)
+{
+ _prf = rhs._prf;
+ _sf = rhs._sf;
+ _rwl = rhs._rwl;
+ _col_direction = rhs._col_direction;
+ _lin_direction = rhs._lin_direction;
+ _sightDirection = rhs._sightDirection;
+ _semiMajorAxis = rhs._semiMajorAxis;
+ _semiMinorAxis = rhs._semiMinorAxis;
+ _nAzimuthLook = rhs._nAzimuthLook;
+ _nRangeLook = rhs._nRangeLook;
+ _semiMajorAxis = rhs._semiMajorAxis;
+ _semiMinorAxis = rhs._semiMinorAxis;
+ return *this;
+}
+
+bool SensorParams::saveState(ossimKeywordlist& kwl, const char* prefix) const
+{
+ std::string pfx;
+ if (prefix)
+ {
+ pfx = prefix;
+ }
+ pfx += PREFIX;
+
+ kwl.add(pfx.c_str(), PRF_KW, _prf);
+ kwl.add(pfx.c_str(), SF_KW, _sf);
+ kwl.add(pfx.c_str(), RWL_KW, _rwl);
+ kwl.add(pfx.c_str(), COL_DIR_KW, _col_direction);
+ kwl.add(pfx.c_str(), LIN_DIR_KW, _lin_direction);
+ kwl.add(pfx.c_str(), SIGHT_DIR_KW, static_cast<int>(_sightDirection));
+ kwl.add(pfx.c_str(), SEMI_MAJOR_AXIS_KW, _semiMajorAxis);
+ kwl.add(pfx.c_str(), SEMI_MINOR_AXIS_KW, _semiMinorAxis);
+ kwl.add(pfx.c_str(), NUM_AZIMUTH_LOOKS_KW, _nAzimuthLook);
+ kwl.add(pfx.c_str(), NUM_RANGE_LOOKS_KW, _nRangeLook);
+
+ return true;
+}
+
+bool SensorParams::loadState(const ossimKeywordlist& kwl, const char* prefix)
+{
+ bool result = true;
+
+ std::string pfx;
+ if (prefix)
+ {
+ pfx = prefix;
+ }
+ pfx += PREFIX;
+
+ ossimString s;
+ const char* lookup = 0;
+
+ lookup = kwl.find(pfx.c_str(), PRF_KW);
+ if (lookup)
+ {
+ s = lookup;
+ _prf = s.toDouble();
+ }
+ else
+ {
+ result = false;
+ }
+
+ lookup = kwl.find(pfx.c_str(), SF_KW);
+ if (lookup)
+ {
+ s = lookup;
+ _sf = s.toDouble();
+ }
+ else
+ {
+ result = false;
+ }
+
+ lookup = kwl.find(pfx.c_str(), RWL_KW);
+ if (lookup)
+ {
+ s = lookup;
+ _rwl = s.toDouble();
+ }
+ else
+ {
+ result = false;
+ }
+
+ lookup = kwl.find(pfx.c_str(), COL_DIR_KW);
+ if (lookup)
+ {
+ s = lookup;
+ _col_direction = s.toInt();
+ }
+ else
+ {
+ result = false;
+ }
+
+ lookup = kwl.find(pfx.c_str(), LIN_DIR_KW);
+ if (lookup)
+ {
+ s = lookup;
+ _lin_direction = s.toInt();
+ }
+ else
+ {
+ result = false;
+ }
+
+ lookup = kwl.find(pfx.c_str(), SIGHT_DIR_KW);
+ if (lookup)
+ {
+ s = lookup;
+ if ( s.toInt() == 0 )
+ {
+ _sightDirection = SensorParams::Left;
+ }
+ else
+ {
+ _sightDirection = SensorParams::Right;
+ }
+ }
+ else
+ {
+ result = false;
+ }
+
+ lookup = kwl.find(pfx.c_str(), SEMI_MAJOR_AXIS_KW);
+ if (lookup)
+ {
+ s = lookup;
+ _semiMajorAxis = s.toDouble();
+ }
+ else
+ {
+ result = false;
+ }
+
+ lookup = kwl.find(pfx.c_str(), SEMI_MINOR_AXIS_KW);
+ if (lookup)
+ {
+ s = lookup;
+ _semiMinorAxis = s.toDouble();
+ }
+ else
+ {
+ result = false;
+ }
+
+ lookup = kwl.find(pfx.c_str(), NUM_AZIMUTH_LOOKS_KW);
+ if (lookup)
+ {
+ s = lookup;
+ _nAzimuthLook = s.toDouble();
+ }
+ else
+ {
+ result = false;
+ }
+
+ lookup = kwl.find(pfx.c_str(), NUM_RANGE_LOOKS_KW);
+ if (lookup)
+ {
+ s = lookup;
+ _nRangeLook = s.toDouble();
+ }
+ else
+ {
+ result = false;
+ }
+
+ return result;
+}
+}