X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2Fsrc%2FbbitkvtkitkImage2vtkImageData.cxx;h=77240acb1fd5dd9dd3406472827166c7fb2f1adc;hb=c2d2ccbc4bac635e5d0b802d9830efd94b060dab;hp=0047b30bce1fb728c559141438289c86389f4307;hpb=551b02f0819a98e9595a81570b1d1174f398f34d;p=bbtk.git

diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
index 0047b30..77240ac 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/09 10:39:46 $
-  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: 2012/11/16 08:50:49 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
+
+
 /**
  *  \file 
  *  \brief 
@@ -24,11 +43,14 @@
 
 #include "bbitkvtkitkImage2vtkImageData.h"
 #include "bbitkvtkPackage.h"
-// VtkToItkConnection 
-//#include "itkVTKImageToImageFilter.h"
-// ItkToVtkConnection
 #include "itkImageToVTKImageFilter.h"
 
+// -------------------------------------------------------------------------
+// LFV: avoid itk::Concept check on 4d or superior images
+#define BBITKVTK_itkImage2vtkImageData_Template( t, ty, di )            \
+  if( t == typeid( itk::Image< ty, di > ) )                             \
+    this->Convert< itk::Image< ty, di > >( )
+// -------------------------------------------------------------------------
 
 namespace bbitkvtk 
 {
@@ -36,39 +58,105 @@ 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);
-  }
-  
 
+    // Only supports images in 1, 2 or 3 dimensions
+    BBITKVTK_itkImage2vtkImageData_Template( t, char, 1 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, short, 1 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, int, 1 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, long, 1 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, float, 1 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, double, 1 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned char, 1 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned short, 1 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned int, 1 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned long, 1 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, char, 2 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, short, 2 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, int, 2 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, long, 2 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, float, 2 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, double, 2 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned char, 2 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned short, 2 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned int, 2 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned long, 2 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, char, 3 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, short, 3 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, int, 3 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, long, 3 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, float, 3 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, double, 3 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned char, 3 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned short, 3 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned int, 3 );
+    else BBITKVTK_itkImage2vtkImageData_Template( t, unsigned long, 3 );
+
+    /* Deprecated
+       BBTK_TEMPLATE_ITK_IMAGE_SWITCH(t,Convert);
+    */
+  }
 
    template<class T>
    void itkImage2vtkImageData::Convert()
-  {
-    bbtkDebugMessageInc("Core",9,"itkImage2vtkImageData<"
-			<<bbtk::TypeName<T>()
-			<<">::Convert()"<<std::endl);
+   {
+    bbtkDebugMessage("process",5,"==> ["<<bbGetFullName()<<"] : Convert<"
+		     <<bbtk::TypeName<T>()
+		     <<">()"<<std::endl);
 
     typedef T itkImageType;
-    //   typedef itk::VTKImageToImageFilter< itkImageType > VtkToItkConnection;
+    typedef itkImageType* itkImageTypePointer;
     typedef itk::ImageToVTKImageFilter< itkImageType > ItkToVtkConnection;
+    typename ItkToVtkConnection::Pointer conv;
 
-
-    try 
+    // No converter yet : create it and set its input
+    if (!mConverter) 
       {
-	typename ItkToVtkConnection::Pointer conv = ItkToVtkConnection::New();
-	conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+	bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : No converter yet : creating it"<<std::endl);
+	conv = ItkToVtkConnection::New();
+	mConverter = conv;
+	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);
+	if (!conv) 
+	  {
+	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Converter of wrong input type : reacreating it "<<std::endl);
+
+	    mConverter->UnRegister();
+	    conv = ItkToVtkConnection::New();
+	    mConverter = conv;
+	    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<itkImageTypePointer>() 
+		  != (itkImageType*)(conv->GetExporter()->GetInputs()[0].GetPointer()))
+	  {
+	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Converter input changed : resetting it"<<std::endl);
+
+	    conv->SetInput( this->bbGetInputIn().get<itkImageTypePointer>() );
+	  }
+	else 
+	  {
+	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Nothing changed"<<std::endl);
+	  }
+      }
+    try
+      {
+	
+	bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Trying update"<<std::endl);	 
+
 	conv->Update();
-	if (bbGetOutputOut()) bbGetOutputOut()->UnRegister(NULL);
 	bbSetOutputOut(conv->GetOutput());
-	//	bbGetOutputOut()->DebugOn();
-	bbGetOutputOut()->Register(NULL);
-	bbGetOutputOut()->SetSource(NULL);
       }
     catch( itk::ExceptionObject & e) 
       {
@@ -76,23 +164,23 @@ namespace bbitkvtk
 		  <<bbtk::TypeName<T>()
 		  <<">::Convert() : "<<e);
       } 
-    bbtkDebugDecTab("Core",9);
-  }
+    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);
   }
-  void itkImage2vtkImageData::bbUserDestructor()
+
+  void itkImage2vtkImageData::bbUserFinalizeProcessing()
   {
-    if (bbGetOutputOut()) 
-      {
-	bbGetOutputOut()->UnRegister(NULL);
-      }
   }