X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIODicomImageReader.cpp;h=0e92f024b2fa9c4ce74df31f66f4cea4b28c29eb;hb=7a7557d18e0cd9551a5d0abc3de53e811f11f76e;hp=05ea3b22ae3356e21f66b57914773a9686639d82;hpb=3a22e19184c369b130d4caa992a8e98e50c7a0ee;p=creaImageIO.git

diff --git a/src/creaImageIODicomImageReader.cpp b/src/creaImageIODicomImageReader.cpp
index 05ea3b2..0e92f02 100644
--- a/src/creaImageIODicomImageReader.cpp
+++ b/src/creaImageIODicomImageReader.cpp
@@ -1,9 +1,33 @@
-#include <creaImageIODicomImageReader.h>
-
-#include <vtkGdcmReader.h>
-
+/*
+# ---------------------------------------------------------------------
+#
+# 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 <creaImageIODicomImageReader.h>
+#include <vtkGdcmReader.h>
 #include <creaImageIOSystem.h>
 #include "boost/filesystem/path.hpp"
 
@@ -20,7 +44,10 @@ namespace creaImageIO
   DicomImageReader::DicomImageReader()
   {
     mReader = vtkGdcmReader::New();
-//EED	mReader->SetFlipY(false);
+	  
+//EED 21 mars 2012  FLIP probleme  ..PLOP..
+	mReader->SetFlipY(false);
+	  
     SetName ( "Dicom" );
 
   };
@@ -101,7 +128,16 @@ namespace creaImageIO
     return str;
   }
   //========================================================================
- 
+  void DicomImageReader::getAttributes(const std::string filename,
+		std::map <std::string , std::string> &infos, std::vector<std::string> i_attr)
+	{
+		std::vector<std::string>::iterator it = i_attr.begin();
+		for(; it != i_attr.end(); it++)
+		{
+			infos[(*it)] = "";
+		}
+		ReadAttributes(filename, infos);
+	}
   //=====================================================================
   void DicomImageReader::ReadAttributes(const std::string& filename, 
 		      std::map<std::string,std::string>& attr)
@@ -127,7 +163,7 @@ namespace creaImageIO
 	    if ( i->first == "D0004_1500" )
 	      {
 		boost::filesystem::path full_path(filename);
-		std::string f = full_path.leaf();
+		std::string f = full_path.leaf().string();
 		i->second = f;
 	      }
 	    else if ( i->first == "FullFileName" )