# ------------------------------------------------------------------------
*/
-
-#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, // in information names
std::vector<std::map <std::string , std::string> > &i_imgAttr, // out information attributes names-values
std::vector<vtkImageData *> &i_img) // out information vtkImageData
{
+printf("EED SimpleView::readFile 0\n");
+
+ //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();
mReader->getAttributes( (*it).c_str() , mapAttr, i_attr ); // filename, outMapAttr-NameValue, inVectAttributeName
i_imgAttr.push_back( mapAttr );
- //UnMosaic step..
+//EED borrame
+// i_img.push_back( mReader->ReadImage( (*it).c_str() ) );
+
+printf("EED SimpleView::readFile 1\n");
+
+ // 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;
+printf("EED SimpleView::readFile 1.1\n");
+ itMapAttr = mapAttr.find("D0018_0088");
+ if ( itMapAttr!=mapAttr.end() ) spaceBetweenSliceStr = itMapAttr->second;
+
+// std::string spaceBetweenSliceStr = mapAttr.find("D0018_0088")->second;
+printf("EED SimpleView::readFile 1.2\n");
+ if (numberOfImagesInMosaicStr=="")
+ {
+printf("EED SimpleView::readFile 2\n");
+ i_img.push_back( mReader->ReadImage( (*it).c_str() ) );
+ } else {
+printf("EED SimpleView::readFile 3\n");
+ 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
- i_img.push_back( mReader->ReadImage( (*it).c_str() ) );
} else {
printf("ERROR. Impossible to read file %s\n", (*it).c_str() );
bfinal = false;
} // if
} // for
delete mReader;
+printf("EED SimpleView::readFile 4\n");
+
return bfinal;
}