Modification de la class de base PathListSource afin qu'elle corresponde à...

Modification de la class de base PathListSource afin qu'elle corresponde à l'interface standard pour le pipeline. Répercution des modifications dans les autres classes.

Code/Common/otbDrawPathListFilter.txx

@@ -185,13 +185,13 @@ DrawPathListFilter<TInputImage,TInputPath,TOutputImage>
      outputIt.Set( inputIt.Get() );
     }
     
-  int nbPath = InputPath->size();
+  int nbPath = InputPath->Size();
   
   otbMsgDevMacro( <<"nbPath: " <<nbPath);
  
   for(int i =0 ; i<nbPath ;i++)
      {
-     vertexList = (*InputPath)[i]->GetVertexList();
+     vertexList = InputPath->GetNthElement(i)->GetVertexList();
      cindex = vertexList->GetElement(0);
      RealType x1 = cindex[0];
      RealType y1 = cindex[1];

Code/Common/otbPathListSource.h

@@ -15,14 +15,11 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-
 #ifndef _otbPathListSource_h
 #define _otbPathListSource_h
 
-#include "itkPathSource.h"
-
-#include <list>
-#include <vector>
+#include "itkProcessObject.h"
+#include "otbObjectList.h"
 
 namespace otb
 {
@@ -39,12 +36,12 @@ namespace otb
  */
 
 template <class TOutputPath >
-class ITK_EXPORT PathListSource : public itk::PathSource< TOutputPath >
+  class ITK_EXPORT PathListSource : public itk::ProcessObject
 {
 public:
   /** Standard class typedefs. */
   typedef PathListSource                 Self;
-  typedef itk::PathSource<TOutputPath>   Superclass;
+  typedef itk::ProcessObject             Superclass;
   typedef itk::SmartPointer<Self>        Pointer;
   typedef itk::SmartPointer<const Self>  ConstPointer;
     
@@ -52,30 +49,23 @@ public:
   itkNewMacro(Self);
   
   /** Run-time type information (and related methods). */
-  itkTypeMacro(PathListSource,itk::PathSource);
+  itkTypeMacro(PathListSource,itk::ProcessObject);
   
   /** Some convenient typedefs. */
   
-  typedef TOutputPath                                   	OutputPathType;
-  typedef typename OutputPathType::Pointer                      OutputPathPointerType;
-  typedef std::vector< OutputPathPointerType >   		OutputPathListType;
-
-  typedef OutputPathListType *                         OutputPathListPointerType;
-  typedef const OutputPathListType *                   OutputPathListConstPointerType;
-  
-  OutputPathListType * GetOutput(void)
-  {
-  	OutputPathListType * ptr = ( & (this->m_ListPath) );
-	return (ptr);
-  }
+  typedef TOutputPath                               OutputPathType;
+  typedef typename OutputPathType::Pointer          OutputPathPointerType;
+  typedef otb::ObjectList<OutputPathType>           OutputPathListType;
+  typedef typename OutputPathListType::Pointer      OutputPathListPointerType;
+  typedef typename OutputPathListType::ConstPointer OutputPathListConstPointerType;
   
+  /** Overiding of the GetOutput() method */
+  OutputPathListType * GetOutput(void);
+
 protected:
   PathListSource();
   virtual ~PathListSource() {}
   void PrintSelf(std::ostream& os, itk::Indent indent) const;
-  
-//  OutputPathListPointer m_ListPath;
-  OutputPathListType m_ListPath;
     
 private:
   PathListSource(const Self&); //purposely not implemented

Code/Common/otbPathListSource.txx

@@ -24,18 +24,30 @@ namespace otb
 {
 
 /**
- *
+ * Constructor
  */
 template<class TOutputPath>
 PathListSource<TOutputPath>
 ::PathListSource()
 {
-	m_ListPath.clear();
+  this->Superclass::SetNumberOfRequiredOutputs(1);
+  this->Superclass::SetNthOutput(0,ObjectList<TOutputPath>::New().GetPointer());
 }
-
 /**
- *
+ * Get the output path list
+ * \return The output path list
  */
+template<class TOutputPath>
+typename PathListSource<TOutputPath>::OutputPathListType *
+PathListSource<TOutputPath>
+::GetOutput(void)
+{
+  if(this->GetNumberOfOutputs()<1)
+    {
+    return 0;
+    }
+  return static_cast<OutputPathListType *> (this->ProcessObject::GetOutput(0));
+}
 
 template<class TOutputPath>
 void 

Code/FeatureExtraction/otbImageToPathListAlignFilter.txx

@@ -528,8 +528,8 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
   seglist.resize(5*iseglist);
 
   /* build segments list */
-  OutputPath->clear();
-//  OutputPath->resize(iseglist);
+  OutputPath->Clear();
+//  OutputPath->Resize(iseglist);
   
   typedef typename OutputPathType::ContinuousIndexType ContinuousIndexType;
   typename InputImageType::PointType point;
@@ -548,7 +548,7 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
     cindex[1] = seglist[i*5+3];
     path->AddVertex(cindex);
     
-    OutputPath->push_back(path);
+    OutputPath->PushBack(path);
   }
   itkDebugMacro(<< "ImageToPathListAlignFilter::GenerateData() finished");
 

Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx

@@ -101,11 +101,11 @@ int otbAlignImageToPath( int argc, char * argv[] )
 	VertexType cindex;
 	double x1,y1,x2,y2;
 	  
-	int nbPath = sortiePath->size();
+	int nbPath = sortiePath->Size();
 	printf("NbSegment: %d\n",nbPath);
 	fprintf(file,"Nb Segment: %d\n",nbPath);
 	for (int i =0 ; i<nbPath ;i++){
-	   vertexList = (*sortiePath)[i]->GetVertexList();
+	   vertexList = sortiePath->GetNthElement(i)->GetVertexList();
 	   cindex = vertexList->GetElement(0);
 	   x1 = cindex[0];
 	   y1 = cindex[1];

Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx

@@ -77,7 +77,7 @@ int otbDrawPathAlign( int argc, char * argv[] )
 	testList->Update(); 
 	
 	OutputPathListType * sortiePath = testList->GetOutput();
-	int nbPath = sortiePath->size();
+	int nbPath = sortiePath->Size();
 	std::cout << "NbPath: " << nbPath << std::endl;
 	
 	InputImageType::ConstPointer imageIn   = reader->GetOutput();
@@ -89,7 +89,7 @@ int otbDrawPathAlign( int argc, char * argv[] )
 	OutputImageType::Pointer  imageOut  = OutputImageType::New();
 	    
 	DrawPath->SetImageInput( imageIn    );
-	DrawPath->SetPathInput(  (*sortiePath)[i]);
+	DrawPath->SetPathInput( sortiePath->GetNthElement(i));
 	imageOut = DrawPath->GetOutput();
 	imageOut->Update();
 	

Testing/Code/FeatureExtraction/otbDrawPathListTracerLignes.cxx

@@ -85,7 +85,7 @@ int otbDrawPathListTracerLignes( int argc, char * argv[] )
 	image->TransformPhysicalPointToContinuousIndex(pos,cindex);
         pathElt1->AddVertex(cindex);
     
-        path->push_back(pathElt1);
+        path->PushBack(pathElt1);
 	
         /*2eme Segment*/	
 	PathType::Pointer pathElt2 = PathType::New();
@@ -99,7 +99,7 @@ int otbDrawPathListTracerLignes( int argc, char * argv[] )
 	image->TransformPhysicalPointToContinuousIndex(pos,cindex);
         pathElt2->AddVertex(cindex);
     
-        path->push_back(pathElt2);
+        path->PushBack(pathElt2);
 
         /*3eme Segment*/	
 	PathType::Pointer pathElt3 = PathType::New();
@@ -113,7 +113,7 @@ int otbDrawPathListTracerLignes( int argc, char * argv[] )
 	image->TransformPhysicalPointToContinuousIndex(pos,cindex);
         pathElt3->AddVertex(cindex);
     
-        path->push_back(pathElt3);
+        path->PushBack(pathElt3);
 
         /*4eme Segment*/	
 	PathType::Pointer pathElt4 = PathType::New();
@@ -128,7 +128,7 @@ int otbDrawPathListTracerLignes( int argc, char * argv[] )
 	image->TransformPhysicalPointToContinuousIndex(pos,cindex);
         pathElt4->AddVertex(cindex);
     
-        path->push_back(pathElt4);
+        path->PushBack(pathElt4);
 
         /*5eme Segment*/	
 	PathType::Pointer pathElt5 = PathType::New();
@@ -142,7 +142,7 @@ int otbDrawPathListTracerLignes( int argc, char * argv[] )
 	image->TransformPhysicalPointToContinuousIndex(pos,cindex);
         pathElt5->AddVertex(cindex);
     
-        path->push_back(pathElt5);
+        path->PushBack(pathElt5);
 		
         /*6eme Segment*/	
 	PathType::Pointer pathElt6 = PathType::New();
@@ -157,7 +157,7 @@ int otbDrawPathListTracerLignes( int argc, char * argv[] )
 	image->TransformPhysicalPointToContinuousIndex(pos,cindex);
         pathElt6->AddVertex(cindex);
     
-        path->push_back(pathElt6);
+        path->PushBack(pathElt6);