#2842 creaImageIO Bug New Normal - Read images from directory

[creaImageIO.git] / src / creaImageIOSimpleView.cpp

diff --git a/src/creaImageIOSimpleView.cpp b/src/creaImageIOSimpleView.cpp
index 7d6a48510aed9a3b8a2b3636196123cbd59cd072..43bbdf088e346d3a88ed435fcd0199d7eec7af71 100644 (file)
--- a/src/creaImageIOSimpleView.cpp
+++ b/src/creaImageIOSimpleView.cpp
@@ -25,15 +25,33 @@
 # ------------------------------------------------------------------------
 */
 
-
-#include "creaImageIOSimpleView.h"
 #include "boost/filesystem/operations.hpp"
 #include "boost/filesystem/fstream.hpp"
 
+#include "creaImageIOSimpleView.h"
+#include "creaImageIOUnMosaicVtkImageData.h"
+
 namespace creaImageIO
 {
-       bool SimpleView::readFile(std::vector<std::string> i_filenames, std::vector<vtkImageData *> &i_img)
+       bool SimpleView::readFile(      std::vector<std::string> i_filenames,                                                                   // in information names
+                                                                               std::vector<std::string> i_attr,                                                                // in information attributes names
+                                                                               std::vector<std::map <std::string , std::string> > &i_imgAttr,  // out information attributes names-values
+                                                                               std::vector<vtkImageData *> &i_img)                                                     // out information vtkImageData
        {
+
+                 //Mosaic Attribute for Simens         
+                       i_attr.push_back("D0019_100a");  // Number of images in mosaic (Simens)
+                       i_attr.push_back("D0018_0088");  // Spacing Between Slices
+               
+
+
+                       creaImageIOUnMosaicVtkImageData Mosaic;
+                       vtkImageData* tmpImg1;
+                       vtkImageData* tmpImg2;
+                       int numberOfImagesInMosaic;
+                       double spc[3];
+                       double spcZ;
+
                        bool bresult, bfinal = true;
                        ImageReader *mReader = new ImageReader();
                        std::vector<std::string>::iterator it = i_filenames.begin();
@@ -42,18 +60,55 @@ namespace creaImageIO
                                bresult = mReader->CanRead((*it).c_str());
                                if(bresult)
                                {
-                                       i_img.push_back(mReader->ReadImage((*it).c_str()));
-                               }
-                               else
-                               {
+                                       std::map <std::string , std::string> mapAttr;
+                                       mReader->getAttributes( (*it).c_str() , mapAttr, i_attr ); //  filename, outMapAttr-NameValue, inVectAttributeName
+                                       i_imgAttr.push_back( mapAttr );
+
+//EED borrame
+//                                     i_img.push_back( mReader->ReadImage( (*it).c_str() ) );
+
+
+                                       // EED 18 octt 2014
+                                       std::map <std::string , std::string>::iterator itMapAttr;
+                                       std::string numberOfImagesInMosaicStr="";
+                                       std::string spaceBetweenSliceStr="";
+
+                                       itMapAttr = mapAttr.find("D0019_100a");
+                                       if ( itMapAttr!=mapAttr.end() ) numberOfImagesInMosaicStr = itMapAttr->second;
+
+//                                     std::string numberOfImagesInMosaicStr = mapAttr.find("D0019_100a")->second;
+                                       itMapAttr = mapAttr.find("D0018_0088");
+                                       if ( itMapAttr!=mapAttr.end() ) spaceBetweenSliceStr = itMapAttr->second;
+
+//                                     std::string spaceBetweenSliceStr = mapAttr.find("D0018_0088")->second;
+                                       if (numberOfImagesInMosaicStr=="")
+                                       {
+                                               i_img.push_back( mReader->ReadImage( (*it).c_str() ) );
+                                       } else {
+                                               numberOfImagesInMosaic = atoi(numberOfImagesInMosaicStr.c_str());
+                                               spcZ = atoi(spaceBetweenSliceStr.c_str());
+                                               tmpImg1 = mReader->ReadImage( (*it).c_str() ) ;
+                                               tmpImg1->GetSpacing( spc );     
+                                               tmpImg2 = Mosaic.unMosaic( tmpImg1 , numberOfImagesInMosaic );
+                                               tmpImg2->SetSpacing( spc[0], spc[1], spcZ );    
+                                               i_img.push_back( tmpImg2 );
+                                       }// elemet
+
+                               } else {
+                                       printf("ERROR. Impossible to read file %s\n", (*it).c_str() );
                                        bfinal = false;
-                               }
-                       }
+                               } // if
+                       } // for
                        delete mReader;
+
                        return bfinal;  
        }
 
-       bool SimpleView::readDirectory(const std::string i_pathname, std::vector<vtkImageData *> &i_imgs)
+
+       bool SimpleView::readDirectory( const std::string i_pathname,                                                                                   // in information names
+                                                                                               std::vector<std::string> i_attr,                                                                                        // in information attributes names
+                                                                                               std::vector<std::map <std::string , std::string> > &i_imgAttr,  // out information attributes names-values
+                                                                                               std::vector<vtkImageData *> &i_imgs)                                                                    // out information vtkImageData
        {
                        bool bresult = true;
                        ImageReader *mReader = new ImageReader();
@@ -67,18 +122,25 @@ namespace creaImageIO
                                {
                                        if (!boost::filesystem::is_directory(itr->status()))
                                        {
-                                               if( mReader->CanRead(itr->string()) )
+                                               if( mReader->CanRead(itr->path().string()) )
                                                {
-                                                       names.push_back(itr->string()); 
+                                                       names.push_back(itr->path().string()); 
                                                }
                                        }
                                }
                                std::sort (names.begin(), names.end()); // make sure names are in lexicographical order
-                               int lgr = names.size();
+                               int lgr = (int)names.size();
                                
                                for(int i=0; i<lgr; i++)
                                {
-                                  std::cout << names[i] << std::endl;
+               std::cout << names[i] << std::endl;
+
+                                       std::map <std::string , std::string> mapAttr;
+                                       mReader->getAttributes( names[i] , mapAttr, i_attr ); //  filename, outMapAttr-NameValue, inVectAttributeName
+                                       i_imgAttr.push_back( mapAttr );
+
+                                       //UnMosaic step..
+
                                   i_imgs.push_back( mReader->ReadImage(names[i]) );  
                                }                       
                        }