X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkAddRelativePositionConstraintToLabelImageFilter.h;h=c3655719294752311d5f94da12a30fbe662d414e;hb=c91bc7359270b60e51abdc42dddf0a35c11ea604;hp=64172228925a692155d549e9237c61311b7f3833;hpb=302ee878f46ba0f96a4913b1715ae768bdb665b0;p=clitk.git

diff --git a/itk/clitkAddRelativePositionConstraintToLabelImageFilter.h b/itk/clitkAddRelativePositionConstraintToLabelImageFilter.h
index 6417222..c365571 100644
--- a/itk/clitkAddRelativePositionConstraintToLabelImageFilter.h
+++ b/itk/clitkAddRelativePositionConstraintToLabelImageFilter.h
@@ -23,7 +23,7 @@
 #include "clitkFilterBase.h"
 
 // itk
-#include "itkPasteImageFilter.h"
+#include <itkPasteImageFilter.h>
 
 // itk ENST
 #include "RelativePositionPropImageFilter.h"
@@ -88,13 +88,13 @@ namespace clitk {
     void SetInputObject(const ImageType * image);
     
     // Options
-    void SetOrientationType(OrientationTypeEnumeration orientation);
-    itkGetConstMacro(OrientationType, OrientationTypeEnumeration);
-
-    void SetAngle1(double a);
-    void SetAngle2(double a);
-    itkGetConstMacro(Angle1, double);
-    itkGetConstMacro(Angle2, double);
+    void AddOrientationType(OrientationTypeEnumeration orientation);
+    void AddOrientationTypeString(std::string s);
+    void ClearOrientationType();
+    void AddAngles(double a, double b);
+    int GetNumberOfAngles();
+    std::string GetOrientationTypeString(int i) { return m_OrientationTypeString[i]; }
+    std::vector<std::string> & GetOrientationTypeString() { return m_OrientationTypeString; }
 
     itkGetConstMacro(ResampleBeforeRelativePositionFilter, bool);
     itkSetMacro(ResampleBeforeRelativePositionFilter, bool);
@@ -112,23 +112,39 @@ namespace clitk {
     itkGetConstMacro(ObjectBackgroundValue, PixelType);
     itkSetMacro(ObjectBackgroundValue, PixelType);
 
-    itkGetConstMacro(AutoCrop, bool);
-    itkSetMacro(AutoCrop, bool);
-    itkBooleanMacro(AutoCrop);
+    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:
     AddRelativePositionConstraintToLabelImageFilter();
     virtual ~AddRelativePositionConstraintToLabelImageFilter() {}
     
-    OrientationTypeEnumeration m_OrientationType;
+    std::vector<OrientationTypeEnumeration> m_OrientationType;
+    std::vector<std::string> m_OrientationTypeString;
     double m_IntermediateSpacing;
     double m_FuzzyThreshold;
     PixelType m_BackgroundValue;
     PixelType m_ObjectBackgroundValue;
-    double m_Angle1;
-    double m_Angle2;
+    std::vector<double> m_Angle1;
+    std::vector<double> m_Angle2;
     bool m_ResampleBeforeRelativePositionFilter;
-    bool m_AutoCrop;
+    bool m_AutoCropFlag;
+    bool m_InverseOrientationFlag;
+    bool m_RemoveObjectFlag;
+    bool m_CombineWithOrFlag;
 
     virtual void GenerateOutputInformation();
     virtual void GenerateInputRequestedRegion();