X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=segmentation%2FclitkMorphoMathFilter.h;h=a63400678ac010303277019dcc4e15b9439047b9;hb=ae015f09e2fa0ebc736d24b37c9ed6c1ca0cb5b2;hp=9422b58b2dae1f35b12dae14bbfb21fc242999b7;hpb=f34c74217b4f8efb36d1fa7f7d65992f1eefd2a4;p=clitk.git

diff --git a/segmentation/clitkMorphoMathFilter.h b/segmentation/clitkMorphoMathFilter.h
index 9422b58..a634006 100644
--- a/segmentation/clitkMorphoMathFilter.h
+++ b/segmentation/clitkMorphoMathFilter.h
@@ -1,9 +1,9 @@
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Authors belong to: 
+  Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-  ======================================================================-====*/
+  ===========================================================================**/
 
 #ifndef CLITKMORPHOMATHFILTER_H
 #define CLITKMORPHOMATHFILTER_H
@@ -22,7 +22,6 @@
 // clitk include
 #include "clitkIO.h"
 #include "clitkImageCommon.h"
-#include "clitkMorphoMath_ggo.h"
 #include "clitkConditionalBinaryErodeImageFilter.h"
 #include "clitkConditionalBinaryDilateImageFilter.h"
 
@@ -39,12 +38,12 @@ namespace clitk {
 
   //--------------------------------------------------------------------
   template<class ImageType>
-  class ITK_EXPORT MorphoMathFilter: 
-    public clitk::FilterBase, 
-    public itk::ImageToImageFilter<ImageType, ImageType> 
+  class ITK_EXPORT MorphoMathFilter:
+    public clitk::FilterBase,
+    public itk::ImageToImageFilter<ImageType, ImageType>
   {
-    
-  public: 
+
+  public:
     /** Standard class typedefs. */
     typedef itk::ImageToImageFilter<ImageType, ImageType> Superclass;
     typedef MorphoMathFilter<ImageType>                   Self;
@@ -52,8 +51,8 @@ namespace clitk {
     typedef itk::SmartPointer<const Self>                 ConstPointer;
 
     /** Method for creation through the object factory. */
-    itkNewMacro(Self);  
-    
+    itkNewMacro(Self);
+
     /** Run-time type information (and related methods). */
     itkTypeMacro(AddRelativePositionConstraintToLabelImageFilter, ImageToImageFilter);
     FILTERBASE_INIT;
@@ -61,7 +60,7 @@ namespace clitk {
     /** Some convenient typedefs. */
     typedef typename ImageType::ConstPointer ImageConstPointer;
     typedef typename ImageType::Pointer      ImagePointer;
-    typedef typename ImageType::RegionType   RegionType; 
+    typedef typename ImageType::RegionType   RegionType;
     typedef typename ImageType::PixelType    PixelType;
     typedef typename ImageType::SpacingType  SpacingType;
     typedef typename ImageType::SizeType     SizeType;
@@ -69,17 +68,17 @@ namespace clitk {
     typedef typename ImageType::PointType    PointType;
     typedef float InternalPixelType;
     typedef itk::Image<InternalPixelType, ImageType::ImageDimension> InternalImageType;
-    
+
     /** ImageDimension constants */
     itkStaticConstMacro(ImageDimension, unsigned int, ImageType::ImageDimension);
     typedef itk::Image<float, ImageDimension> FloatImageType;
 
     /** Operation types */
     typedef enum { Erode     = 0, Dilate     = 1,
-                   Close     = 2, Open       = 3, 
+                   Close     = 2, Open       = 3,
                    CondErode = 4, CondDilate = 5
     } OperationTypeEnumeration;
-    
+
     /** Options */
     itkGetConstMacro(VerboseFlag, bool);
     itkSetMacro(VerboseFlag, bool);
@@ -92,21 +91,22 @@ namespace clitk {
     itkSetMacro(ForegroundValue, PixelType);
 
     void SetOperationType(int type);
-    
+
     itkGetConstMacro(RadiusInMM, PointType);
     void SetRadiusInMM(PointType & p);
 
     itkGetConstMacro(Radius, SizeType);
     void SetRadius(SizeType & r);
+    void SetRadius(int r);
 
     itkGetConstMacro(BoundaryToForegroundFlag, bool);
     itkSetMacro(BoundaryToForegroundFlag, bool);
     itkBooleanMacro(BoundaryToForegroundFlag);
-    
+
     itkGetConstMacro(ExtendSupportFlag, bool);
     itkSetMacro(ExtendSupportFlag, bool);
     itkBooleanMacro(ExtendSupportFlag);
-    
+
   protected:
     MorphoMathFilter();
     virtual ~MorphoMathFilter();
@@ -131,10 +131,10 @@ namespace clitk {
     MorphoMathFilter(const Self&); //purposely not implemented
     void operator=(const Self&); //purposely not implemented
   };
-  
+
 } // end namespace clitk
 #ifndef ITK_MANUAL_INSTANTIATION
 #include "clitkMorphoMathFilter.txx"
 #endif
-  
+
 #endif //#define CLITKMORPHOMATHFILTER_H