X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkSliceBySliceRelativePositionFilter.h;h=e17a759b52fb810095fcc8ef3ee494c590e0ad82;hb=8cc0146a9e90cf4ed5d2bf6e1dc1fcf924692c18;hp=219f8672d0b0b410052ef4ab9128d4a0b951b462;hpb=38786c4da19b87319bbe3cecc145e3d1771d10da;p=clitk.git

diff --git a/itk/clitkSliceBySliceRelativePositionFilter.h b/itk/clitkSliceBySliceRelativePositionFilter.h
index 219f867..e17a759 100644
--- a/itk/clitkSliceBySliceRelativePositionFilter.h
+++ b/itk/clitkSliceBySliceRelativePositionFilter.h
@@ -33,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;
@@ -69,33 +68,57 @@ namespace clitk {
     /** 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);
-
-    itkSetMacro(OrientationType, OrientationTypeEnumeration);
-    itkGetConstMacro(OrientationType, OrientationTypeEnumeration);
-    itkGetConstMacro(ResampleBeforeRelativePositionFilter, bool);
-    itkSetMacro(ResampleBeforeRelativePositionFilter, bool);
-    itkBooleanMacro(ResampleBeforeRelativePositionFilter);
-    itkGetConstMacro(IntermediateSpacing, double);
-    itkSetMacro(IntermediateSpacing, double);
-    itkGetConstMacro(FuzzyThreshold, double);
-    itkSetMacro(FuzzyThreshold, double);
+    // 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;
-    OrientationTypeEnumeration m_OrientationType;
-    double m_IntermediateSpacing;
-    double m_FuzzyThreshold;
-    bool m_ResampleBeforeRelativePositionFilter;
+    // 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();
@@ -105,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