X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkSliceBySliceRelativePositionFilter.h;h=e17a759b52fb810095fcc8ef3ee494c590e0ad82;hb=570f694443022e017af9d2fab9264e56a1561a61;hp=01f9cd9c833578d802af33e96ba39d0c6cfa43f7;hpb=f34fdef46fa656a1eb32271c0b9bf7d81bc7fc35;p=clitk.git

diff --git a/itk/clitkSliceBySliceRelativePositionFilter.h b/itk/clitkSliceBySliceRelativePositionFilter.h
index 01f9cd9..e17a759 100644
--- a/itk/clitkSliceBySliceRelativePositionFilter.h
+++ b/itk/clitkSliceBySliceRelativePositionFilter.h
@@ -21,6 +21,7 @@
 
 // clitk
 #include "clitkFilterBase.h"
+#include "clitkAddRelativePositionConstraintToLabelImageFilter.h"
 
 namespace clitk {
   
@@ -32,13 +33,12 @@ namespace clitk {
   
   template <class ImageType>
   class ITK_EXPORT SliceBySliceRelativePositionFilter:
-    public clitk::FilterBase, 
-    public itk::ImageToImageFilter<ImageType, ImageType> 
+    public AddRelativePositionConstraintToLabelImageFilter<ImageType>
   {
 
   public:
     /** Standard class typedefs. */
-    typedef itk::ImageToImageFilter<ImageType, ImageType> Superclass;
+    typedef AddRelativePositionConstraintToLabelImageFilter<ImageType>   Superclass;
     typedef SliceBySliceRelativePositionFilter              Self;
     typedef itk::SmartPointer<Self>                         Pointer;
     typedef itk::SmartPointer<const Self>                   ConstPointer;
@@ -50,6 +50,10 @@ namespace clitk {
     itkTypeMacro(SliceBySliceRelativePositionFilter, ImageToImageFilter);
     FILTERBASE_INIT;
 
+    /** ImageDimension constants */
+    itkStaticConstMacro(ImageDimension, unsigned int, ImageType::ImageDimension);
+    typedef itk::Image<float, ImageDimension> FloatImageType;
+
     /** Some convenient typedefs. */
     typedef typename ImageType::ConstPointer ImageConstPointer;
     typedef typename ImageType::Pointer      ImagePointer;
@@ -57,27 +61,64 @@ namespace clitk {
     typedef typename ImageType::PixelType    PixelType;
     typedef typename ImageType::SpacingType  SpacingType;
     typedef typename ImageType::SizeType     SizeType;
+    typedef itk::Image<PixelType, ImageDimension-1> SliceType;
+    typedef clitk::AddRelativePositionConstraintToLabelImageFilter<SliceType> RelPosFilterType;
+    typedef typename RelPosFilterType::OrientationTypeEnumeration OrientationTypeEnumeration;
     
-    /** ImageDimension constants */
-    itkStaticConstMacro(ImageDimension, unsigned int, ImageType::ImageDimension);
-    typedef itk::Image<float, ImageDimension> FloatImageType;
-
     /** Input : initial image and object */
     void SetInput(const ImageType * image);
     void SetInputObject(const ImageType * image);
-    
+
     // Options
+    void PrintOptions();
     itkGetConstMacro(Direction, int);
     itkSetMacro(Direction, int);
-    itkGetConstMacro(ObjectBackgroundValue, PixelType);
-    itkSetMacro(ObjectBackgroundValue, PixelType);
+    // itkGetConstMacro(ObjectBackgroundValue, PixelType);
+    // itkSetMacro(ObjectBackgroundValue, PixelType);
+
+    // itkSetMacro(OrientationTypeString, std::string);
+    // itkGetConstMacro(OrientationTypeString, std::string);
+
+    // itkGetConstMacro(ResampleBeforeRelativePositionFilter, bool);
+    // itkSetMacro(ResampleBeforeRelativePositionFilter, bool);
+    // itkBooleanMacro(ResampleBeforeRelativePositionFilter);
+
+    // itkGetConstMacro(IntermediateSpacing, double);
+    // itkSetMacro(IntermediateSpacing, double);
+
+    // itkGetConstMacro(FuzzyThreshold, double);
+    // itkSetMacro(FuzzyThreshold, double);
+
+    itkGetConstMacro(UniqueConnectedComponentBySlice, bool);
+    itkSetMacro(UniqueConnectedComponentBySlice, bool);
+    itkBooleanMacro(UniqueConnectedComponentBySlice);
+
+    // itkGetConstMacro(AutoCropFlag, bool);
+    // itkSetMacro(AutoCropFlag, bool);
+    // itkBooleanMacro(AutoCropFlag);
+
+    // itkGetConstMacro(InverseOrientationFlag, bool);
+    // itkSetMacro(InverseOrientationFlag, bool);
+    // itkBooleanMacro(InverseOrientationFlag);
+
+    // itkGetConstMacro(RemoveObjectFlag, bool);
+    // itkSetMacro(RemoveObjectFlag, bool);
+    // itkBooleanMacro(RemoveObjectFlag);
+
+    // itkGetConstMacro(CombineWithOrFlag, bool);
+    // itkSetMacro(CombineWithOrFlag, bool);
+    // itkBooleanMacro(CombineWithOrFlag);
 
   protected:
     SliceBySliceRelativePositionFilter();
     virtual ~SliceBySliceRelativePositionFilter() {}
     
-    int m_Direction;
-    PixelType m_ObjectBackgroundValue;
+    // PixelType m_ObjectBackgroundValue;
+    // OrientationTypeEnumeration m_OrientationType;
+    // std::string m_OrientationTypeString;
+    // double m_IntermediateSpacing;
+    // double m_FuzzyThreshold;
+    // bool m_ResampleBeforeRelativePositionFilter;
 
     virtual void GenerateOutputInformation();
     virtual void GenerateInputRequestedRegion();
@@ -87,6 +128,12 @@ namespace clitk {
     ImagePointer object;
     ImagePointer m_working_input;
     ImagePointer m_working_object;
+    bool         m_UniqueConnectedComponentBySlice;
+    int          m_Direction;
+    // bool m_InverseOrientationFlag;
+    // bool m_RemoveObjectFlag;
+    // bool m_AutoCropFlag;
+    // bool m_CombineWithOrFlag;
 
   private:
     SliceBySliceRelativePositionFilter(const Self&); //purposely not implemented