X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2Fsrc%2FbbitkvtkitkImage2vtkImageData.cxx;h=6e192c2b19a88252befa4731f6f6aa3fbab4bba4;hb=3f6bd67d6fa58bb778e8ac7c9b3d05e371304ec7;hp=852e4d9759bfbc4ac2dcb8461980ee77f4315ce4;hpb=4ad7fcc03df98849a36051440ebcd326f90a5e68;p=bbtk.git

diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
index 852e4d9..6e192c2 100644
--- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
+++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
@@ -1,20 +1,39 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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: bbitkvtkitkImage2vtkImageData.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/14 07:01:00 $
-  Version:   $Revision: 1.4 $
-                                                                                
-  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: 2012/11/16 08:50:49 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
+
+
 /**
  *  \file 
  *  \brief 
@@ -24,9 +43,6 @@
 
 #include "bbitkvtkitkImage2vtkImageData.h"
 #include "bbitkvtkPackage.h"
-// VtkToItkConnection 
-//#include "itkVTKImageToImageFilter.h"
-// ItkToVtkConnection
 #include "itkImageToVTKImageFilter.h"
 
 
@@ -36,25 +52,21 @@ namespace bbitkvtk
 
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itkvtk,itkImage2vtkImageData);
 
-
-
-
   void itkImage2vtkImageData::Convert()
   {
     bbtk::TypeInfo t = bbGetInputIn().type();
     BBTK_TEMPLATE_ITK_IMAGE_SWITCH(t,Convert);
   }
-  
-
 
    template<class T>
    void itkImage2vtkImageData::Convert()
-  {
+   {
     bbtkDebugMessage("process",5,"==> ["<<bbGetFullName()<<"] : Convert<"
 		     <<bbtk::TypeName<T>()
 		     <<">()"<<std::endl);
 
     typedef T itkImageType;
+    typedef itkImageType* itkImageTypePointer;
     typedef itk::ImageToVTKImageFilter< itkImageType > ItkToVtkConnection;
     typename ItkToVtkConnection::Pointer conv;
 
@@ -64,16 +76,16 @@ namespace bbitkvtk
 	bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : No converter yet : creating it"<<std::endl);
 	conv = ItkToVtkConnection::New();
 	mConverter = conv;
-	conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+	conv->SetInput( this->bbGetInputIn().get< itkImageTypePointer >() );
       }
     else 
       {
 	bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Converter ok "<<std::endl);
-	
+
 	// Input itkImageType type changed ? 
 	// Have to change the converter and set its input
 	conv = dynamic_cast<ItkToVtkConnection*>
-	  ((itk::ProcessObject*)mConverter);
+	                   ((itk::ProcessObject*)mConverter);
 	if (!conv) 
 	  {
 	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Converter of wrong input type : reacreating it "<<std::endl);
@@ -81,21 +93,20 @@ namespace bbitkvtk
 	    mConverter->UnRegister();
 	    conv = ItkToVtkConnection::New();
 	    mConverter = conv;
-	    conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+	    conv->SetInput( this->bbGetInputIn().get<itkImageTypePointer>() );
 	  }
 	// Input image type did not change but input image pointer did:
 	// set new input
-	else if ( this->bbGetInputIn().get<itkImageType*>() 
+	else if ( this->bbGetInputIn().get<itkImageTypePointer>() 
 		  != (itkImageType*)(conv->GetExporter()->GetInputs()[0].GetPointer()))
 	  {
 	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Converter input changed : resetting it"<<std::endl);
 
-	    conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+	    conv->SetInput( this->bbGetInputIn().get<itkImageTypePointer>() );
 	  }
 	else 
 	  {
-	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Nothing changed"<<std::endl);	  
-
+	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Nothing changed"<<std::endl);
 	  }
       }
     try
@@ -115,24 +126,22 @@ namespace bbitkvtk
     bbtkDebugMessage("process",5,"<== ["<<bbGetFullName()<<"] : Convert<"
 		     <<bbtk::TypeName<T>()
 		     <<">() *DONE*"<<std::endl);
-
-
  }
 
-  void itkImage2vtkImageData::bbUserConstructor()
+  void itkImage2vtkImageData::bbUserSetDefaultValues()
   {
     bbSetOutputOut(NULL);
     mConverter = 0;
   }
-  void itkImage2vtkImageData::bbUserCopyConstructor()
+
+  void itkImage2vtkImageData::bbUserInitializeProcessing()
   {
-    bbSetOutputOut(NULL);
-    mConverter = 0;
   }
-  void itkImage2vtkImageData::bbUserDestructor()
+
+  void itkImage2vtkImageData::bbUserFinalizeProcessing()
   {
   }
-  
+
 
 }
 // eo namespace bbitkvtk