- Correction commentaires de la classe otbImageList,

- Création de la classe otbImageListSource,
- Création de la classe otbImageToImageListFilter.

Code/Common/otbImageList.h

@@ -35,7 +35,7 @@ class ImageList
   : public ObjectList<TImage>
   {
   public:
-    /** Standards typedefs */
+    /** Standard typedefs */
     typedef ImageList Self;
     typedef ObjectList<TImage> Superclass;
     typedef itk::SmartPointer<Self> Pointer;
@@ -60,7 +60,7 @@ class ImageList
     ImageList(){};
     /** Destructor */
     ~ImageList(){};
-    /**PrintSelf method */
+    /** PrintSelf method */
     void PrintSelf(std::ostream& os, itk::Indent indent) const 
       {
 	Superclass::PrintSelf(os,indent);

Code/Common/otbImageListSource.h

+/*=========================================================================
+
+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 _otbImageListSource_h
+#define _otbImageListSource_h
+
+#include "itkProcessObject.h"
+#include "otbImageList.h"
+
+namespace otb
+{
+/** \class ImageListSource
+ *  \brief Base class for all the filters producing an otbImageList
+ * \ingroup DataSources
+ * \ingroup Images
+ * \ingroup Lists
+ */
+template <class TOutputImage>
+class ITK_EXPORT ImageListSource
+  : public itk::ProcessObject
+{
+public:
+  /** Standard typedefs */
+  typedef ImageListSource                           Self;
+  typedef itk::ProcessObject                        Superclass;
+  typedef itk::SmartPointer<Self>                   Pointer;
+  typedef itk::SmartPointer<const Self>             ConstPointer;
+  /** Type macro */
+  itkNewMacro(Self);
+  /** Creation through object factory macro */
+  itkTypeMacro(ImageListSource,itk::ProcessObject);
+  /** Data object pointer type */
+  typedef itk::DataObject::Pointer DataObjectPointer;
+  /** Template parameter typedef*/ 
+  typedef TOutputImage                               OutputImageType;
+  typedef typename OutputImageType::Pointer          OutputImagePointerType;
+  typedef ImageList<OutputImageType>                 OutputImageListType;
+  typedef typename OutputImageListType::Pointer      OutputImageListPointerType;
+  typedef typename OutputImageListType::ConstPointer OutputImageListConstPointerType;
+  /** Overiding of the GetOutput() method */
+  virtual OutputImageListType * GetOutput(void);
+
+protected:
+  /** Constructor */
+  ImageListSource();
+  /** Destructor */
+  virtual ~ImageListSource() {}
+  /**PrintSelf method */
+  void PrintSelf(std::ostream& os, itk::Indent indent) const;
+
+private:
+  ImageListSource(const Self&);//purposely not implemented
+  void operator=(const Self&); //purposely not implemented 
+};
+} // End namespace otb
+
+#ifndef OTB_MANUAL_INSTANTIATION
+#include "otbImageListSource.txx"
+#endif
+#endif

Code/Common/otbImageListSource.txx

+/*=========================================================================
+
+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 _otbImageListSource_txx
+#define _otbImageListSource_txx
+
+#include "otbImageListSource.h"
+
+namespace otb
+{
+/**
+ *   Constructor
+ */
+template <class TOutputImage>
+ImageListSource<TOutputImage>
+::ImageListSource()
+{
+  this->Superclass::SetNumberOfRequiredOutputs(1);
+  this->Superclass::SetNthOutput(0,ImageList<TOutputImage>::New().GetPointer());
+}
+/**
+ * Get the output image list
+ * \return The image list produced.
+ */
+template <class TOutputImage>
+typename ImageListSource<TOutputImage>::OutputImageListType *
+ImageListSource<TOutputImage>
+::GetOutput(void)
+{
+  if(this->GetNumberOfOutputs()<1)
+    {
+    return 0;
+    }
+  return static_cast<OutputImageListType *> (this->ProcessObject::GetOutput(0));
+}
+/**
+ * PrintSelf Method
+ */
+template<class TOutputImage>
+void
+ImageListSource<TOutputImage>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
+{
+  Superclass::PrintSelf(os,indent);
+}
+}// End namespace otb
+#endif

Code/Common/otbImageToImageListFilter.h

+/*=========================================================================
+
+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 _otbImageToImageListFilter_h
+#define _otbImageToImageListFilter_h
+
+#include "otbImageListSource.h"
+
+namespace otb 
+{
+/** \class ImageListSource
+ *  \brief Base class for all the filters taking an image input 
+ *  to produce an image list.
+ * \ingroup Images
+ * \ingroup Lists
+ */
+template <class TInputImage, class TOutputImage>
+class ITK_EXPORT ImageToImageListFilter
+  : public ImageListSource<TOutputImage>
+{
+public:
+  /** Standard typedefs */
+  typedef ImageToImageListFilter            Self;
+  typedef ImageListSource<TOutputImage>     Superclass;
+  typedef itk::SmartPointer<Self>           Pointer;
+  typedef itk::SmartPointer<const Self>     ConstPointer;
+  /** Type macro */
+  itkNewMacro(Self);
+  /** Creation through object factory macro */
+  itkTypeMacro(ImageToImageListFilter, ImageListSource);
+  /** Template parameters typedefs */
+  typedef          TInputImage                    InputImageType;
+  typedef typename InputImageType::ConstPointer   InputImagePointer;
+  typedef typename InputImageType::RegionType     InputImageRegionType;
+  typedef typename InputImageType::PixelType      InputImagePixelType;
+  typedef typename InputImageType::SizeType       SizeType;
+  typedef typename InputImageType::ValueType      ValueType;
+  /** Derived typedefs */
+  typedef typename Superclass::OutputImageType         OutputImageType;
+  typedef typename Superclass::OutputImageListType     OutputImageListType;
+  typedef typename Superclass::OutputImagePointerType  OutputImagePointerType;
+  /** InputImage dimension constant */
+  itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
+  /** Overiding the SetInput() and GetInput() methods */
+  virtual void SetInput( const InputImageType * image);
+  InputImageType * GetInput(void);
+
+protected:
+  /** Constructor */
+  ImageToImageListFilter();
+  /** Destructor */
+  virtual ~ImageToImageListFilter() {};
+ /**PrintSelf method */
+  virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+
+private:
+  ImageToImageListFilter(const Self&); //purposely not implemented
+  void operator=(const Self&); //purposely not implemented
+};
+}// End namespace otb
+#ifndef OTB_MANUAL_INSTANTIATION
+#include "otbImageToImageListFilter.txx"
+#endif
+
+#endif

