X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOSimpleView.cpp;h=96d0e7442bda4713e5f973fc01d1cf9c04df0494;hb=f4345fcbbb606af15d5af72b6179d5103ff75565;hp=bf025e840dfc54f6008da5989f1a73d9d2f2a516;hpb=c7482ec7d04a5e5987841932a6856ebd471cebdb;p=creaImageIO.git

diff --git a/src/creaImageIOSimpleView.cpp b/src/creaImageIOSimpleView.cpp
index bf025e8..96d0e74 100644
--- a/src/creaImageIOSimpleView.cpp
+++ b/src/creaImageIOSimpleView.cpp
@@ -32,7 +32,10 @@
 
 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
 	{
 			bool bresult, bfinal = true;
 			ImageReader *mReader = new ImageReader();
@@ -42,18 +45,27 @@ 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 );
+
+					//UnMosaic step..
+
+					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;
 			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,22 +79,28 @@ 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]) );  
 				}			
 			}
 			return bresult;
-	}*/
+	}
 }
-