#3334 nrrd format in ReadImages box

diff --git a/bbtk/src/bbcreaImageIOReadImages.cxx b/bbtk/src/bbcreaImageIOReadImages.cxx
index 8098413d0e98fcb4d148d3e26d697d71a8405b8c..2bd8f63fd91d02ec025bcdf96932d0761450f2d9 100644 (file)
--- a/bbtk/src/bbcreaImageIOReadImages.cxx
+++ b/bbtk/src/bbcreaImageIOReadImages.cxx
@@ -8,7 +8,6 @@
 
 namespace bbcreaImageIO
 {
-
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaImageIO,ReadImages)
 BBTK_BLACK_BOX_IMPLEMENTATION(ReadImages,bbtk::AtomicBlackBox);
 //===== 
@@ -16,7 +15,6 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ReadImages,bbtk::AtomicBlackBox);
 //===== 
 void ReadImages::Process()
 {
-
 // THE MAIN PROCESSING METHOD BODY
 //   Here we simply set the input 'In' value to the output 'Out'
 //   And print out the output value
@@ -30,11 +28,9 @@ void ReadImages::Process()
 //      (the one provided in the attribute 'type' of the tag 'input')
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
-  
        std::vector<vtkImageData*>                                                      mResults;
        VectorMapInfoDicom                                                                      mResultsDicomAtr;
        creaImageIO::SimpleView                                                         mView;
-  
        if (bbGetInputActive()==true)
        {
                if( mView.readFile(bbGetInputLstNameImages() , bbGetInputDicomTags() , mResultsDicomAtr , mResults)==true )
@@ -52,43 +48,39 @@ void ReadImages::Process()
                        bbSetOutputOut( NULL );         
        }//Active       
 }
-//===== 
+
+//=====
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 void ReadImages::bbUserSetDefaultValues()
 {
-
 //  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
 //    Here we initialize the input 'In' to 0
    bbSetInputActive(true);
-  
 }
-//===== 
+
+//=====
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 void ReadImages::bbUserInitializeProcessing()
 {
-
 //  THE INITIALIZATION METHOD BODY :
 //    Here does nothing 
 //    but this is where you should allocate the internal/output pointers 
-//    if any 
-
-  
+//    if any
 }
-//===== 
+
+//=====
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 void ReadImages::bbUserFinalizeProcessing()
 {
-
 //  THE FINALIZATION METHOD BODY :
 //    Here does nothing 
 //    but this is where you should desallocate the internal/output pointers 
 //    if any
-  
-}
 }
-// EO namespace bbcreaImageIO
+
+}// EO namespace bbcreaImageIO
 
 

diff --git a/bbtk/src/bbcreaImageIOReadImages.h b/bbtk/src/bbcreaImageIOReadImages.h
index 74e4c0cea3bccb56fff83b228cda11b716b1ee90..3a4e7b5fe074b3a104ac01d93f1f596d9ca05cd8 100644 (file)
--- a/bbtk/src/bbcreaImageIOReadImages.h
+++ b/bbtk/src/bbcreaImageIOReadImages.h
@@ -45,7 +45,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ReadImages,bbtk::AtomicBlackBox);
 
   BBTK_INPUT(ReadImages,Active,"(default true)  Active true/false",bool,"");
   BBTK_INPUT(ReadImages,DicomTags,"Dicom Tags (vector of Dicom tags ex: D0028_0030  D0020_0037)",std::vector<std::string>,"");
-  BBTK_INPUT(ReadImages,LstNameImages,"List path to images",std::vector<std::string>,"");
+  BBTK_INPUT(ReadImages,LstNameImages,"List path to images (png, tiff, jpeg, bmp, SLC, mhd, mha, nii.gz, nrrd)",std::vector<std::string>,"");
 
   BBTK_OUTPUT(ReadImages,Out,"Output Image",vtkImageData*,"");
   BBTK_OUTPUT(ReadImages,OutImages,"List of Output Image",std::vector<vtkImageData*>,"");

diff --git a/src/creaImageIOImageReader.cpp b/src/creaImageIOImageReader.cpp
index 3dec1c24d80595cba606b7989f1ae5539f7f77a7..2a6ee8b41066aaadb00d0c6a4cfcd44f214f5d23 100644 (file)
--- a/src/creaImageIOImageReader.cpp
+++ b/src/creaImageIOImageReader.cpp
@@ -46,6 +46,7 @@
 #include <vtkSLCReader.h>
 #include <vtkMetaImageReader.h>
 #include <vtkNIFTIImageReader.h>
+#include <vtkNrrdReader.h>
 
 //#include <vtkGESignalReader.h>
 
@@ -71,6 +72,7 @@ namespace creaImageIO
     Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkSLCReader::New())));
     Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkMetaImageReader::New(),"MHD",".mhd")));
     Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkNIFTIImageReader::New(),"NIF",".nii.gz")));
+    Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkNrrdReader::New(),"NRRD",".nrrd")));
 
     //   Register(new VtkImageReader(vtkGESignalReader::New()));
     Register(boost::shared_ptr<AbstractImageReader>(new DicomImageReader));