X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkIsoSurfaceExtractor.h;h=0b67d59e1489e1b9b1fea7c93206ec411103b785;hb=fbfe070fea8e317555e2b32138858b785ae79ec3;hp=71b8f1a2d4b2d13eb9dd0c676f7f7c5c3f9ddbf1;hpb=3924782985e3d7c795af6bb46c602157cfad59f0;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkIsoSurfaceExtractor.h b/packages/vtk/src/bbvtkIsoSurfaceExtractor.h
index 71b8f1a..0b67d59 100644
--- a/packages/vtk/src/bbvtkIsoSurfaceExtractor.h
+++ b/packages/vtk/src/bbvtkIsoSurfaceExtractor.h
@@ -1,20 +1,35 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbvtkIsoSurfaceExtractor.h,v $
   Language:  C++
-  Date:      $Date: 2008/03/19 13:30:18 $
-  Version:   $Revision: 1.3 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
-=========================================================================*//**
+  Date:      $Date: 2009/05/15 14:58:01 $
+  Version:   $Revision: 1.12 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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
  * 
  * Long description which 
@@ -59,23 +74,21 @@ namespace bbvtk
     vtkActor          *vtkactor; 
     
     
-    BBTK_USER_BLACK_BOX_INTERFACE(IsoSurfaceExtractor,bbtk::AtomicBlackBox);
+    BBTK_BLACK_BOX_INTERFACE(IsoSurfaceExtractor,bbtk::AtomicBlackBox);
     
     BBTK_DECLARE_INPUT(In,vtkImageData *);
     //    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_INPUT(Transform, vtkLinearTransform *);
     BBTK_DECLARE_OUTPUT(Out,vtkProp3D *);
     
     BBTK_PROCESS(DoProcess);
     void DoProcess();
     
   protected:
-    virtual void bbUserConstructor();
-    virtual void bbUserCopyConstructor();
-    void Init();
   };
   
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(IsoSurfaceExtractor,bbtk::AtomicBlackBox);
@@ -84,13 +97,15 @@ namespace bbvtk
   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_CATEGORY("3D object creator");
-  BBTK_INPUT(IsoSurfaceExtractor,In,"Input image",vtkImageData*);
+  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_INPUT(IsoSurfaceExtractor,Transform,"Linear Transform (4x4 homogeneous)",vtkLinearTransform*,"");
+  BBTK_OUTPUT(IsoSurfaceExtractor,Out,"Extracted iso-surface",vtkProp3D *,"");
   
   BBTK_END_DESCRIBE_BLACK_BOX(IsoSurfaceExtractor);