Code/Common/otbImageToImageListFilter.txx

+/*=========================================================================
+
+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 _otbImageToImageListFilter_txx
+#define _otbImageToImageListFilter_txx
+
+#include "otbImageToImageListFilter.h"
+
+namespace otb
+{
+/**
+ * Constructor
+ */
+template <class TInputImage, class TOutputImage>
+ImageToImageListFilter<TInputImage,TOutputImage>
+::ImageToImageListFilter()
+{
+  this->SetNumberOfRequiredInputs(1);
+}
+/**
+ * Input Connection 
+ * \param image The input image.
+ */
+template <class TInputImage, class TOutputImage>
+void
+ImageToImageListFilter<TInputImage,TOutputImage>
+::SetInput(const InputImageType *image)
+{
+  // A single input image
+  this->itk::ProcessObject::SetNthInput(0,const_cast<InputImageType*>(image));
+}
+/**
+ * Input image retrieval 
+ * \return The input image.
+ */
+template <class TInputImage, class TOutputImage>
+typename ImageToImageListFilter<TInputImage,TOutputImage>::InputImageType *
+ImageToImageListFilter<TInputImage,TOutputImage>
+::GetInput(void)
+{
+  // If there is no input 
+  if (this->GetNumberOfInputs()<1)
+    {
+    // exit
+    return 0;
+    }
+  // else return the first input
+  return static_cast<TInputImage * >
+    (this->itk::ProcessObject::GetInput(0) );
+}
+/**
+ * PrintSelf Method
+ */
+template <class TInputImage, class TOutputImage>
+void
+ImageToImageListFilter<TInputImage,TOutputImage>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
+{
+  Superclass::PrintSelf(os, indent);
+}
+} // End namespace otb
+#endif

Testing/Code/Common/CMakeLists.txt

@@ -251,6 +251,16 @@ ADD_TEST(coTvImageList ${COMMON_TESTS}
          ${TEMP}/coImageList_amst.png
 )
 
+# -------            otb::ImageListSource   -------------------------------------------
+
+ADD_TEST(coTuImageListSourceNew ${COMMON_TESTS} 
+         otbImageListSourceNew)  
+
+# -------            otb::ImageToImageListFilter   -------------------------------------------
+
+ADD_TEST(coTuImageToImageListFilterNew ${COMMON_TESTS} 
+         otbImageToImageListFilterNew) 
+
          
 # -------       Fichiers sources CXX -----------------------------------
 SET(BasicCommon_SRCS
@@ -280,6 +290,8 @@ otbObjectListNew.cxx
 otbObjectList.cxx
 otbImageListNew.cxx
 otbImageList.cxx
+otbImageListSourceNew.cxx
+otbImageToImageListFilterNew.cxx
 )
 
 

Testing/Code/Common/otbCommonTests.cxx

@@ -52,4 +52,6 @@ REGISTER_TEST(otbObjectListNew);
 REGISTER_TEST(otbObjectList);
 REGISTER_TEST(otbImageListNew);
 REGISTER_TEST(otbImageList);
+REGISTER_TEST(otbImageListSourceNew);
+REGISTER_TEST(otbImageToImageListFilterNew);
 }

Testing/Code/Common/otbImageListSourceNew.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 "otbImageListSource.h"
+#include "otbImage.h"
+
+int otbImageListSourceNew(int argc, char * argv[])
+{
+  try
+    {
+      const unsigned int Dimension = 2;
+      typedef unsigned char InputPixelType;
+      typedef otb::Image<InputPixelType,Dimension> InputImageType;
+      typedef otb::ImageListSource<InputImageType> ImageListSourceType;
+
+      // Instantiating ImageListSource object
+      ImageListSourceType::Pointer imageList = ImageListSourceType::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/Common/otbImageToImageListFilterNew.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 "otbImageToImageListFilter.h"
+#include "otbImage.h"
+
+int otbImageToImageListFilterNew(int argc, char * argv[])
+{
+  try
+    {
+      const unsigned int Dimension = 2;
+      typedef unsigned char InputPixelType;
+      typedef unsigned char OutputPixelType;
+      typedef otb::Image<InputPixelType,Dimension> InputImageType;
+      typedef otb::Image<OutputPixelType,Dimension> OutputImageType;
+      typedef otb::ImageToImageListFilter<InputImageType,OutputImageType> ImageToImageListFilterType;
+
+      // Instantiating ImageListSource object
+      ImageToImageListFilterType::Pointer imageList = ImageToImageListFilterType::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;
+}