#2981 BBTK Feature New Normal - FormatOutput of filters in string

[bbtk.git] / packages / vtk / src / bbvtkSegmentationConnectivity.h

diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.h b/packages/vtk/src/bbvtkSegmentationConnectivity.h
index 914fb172dcb9c43fe6537da524e6391ccfd1b253..bd4b4797159bd120fff6c07d245871da6d904cc5 100644 (file)
--- a/packages/vtk/src/bbvtkSegmentationConnectivity.h
+++ b/packages/vtk/src/bbvtkSegmentationConnectivity.h
@@ -1,34 +1,38 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbvtkSegmentationConnectivity.h,v $
   Language:  C++
-  Date:      $Date: 2010/04/08 14:37:59 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2012/11/16 08:51:58 $
+  Version:   $Revision: 1.7 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-*  or in the file LICENSE.txt.
-*
-*  As a counterpart to the access to the source code and  rights to copy,
-*  modify and redistribute granted by the license, users are provided only
-*  with a limited warranty  and the software's author,  the holder of the
-*  economic rights,  and the successive licensors  have only  limited
-*  liability. 
-*
-*  The fact that you are presently reading this means that you have had
-*  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
-
-
 /**
  * \brief Short description in one line
  * 
@@ -67,6 +71,8 @@ namespace bbvtk
     BBTK_DECLARE_INPUT(In,vtkImageData *);
     BBTK_DECLARE_INPUT(PositionXYZ,std::vector<int>);
     BBTK_DECLARE_INPUT(ThresholdMinMax,std::vector<int>);
+    BBTK_DECLARE_INPUT(Value,unsigned char);
+    BBTK_DECLARE_INPUT( OutputFormat , std::string );
     BBTK_DECLARE_OUTPUT(Out,vtkImageData *);
     BBTK_PROCESS(DoProcess);
     void DoProcess();
@@ -74,7 +80,7 @@ namespace bbvtk
   protected:
 
   private:
-       vtkImageCast             *cast2;
+//     vtkImageCast             *cast2;
        vtkImageCast             *cast4; // binary segmentation result
        vtkImageThreshold        *thresh2;
        vtkImageSeedConnectivity *connect2;
@@ -82,14 +88,19 @@ namespace bbvtk
   };
 
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(SegmentationConnectivity,bbtk::AtomicBlackBox);
-  BBTK_NAME("SegmentationConnectivity");
-  BBTK_AUTHOR("eduardo.davila [at] creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("Segmentation with min max threshold and connectivity");
-  BBTK_INPUT(SegmentationConnectivity,In,"Input image",vtkImageData *,"");
-  BBTK_INPUT(SegmentationConnectivity,PositionXYZ,"vector with the Position [x y z]" , std::vector<int>,"");
-  BBTK_INPUT(SegmentationConnectivity,ThresholdMinMax,"vector with the Threshold [min max]" , std::vector<int>,"");
-  BBTK_OUTPUT(SegmentationConnectivity,Out,"Result image",vtkImageData *,"");
-  BBTK_END_DESCRIBE_BLACK_BOX(SegmentationConnectivity);
+    BBTK_NAME("SegmentationConnectivity");
+    BBTK_AUTHOR("eduardo.davila [at] creatis.insa-lyon.fr");
+    BBTK_DESCRIPTION("Segmentation with min max threshold and connectivity");
+
+    BBTK_INPUT(SegmentationConnectivity,In,"Input image",vtkImageData *,"");
+    BBTK_INPUT(SegmentationConnectivity,PositionXYZ,"vector with the Position [x y z]" , std::vector<int>,"");
+    BBTK_INPUT(SegmentationConnectivity,ThresholdMinMax,"vector with the Threshold [min max]" , std::vector<int>,"");
+    BBTK_INPUT(SegmentationConnectivity,Value,"(255 default) [0..255] Gey level of output image" , unsigned char,"");
+    BBTK_INPUT(SegmentationConnectivity,OutputFormat,"Image output format:  SAME (default), VTK_BIT, VTK_CHAR, VTK_SIGNED_CHAR, VTK_UNSIGNED_CHAR, VTK_SHORT, VTK_UNSIGNED_SHORT, VTK_INT, VTK_UNSIGNED_INT, VTK_LONG, VTK_UNSIGNED_LONG, VTK_FLOAT, VTK_DOUBLE",std::string,"");
+
+    BBTK_OUTPUT(SegmentationConnectivity,Out,"Result image",vtkImageData *,"");
+ 
+ BBTK_END_DESCRIBE_BLACK_BOX(SegmentationConnectivity);
 
 } // EO namespace bbvtk