TEST: add test for otbWaveletPacketTransform

Testing/Code/MultiScale/CMakeLists.txt

@@ -381,6 +381,22 @@ ADD_TEST(msTvWaveletTransform ${MULTISCALE_TESTS4}
 ADD_TEST(msTuWaveletPacketTransformNew ${MULTISCALE_TESTS4}
          otbWaveletPacketTransformNew)
 
+ADD_TEST(msTvWaveletPacketTransform ${MULTISCALE_TESTS4}
+        --compare-n-images ${TOL} 4
+              ${BASELINE}/msTvWaveletPacketTransform-0.tif
+              ${TEMP}/msTvWaveletPacketTransform-0.tif
+              ${BASELINE}/msTvWaveletPacketTransform-1.tif
+              ${TEMP}/msTvWaveletPacketTransform-1.tif
+              ${BASELINE}/msTvWaveletPacketTransform-2.tif
+              ${TEMP}/msTvWaveletPacketTransform-2.tif
+              ${BASELINE}/msTvWaveletPacketTransform-3.tif
+              ${TEMP}/msTvWaveletPacketTransform-3.tif
+         otbWaveletPacketTransform
+          -in ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+          -l 1
+          -out ${TEMP}/msTvWaveletPacketTransform
+)
+
 # -------            otb::StationaryFilterBankNew   ----------
 ADD_TEST(msTuStationaryFilterBankNew ${MULTISCALE_TESTS4}
          otbStationaryFilterBankNew)
@@ -441,6 +457,7 @@ SET(BasicMultiScale_SRCS4
 otbWaveletTransformNew.cxx
 otbWaveletTransform.cxx
 otbWaveletPacketTransformNew.cxx
+otbWaveletPacketTransform.cxx
 otbStationaryFilterBankNew.cxx
 otbStationaryFilterBank.cxx
 )

Testing/Code/MultiScale/otbMultiScaleTests4.cxx

@@ -29,6 +29,7 @@ void RegisterTests()
   REGISTER_TEST(otbWaveletTransformNew);
   REGISTER_TEST(otbWaveletTransform);
   REGISTER_TEST(otbWaveletPacketTransformNew);
+  REGISTER_TEST(otbWaveletPacketTransform);
   REGISTER_TEST(otbStationaryFilterBankNew);
   REGISTER_TEST(otbStationaryFilterBank);
 }

Testing/Code/MultiScale/otbStationaryFilterBank.cxx

@@ -30,8 +30,8 @@
 #include "otbHaarOperator.h"
 #include "otb_9_7_Operator.h"
 
-#include <otbCommandLineArgumentParser.h>
-#include <otbCommandProgressUpdate.h>
+#include "otbCommandLineArgumentParser.h"
+#include "otbCommandProgressUpdate.h"
 
 int otbStationaryFilterBank( int argc, char ** argv )
 {

Testing/Code/MultiScale/otbWaveletPacketTransform.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.
+
+  Copyright (c) Institut Telecom / Telecom Bretagne. All rights reserved.
+  See ITCopyright.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.
+
+=========================================================================*/
+
+#if defined(_MSC_VER)
+#pragma warning ( disable : 4786 )
+#endif
+#include "otbImage.h"
+#include "otbImageFileReader.h"
+#include "otbImageFileWriter.h"
+
+#include "otbStationaryFilterBank.h"
+#include "otbWaveletPacketForwardTransform.h"
+#include "otbWPCost.h"
+
+#include "otbHaarOperator.h"
+#include "otb_9_7_Operator.h"
+
+#include "otbCommandLineArgumentParser.h"
+#include "otbCommandProgressUpdate.h"
+
+int otbWaveletPacketTransform( int argc, char ** argv )
+{
+  typedef otb::CommandLineArgumentParser ParserType;
+  ParserType::Pointer parser = ParserType::New();
+  parser->AddInputImage() ;
+  parser->AddOption( "--Level", "Decomposition level of the wavelet packet (def. 1)", "-l", 1, false );
+  parser->AddOption( "--Output", "Output filename prefix", "-out", 1, true );
+  typedef otb::CommandLineArgumentParseResult ParserResultType;
+  ParserResultType::Pointer  parseResult = ParserResultType::New();
+
+  try
+  {
+    parser->ParseCommandLine( argc, argv, parseResult );
+  }
+  catch( itk::ExceptionObject & err )
+  {
+    std::cerr << "Test foward wavelet packet transform \n";
+    std::string descriptionException = err.GetDescription();
+    if ( descriptionException.find("ParseCommandLine(): Help Parser") != std::string::npos )
+      return EXIT_SUCCESS;
+    if ( descriptionException.find("ParseCommandLine(): Version Parser") != std::string::npos )
+      return EXIT_SUCCESS;
+    return EXIT_FAILURE;
+  }
+
+  const char * inputFileName = parseResult->GetInputImage().c_str();
+  unsigned int level = parseResult->IsOptionPresent("--Level" ) ?
+      parseResult->GetParameterUInt("--Level") : 1;
+
+  const int Dimension = 2;
+  typedef double PixelType;
+  typedef otb::Image< PixelType, Dimension >  ImageType;
+  typedef otb::ImageFileReader< ImageType > ReaderType;
+
+  /* Reading */
+  ReaderType::Pointer reader = ReaderType::New();
+  reader->SetFileName( inputFileName );
+
+  /* Transformation */
+  //typedef otb::LowPassHaarOperator< PixelType, Dimension > LowPassOperator;
+  //typedef otb::HighPassHaarOperator< PixelType, Dimension > HighPassOperator;
+  typedef otb::LowPass_9_7_Operator< PixelType, Dimension > LowPassOperator;
+  typedef otb::HighPass_9_7_Operator< PixelType, Dimension > HighPassOperator;
+
+  typedef otb::StationaryFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator >
+      WaveletFilterType;
+  typedef otb::FullyDecomposedWaveletPacketCost< ImageType > CostType;
+
+  typedef otb::WaveletPacketForwardTransform< ImageType, ImageType, WaveletFilterType, CostType >
+      FilterType;
+  FilterType::Pointer filter = FilterType::New();
+  filter->SetInput( reader->GetOutput() );
+  filter->GetCost()->SetNumberOfAllowedDecompositions( level );
+
+  /* Observer */
+  typedef otb::CommandProgressUpdate< FilterType > CommandType;
+  CommandType::Pointer observer = CommandType::New();
+  filter->AddObserver( itk::ProgressEvent(), observer );
+
+  filter->Update();
+
+
+  std::string prefix = parseResult->GetParameterString("--Output");
+  for ( unsigned int i = 0; i < filter->GetOutput()->Size(); i++ )
+  {
+    std::stringstream filename;
+    filename << prefix;
+    filename << "-" << i << ".tif";
+
+    typedef otb::ImageFileWriter<ImageType> WriterType;
+    WriterType::Pointer writer = WriterType::New();
+    writer->SetFileName(filename.str());
+    writer->SetInput(filter->GetOutput()->GetNthElement(i));
+    writer->Update();
+
+  }
+  return EXIT_SUCCESS;
+}
+
+
+