X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkGetVectorElement.h;h=94903be9d375be680da86cf6c8a063ea333e6844;hb=49cb3ed3b5b7e58ab54dd3b6eb4ad8adee824ef2;hp=f8b29c29c5e98b898289f70d238525f5f1e70061;hpb=731d9ee262e286a24e3ea2776d8e914950840a2c;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkGetVectorElement.h b/packages/vtk/src/bbvtkGetVectorElement.h
index f8b29c2..94903be 100644
--- a/packages/vtk/src/bbvtkGetVectorElement.h
+++ b/packages/vtk/src/bbvtkGetVectorElement.h
@@ -1,40 +1,47 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbvtkGetVectorElement.h,v $
   Language:  C++
-  Date:      $Date: 2011/07/22 17:42:57 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2012/11/16 08:51:58 $
+  Version:   $Revision: 1.4 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */                                                                         
-
-
 #ifndef __bbvtkGetVectorElement_INCLUDED_h__
 #define __bbvtkGetVectorElement_INCLUDED_h__
 
 #include "bbtkAtomicBlackBox.h"
 #include "bbvtk_EXPORT.h"
 
+#include "vtkImageData.h"
+#include "vtkPolyData.h"
+
 namespace bbvtk
 {
   //=================================================================
@@ -52,11 +59,30 @@ namespace bbvtk
   };
   //=================================================================
 
+
+  typedef vtkImageData* ptrvtkImageData;
+  typedef vtkPolyData* ptrvtkPolyData;
+
+//  BBTK_DEFINE_HUMAN_READABLE_TYPE_NAME( ptrvtkImageData ,"PtrvtkImageData");
+//  BBTK_DEFINE_HUMAN_READABLE_TYPE_NAME( ptrvtkPolyData ,"PtrvtkPolyData");
+//  BBTK_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(ptrvtkImageData);
+//  BBTK_DEFINE_HUMAN_READABLE_VECTOR_TYPE_NAME(ptrvtkPolyData);
+
   //=================================================================
   // BlackBox description
   BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(GetVectorElement,bbtk::AtomicBlackBox);
+
+  std::string humantypename;
+  if (bbtk::HumanTypeName<T>()==bbtk::HumanTypeName<vtkPolyData*>()) { humantypename="VtkPolyData"; }
+  if (bbtk::HumanTypeName<T>()==bbtk::HumanTypeName<vtkImageData*>()) { humantypename="VtkImageData"; }
+  
+  BBTK_NAME("GetVector"+humantypename+"Element");
+
+//  BBTK_NAME("GetVector"+bbtk::HumanTypeName<T>()+"Element");
+
 //  BBTK_NAME("Get"+bbtk::HumanTypeName<std::vector<T> >()+"Element");
-   BBTK_NAME("GetVectorVtkImageDataElement");
+//  BBTK_NAME("GetVector"+"T"+"Element");
+//   BBTK_NAME("GetVectorVtkImageDataElement");
   BBTK_AUTHOR("info-dev@creatis.insa-lyon.fr");
  // BBTK_DEFAULT_ADAPTOR();
   BBTK_DESCRIPTION("Gets the i-th element from the input vector ("+bbtk::TypeName<std::vector<T> >());