From: guigues <guigues>
Date: Thu, 24 Apr 2008 14:11:31 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~56
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=41aba70a65336c651cae6e5211c069d8f33efb51;p=bbtk.git

*** empty log message ***
---

diff --git a/packages/vtk/src/bbvtkIsoSurfaceExtractor.h b/packages/vtk/src/bbvtkIsoSurfaceExtractor.h
index 77d4fea..cefe1a4 100644
--- a/packages/vtk/src/bbvtkIsoSurfaceExtractor.h
+++ b/packages/vtk/src/bbvtkIsoSurfaceExtractor.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkIsoSurfaceExtractor.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/24 12:56:41 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/04/24 14:11:31 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -87,11 +87,11 @@ namespace bbvtk
   BBTK_INPUT(IsoSurfaceExtractor,In,"Input image",vtkImageData*,"");
   //  BBTK_INPUT(IsoSurfaceExtractor,InVtkObject,"Image vtkObject",vtkObject*);
 
-  BBTK_INPUT(IsoSurfaceExtractor,Isovalue,"Isovalue",double);
-  BBTK_INPUT(IsoSurfaceExtractor,Opacity,"Opacity",double);
-  BBTK_INPUT(IsoSurfaceExtractor,Colour,"r g b",vectorcolour);
-  BBTK_INPUT(IsoSurfaceExtractor,Renderer,"3D scene in which to insert the surface",vtkRenderer*);
-  BBTK_OUTPUT(IsoSurfaceExtractor,Out,"Extracted iso-surface",vtkProp3D *);
+  BBTK_INPUT(IsoSurfaceExtractor,Isovalue,"Isovalue",double,"");
+  BBTK_INPUT(IsoSurfaceExtractor,Opacity,"Opacity",double,"");
+  BBTK_INPUT(IsoSurfaceExtractor,Colour,"r g b",vectorcolour,"colour");
+  BBTK_INPUT(IsoSurfaceExtractor,Renderer,"3D scene in which to insert the surface",vtkRenderer*,"");
+  BBTK_OUTPUT(IsoSurfaceExtractor,Out,"Extracted iso-surface",vtkProp3D *,"");
   
   BBTK_END_DESCRIBE_BLACK_BOX(IsoSurfaceExtractor);
   
diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
index ec416f1..e717254 100644
--- a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
+++ b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkSegmentationConnectivity.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/24 12:56:41 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/24 14:11:31 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -31,7 +31,7 @@ namespace bbvtk
 {
 
 	BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,SegmentationConnectivity)
-	BBTK_USER_BLACK_BOX_IMPLEMENTATION(SegmentationConnectivity,bbtk::AtomicBlackBox);
+	BBTK_BLACK_BOX_IMPLEMENTATION(SegmentationConnectivity,bbtk::AtomicBlackBox);
 
 
 	void SegmentationConnectivity::bbUserConstructor() 
diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.h b/packages/vtk/src/bbvtkSegmentationConnectivity.h
index 78f2356..213cbf8 100644
--- a/packages/vtk/src/bbvtkSegmentationConnectivity.h
+++ b/packages/vtk/src/bbvtkSegmentationConnectivity.h
@@ -4,8 +4,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkSegmentationConnectivity.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/24 12:56:41 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/24 14:11:31 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -49,11 +49,11 @@ namespace bbvtk
     : 
     public bbtk::AtomicBlackBox
   {
-    BBTK_USER_BLACK_BOX_INTERFACE(SegmentationConnectivity,bbtk::AtomicBlackBox);
-      BBTK_DECLARE_INPUT(In,vtkImageData *);
-      BBTK_DECLARE_INPUT(PositionXYZ,std::vector<int>);
- 	  BBTK_DECLARE_INPUT(ThresholdMinMax,std::vector<int>);
-      BBTK_DECLARE_OUTPUT(Out,vtkImageData *);
+    BBTK_BLACK_BOX_INTERFACE(SegmentationConnectivity,bbtk::AtomicBlackBox);
+    BBTK_DECLARE_INPUT(In,vtkImageData *);
+    BBTK_DECLARE_INPUT(PositionXYZ,std::vector<int>);
+    BBTK_DECLARE_INPUT(ThresholdMinMax,std::vector<int>);
+    BBTK_DECLARE_OUTPUT(Out,vtkImageData *);
     BBTK_PROCESS(DoProcess);
     void DoProcess();
 
@@ -74,10 +74,10 @@ namespace bbvtk
   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_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);
 
 } // EO namespace bbvtk