X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkIsoSurfaceExtractor.h;h=cefe1a41780ff55a51486f012db82e0e81b66d36;hb=a32025c531a0e20e967dc2ba3e0817f6932061b1;hp=3b0665dc78f4d8100a84a2ebe1c86358a9db1b39;hpb=2114d2a089c36c35c09db63e003cec5c37a4a8c1;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkIsoSurfaceExtractor.h b/packages/vtk/src/bbvtkIsoSurfaceExtractor.h
index 3b0665d..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/03/03 14:01:49 $
-  Version:   $Revision: 1.1 $
+  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
@@ -33,8 +33,8 @@
 #ifdef _USE_VTK_
 
 
-#ifndef __vtkIsoSurfaceInserter_h__
-#define __vtkIsoSurfaceInserter_h__
+#ifndef __vtkIsoSurfaceExtractor_h__
+#define __vtkIsoSurfaceExtractor_h__
 
 #include "vtkImageData.h"
 #include "vtkRenderer.h"
@@ -49,7 +49,7 @@
 namespace bbvtk
 {
   
-  class /*BBTK_EXPORT*/ IsoSurfaceInserter
+  class /*BBTK_EXPORT*/ IsoSurfaceExtractor
     : 
     public bbtk::AtomicBlackBox
   {
@@ -59,14 +59,14 @@ namespace bbvtk
     vtkActor          *vtkactor; 
     
     
-    BBTK_USER_BLACK_BOX_INTERFACE(IsoSurfaceInserter,bbtk::AtomicBlackBox);
+    BBTK_BLACK_BOX_INTERFACE(IsoSurfaceExtractor,bbtk::AtomicBlackBox);
     
     BBTK_DECLARE_INPUT(In,vtkImageData *);
-    BBTK_DECLARE_INPUT(InVtkObject,vtkObject *);
+    //    BBTK_DECLARE_INPUT(InVtkObject,vtkObject *);
     BBTK_DECLARE_INPUT(Isovalue,double);
     BBTK_DECLARE_INPUT(Opacity,double);
     BBTK_DECLARE_INPUT(Colour,std::vector<double>);
-    BBTK_DECLARE_INPUT(Renderer,vtkRenderer *);
+	BBTK_DECLARE_INPUT(Renderer,vtkRenderer *);
     BBTK_DECLARE_OUTPUT(Out,vtkProp3D *);
     
     BBTK_PROCESS(DoProcess);
@@ -78,25 +78,27 @@ namespace bbvtk
     void Init();
   };
   
-  BBTK_BEGIN_DESCRIBE_BLACK_BOX(IsoSurfaceInserter,bbtk::AtomicBlackBox);
-  BBTK_NAME("IsoSurfaceInserter");
+  BBTK_BEGIN_DESCRIBE_BLACK_BOX(IsoSurfaceExtractor,bbtk::AtomicBlackBox);
+  BBTK_NAME("IsoSurfaceExtractor");
   BBTK_AUTHOR("eduardo.davila / laurent.guigues at creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("Extracts an iso-surface of a 3D image and insert it into a 3D scene (vtkRenderer)");
+  BBTK_DESCRIPTION("Extracts an iso-surface of a 3D image and creates a vtkProp3D object to insert into a 3D scene (e.g. a Viewer3D)");
   typedef std::vector<double> vectorcolour;
-  BBTK_INPUT(IsoSurfaceInserter,In,"Input image",vtkImageData*);
-  BBTK_INPUT(IsoSurfaceInserter,InVtkObject,"Image vtkObject",vtkObject*);
-  BBTK_INPUT(IsoSurfaceInserter,Isovalue,"Isovalue",double);
-  BBTK_INPUT(IsoSurfaceInserter,Opacity,"Opacity",double);
-  BBTK_INPUT(IsoSurfaceInserter,Colour,"r g b",vectorcolour);
-  BBTK_INPUT(IsoSurfaceInserter,Renderer,"3D scene in which to insert the surface",vtkRenderer*);
-  BBTK_OUTPUT(IsoSurfaceInserter,Out,"Image",vtkProp3D *);
+  BBTK_CATEGORY("3D object creator");
+  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,"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(IsoSurfaceInserter);
+  BBTK_END_DESCRIBE_BLACK_BOX(IsoSurfaceExtractor);
   
 }// EO namespace bbtk
 
 
-#endif  //__IsoSurfaceInserter_h__
+#endif  //__IsoSurfaceExtractor_h__
 
 #endif //_USE_VTK_