#2458 creaImageIO Feature New Normal - UnMosaic Images SimpleView Gimick

[creaImageIO.git] / src / creaImageIOSimpleView.cpp

diff --git a/src/creaImageIOSimpleView.cpp b/src/creaImageIOSimpleView.cpp
index becdd41fe6519a4276611f92f39625c445e2b6e3..96d0e7442bda4713e5f973fc01d1cf9c04df0494 100644 (file)
--- a/src/creaImageIOSimpleView.cpp
+++ b/src/creaImageIOSimpleView.cpp
@@ -1,9 +1,41 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  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.
+# ------------------------------------------------------------------------
+*/
+
+
 #include "creaImageIOSimpleView.h"
+#include "boost/filesystem/operations.hpp"
+#include "boost/filesystem/fstream.hpp"
 
 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();
@@ -13,23 +45,31 @@ 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;
-                       
+                       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();
-
+                        std::vector<std::string> names;
                        bresult = boost::filesystem::exists( i_pathname );
                        if (bresult)
                        {
@@ -39,15 +79,28 @@ namespace creaImageIO
                                {
                                        if (!boost::filesystem::is_directory(itr->status()))
                                        {
-                                               if( mReader->CanRead(itr->string()) )
+                                               if( mReader->CanRead(itr->path().string()) )
                                                {
-                            std::cout << itr->filename().c_str() << std::endl;
-                                                       i_imgs.push_back( mReader->ReadImage(itr->string()) );  
+                                                       names.push_back(itr->path().string()); 
                                                }
                                        }
                                }
+                               std::sort (names.begin(), names.end()); // make sure names are in lexicographical order
+                               int lgr = (int)names.size();
+                               
+                               for(int i=0; i<lgr; i++)
+                               {
+               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;
        }
 }
-