X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIODicomImageReader2.cpp;h=fc7f56b7cee601b21c03d7eb3bc53a0bd177d5d9;hb=4153d65cc0c8b1c3f47f89c1ac7d3efc9a6fa5d0;hp=713655ba46ea1fda179f5681b4b2e0b9bcb98dbe;hpb=bf3660569b1baa8be10fc708f595efc66afe3334;p=creaImageIO.git

diff --git a/src/creaImageIODicomImageReader2.cpp b/src/creaImageIODicomImageReader2.cpp
index 713655b..fc7f56b 100644
--- a/src/creaImageIODicomImageReader2.cpp
+++ b/src/creaImageIODicomImageReader2.cpp
@@ -1,5 +1,5 @@
 #include <creaImageIODicomImageReader2.h>
-
+#include "gdcmStringFilter.h"
 
 
 #include <creaImageIOSystem.h>
@@ -94,7 +94,7 @@ namespace creaImageIO
   
 
   	void DicomImageReader::getAttributes(const std::string filename, 
-		std::map <std::string , std::string> &infos,std::vector<std::string> i_attr)
+		std::map <std::string , std::string> &infos, std::vector<std::string> i_attr)
 	{
 		gdcm::Reader reader;
 		reader.SetFileName( filename.c_str() );
@@ -112,8 +112,8 @@ namespace creaImageIO
 				}
 			}
 		}
-		
 	}
+
   //=====================================================================
   void DicomImageReader::ReadAttributes(const std::string& filename, 
 		      std::map<std::string,std::string>& attr)
@@ -126,40 +126,45 @@ namespace creaImageIO
       reader.SetFileName( filename.c_str() );
       if (reader.Read())
       {
-	std::map<std::string,std::string>::iterator i;
-	for (i=attr.begin();i!=attr.end();++i)
-	  {
-	    if ( i->first == "D0004_1500" )
-	      {
-		boost::filesystem::path full_path(filename);
-		std::string f = full_path.leaf();
-		i->second = f;
-	      }
-	    else if ( i->first == "FullFileName" )
-	      {
-		i->second = filename;
-	      }
-		  else if ( i->first == "FullFileDirectory" )
+		  gdcm::StringFilter sf;
+		  sf.SetFile(reader.GetFile());
+	  	  std::map<std::string,std::string>::iterator i;
+		  for (i=attr.begin();i!=attr.end();++i)
 	      {
-			  std::string::size_type last_pos = filename.find_last_of("//");
-			  //find first separator
-			  i->second = filename.substr(0, last_pos);
-	      }
-	    else
-	      {
-		uint16_t el;
-		uint16_t gr;
-
-		tree::AttributeDescriptor::GetDicomGroupElementFromKey(i->first,gr,el);
-		if ( ( gr!=0 ) && ( el!=0 ) )
-		  {
-			 
-			   std::string val = GetStringValueFromTag(reader.GetFile().GetDataSet().GetDataElement(gdcm::Tag(gr,el)));
-		    i->second = irclean(val);
+			  if ( i->first == "D0004_1500" )
+			  {
+				  boost::filesystem::path full_path(filename);
+				  std::string f = full_path.leaf();
+				  i->second = f;
+			  }
+			  else if ( i->first == "FullFileName" )
+			  {
+				i->second = filename;
+			  }
+			  else if ( i->first == "FullFileDirectory" )
+			  {
+				 std::string::size_type last_pos = filename.find_last_of("//");
+				 //find first separator
+				 i->second = filename.substr(0, last_pos);
+			  }
+			  else
+			  {
+				  uint16_t el;
+				  uint16_t gr;
+				  tree::AttributeDescriptor::GetDicomGroupElementFromKey(i->first,gr,el);
+				  //if ( ( gr!=0 ) && ( el!=0 ) )
+				  const gdcm::Tag tag(gr, el);
+				  if( reader.GetFile().GetDataSet().FindDataElement( tag ) )
+				  {
+					  i->second = irclean(sf.ToString(tag));
+				  }
+				  else
+				  {
+					  i->second = "";
+				  }
+			  }
 		  }
-	      }
 	  }
-      }
   }
 
 void DicomImageReader::ReadAttributes2(const std::string& filename,