nomsg

Code/FeatureExtraction/otbFillGapsFilter.h

@@ -28,7 +28,7 @@ class ITK_EXPORT FillGapsFilter : public itk::ProcessObject
 {
 public:
   /** Standard class typedefs. */
-  typedef FillGapsFilter                                      Self;
+  typedef FillGapsFilter                                Self;
   typedef itk::ProcessObject                            Superclass;
   typedef itk::SmartPointer<Self>                       Pointer;
   typedef itk::SmartPointer<const Self>                 ConstPointer;
@@ -40,29 +40,33 @@ public:
   itkTypeMacro(FillGapsFilter,itk::ProcessObject);
 
   /** Some convenient typedefs. */
-  typedef otb::LineSpatialObjectList                           LineSpatialObjectListType;
-  typedef LineSpatialObjectListType::LineType                  LineSpatialObjectType;
+  typedef LineSpatialObjectList                                 LineSpatialObjectListType;
+  typedef LineSpatialObjectListType::Pointer                    LineSpatialObjectListPointer;
+  typedef LineSpatialObjectListType::LineType                   LineSpatialObjectType;
 
-  
-  /** Set the list of LineSpatialObject of this process object.  */
-  void SetOutput(const LineSpatialObjectListType & pLineSpatialObjectList);
+  typedef itk::DataObject                                       DataObject;
+  typedef itk::DataObject::Pointer                              DataObjectPointer;
+  DataObjectPointer  MakeOutput(unsigned int idx);
 
-  /** Get the list of LineSpatialObject of this process object.  */
-  LineSpatialObjectListType & GetOutput(void);
+  itkSetMacro(AngularBeam, double);
+  itkGetConstReferenceMacro(AngularBeam, double);  
+  itkSetMacro(Radius, double);
+  itkGetConstReferenceMacro(Radius, double);  
   
 protected:
   FillGapsFilter();
-  virtual ~FillGapsFilter() {}
+  virtual ~FillGapsFilter();
   void PrintSelf(std::ostream& os, itk::Indent indent) const;
   
+  virtual void GenerateData();
+  
 private:
   FillGapsFilter(const Self&); //purposely not implemented
   void operator=(const Self&); //purposely not implemented
 
-
-        LineSpatialObjectListType m_InputLineSpatialObjectList;
-        LineSpatialObjectListType m_OutputLineSpatialObjectList;
-
+  double m_AngularBeam;
+  double m_Radius;
+  
 };
   
 

Code/FeatureExtraction/otbFillGapsFilter.txx

@@ -22,27 +22,45 @@ namespace otb
  */
 FillGapsFilter::FillGapsFilter()
 {
-        m_InputLineSpatialObjectList.clear();
-        m_OutputLineSpatialObjectList.clear();
+        this->itk::ProcessObject::SetNumberOfRequiredInputs(1);
+        this->itk::ProcessObject::SetNumberOfRequiredOutputs(1);
+
+        LineSpatialObjectListPointer output
+                = dynamic_cast<LineSpatialObjectListType*>(this->MakeOutput(0).GetPointer()); 
+
+        this->itk::ProcessObject::SetNthOutput(0, output.GetPointer());
 }
 
 /**
  *
  */
+FillGapsFilter::~FillGapsFilter()
+{
+}
 
-void FillGapsFilter::
-SetOutput(const LineSpatialObjectListType & pLineSpatialObjectList)
+/**
+ *
+ */
+itk::DataObject::Pointer
+FillGapsFilter
+::MakeOutput(unsigned int)
 {
-        m_InputLineSpatialObjectList = pLineSpatialObjectList;
-        this->Modified();
+  LineSpatialObjectListPointer  outputList = LineSpatialObjectListType::New();
+  return dynamic_cast< DataObject *>( outputList.GetPointer() );
 }
 
-FillGapsFilter::LineSpatialObjectListType &
-FillGapsFilter::GetOutput(void)
+/**
+ *
+ */
+
+void 
+FillGapsFilter
+::GenerateData()
 {
-        return(m_OutputLineSpatialObjectList);
+        //Algo
 }
 
+
 /**
  *
  */