Now itk::ImageSeriesReader returns a 3D image when it's passed a 2D images

[bbtk.git] / packages / itk / src / bbitkImageSeriesReader.cxx

diff --git a/packages/itk/src/bbitkImageSeriesReader.cxx b/packages/itk/src/bbitkImageSeriesReader.cxx
index 36432d54e3b847b2ca1c39e6b350c8e7b3eaed31..1a18bcbb97138b1024ac4780cf6da16f7581165d 100644 (file)
--- a/packages/itk/src/bbitkImageSeriesReader.cxx
+++ b/packages/itk/src/bbitkImageSeriesReader.cxx
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbitkImageSeriesReader.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:50 $
-  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: 2008/11/26 10:13:32 $
+  Version:   $Revision: 1.7 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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.
+* ------------------------------------------------------------------------ */                                                                         
+
 /**
  *  \file 
  *  \brief 
@@ -31,37 +44,51 @@ namespace bbitk
   
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,ImageSeriesReader);
 
-
-
-
   void ImageSeriesReader::Read()
   {
     const std::vector<std::string>& filenames = bbGetInputFileNames();
     if (!filenames.size()) 
       {
-       bbtkError("Void vector passed to "<<bbGetFullName());
+       typedef Image_uint8_t_2_ptr itype;
+       Image_uint8_t_2::Pointer p = Image_uint8_t_2::New();
+       Image_uint8_t_2::IndexType i;
+       i.Fill(0);
+       Image_uint8_t_2::SizeType s;
+       s.Fill(1);
+       Image_uint8_t_2::RegionType r(i,s);
+       p->SetRegions(r);
+       p->Allocate();
+       p->Register();
+       bbSetOutputOut(p.GetPointer());
+       return;
+       //bbtkError("Void vector passed to "<<bbGetFullName());
       }
 
     std::string filename = filenames[0];
-
+    
     itk::ImageIOBase::Pointer genericReader = 
       itk::ImageIOFactory::CreateImageIO(filename.c_str(), 
                                         itk::ImageIOFactory::ReadMode);
+                                        
     if (!genericReader)
       {
-       bbtkError(bbGetFullName()<<" : File format unknown (while reading \"" << filename << "\")");
+       bbtkError(bbGetFullName()<<" : File format unknown (while reading [" << filename << "])");
       }
     genericReader->SetFileName(filename.c_str());
-    genericReader->ReadImageInformation();  
+    genericReader->ReadImageInformation();
     
-    bbtk::TypeInfo typ = GetITKImagePtrTypeInfoFromPixelTypeInfoAndDimension(genericReader->GetComponentTypeInfo(), genericReader->GetNumberOfDimensions());
+    int plusUn;
+    if (filenames.size()>1)
+       plusUn = 1;
+    else
+       plusUn = 0;
     
+    bbtk::TypeInfo typ = GetITKImagePtrTypeInfoFromPixelTypeInfoAndDimension(genericReader->GetComponentTypeInfo(), genericReader->GetNumberOfDimensions() + plusUn);
+      
     BBTK_TEMPLATE_ITK_IMAGE_SWITCH(typ,Read);
-  
+    
   }
 
-
-
   /** 
       Template Processing 
   */
@@ -72,8 +99,6 @@ namespace bbitk
                        <<bbtk::TypeName<T>()
                        <<">::Read()"<<std::endl);
 
-
-
     typedef T itkImageType;
     typedef itk::ImageSeriesReader< itkImageType > itkReaderType;
 
@@ -87,16 +112,13 @@ namespace bbitk
       }
 
     reader->GetOutput()->Register();
+    //    if (bbGetOutputOut()) 
     bbSetOutputOut ( reader->GetOutput() );
 
     bbtkDebugDecTab("Core",9);
   }
 
 
-
-
-
-
 }
 // eo namespace bbtk