X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkImageReader.cxx;h=493fae94d2bc543318e62c5a28600635d5e8afdb;hb=724236f8156e84f206c497b755135fbdd2ccb889;hp=bb7938d6b2b2d1c26230f421848b2cd01f8f468a;hpb=d73a7833a28e6111e1e805efae5df3ab18a240e2;p=bbtk.git

diff --git a/packages/itk/src/bbitkImageReader.cxx b/packages/itk/src/bbitkImageReader.cxx
index bb7938d..493fae9 100644
--- a/packages/itk/src/bbitkImageReader.cxx
+++ b/packages/itk/src/bbitkImageReader.cxx
@@ -1,20 +1,40 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbitkImageReader.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 12:03:01 $
-  Version:   $Revision: 1.1 $
-                                                                                
-  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:39 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
+
+
+
 /**
  *  \file 
  *  \brief 
@@ -27,34 +47,42 @@
 
 namespace bbitk 
 {
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(ImageReader,bbtk::UserBlackBox);
-
+  BBTK_BLACK_BOX_IMPLEMENTATION(ImageReader,bbtk::AtomicBlackBox);
+  
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,ImageReader);
 
-
-
-
+	//-----------------------------------------------------------------	
+	void ImageReader::bbUserSetDefaultValues()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void ImageReader::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void ImageReader::bbUserFinalizeProcessing()
+	{
+	}	
+	
   void ImageReader::Read()
   {
-    std::string filename = bbGetInputFilename();
-
+    std::string filename = bbGetInputIn();
     itk::ImageIOBase::Pointer genericReader = 
       itk::ImageIOFactory::CreateImageIO(filename.c_str(), 
 					 itk::ImageIOFactory::ReadMode);
     if (!genericReader)
       {
-	bbtkError("File format unknown (while reading \"" << filename << "\")");
+	bbtkError("File format unknown (while reading [" << filename << "])");
       }
     genericReader->SetFileName(filename.c_str());
     genericReader->ReadImageInformation();  
-    
     bbtk::TypeInfo typ = GetITKImagePtrTypeInfoFromPixelTypeInfoAndDimension(genericReader->GetComponentTypeInfo(), genericReader->GetNumberOfDimensions());
-
     BBTK_TEMPLATE_ITK_IMAGE_SWITCH( typ, Read);
   }
 
 
-
   /** 
       Template Processing 
   */
@@ -68,7 +96,7 @@ namespace bbitk
     typedef itk::ImageFileReader< itkImageType > itkReaderType;
 
     typename itkReaderType::Pointer reader = itkReaderType::New();
-    std::string filename = bbGetInputFilename();
+    std::string filename = bbGetInputIn();
     reader->SetFileName(filename.c_str());
     try { reader->Update(); }
     catch( std::exception& e ) 
@@ -82,11 +110,6 @@ namespace bbitk
     bbtkDebugDecTab("Core",9);
   }
 
-
-
-
-
-
 }
 // eo namespace bbtk