X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIODicomImageReader.cpp;h=9390d1704a55acc790762864ef78eb34b4bcdcbe;hb=a00e6172593c713640aaa9bf1e61db6200231a0f;hp=b95f27ffb72ef4597f8fd494738c60c709ccd302;hpb=9ae1b3a039da8e28aa41c6963744bfa86c382a35;p=creaImageIO.git

diff --git a/src2/creaImageIODicomImageReader.cpp b/src2/creaImageIODicomImageReader.cpp
index b95f27f..9390d17 100644
--- a/src2/creaImageIODicomImageReader.cpp
+++ b/src2/creaImageIODicomImageReader.cpp
@@ -1,12 +1,15 @@
 #include <creaImageIODicomImageReader.h>
-#include <gdcmFile.h> 
+
 #include <vtkGdcmReader.h>
 #include <creaImageIOSystem.h>
 #include "boost/filesystem/path.hpp"
 
 #include <creaImageIOTreeAttributeDescriptor.h>
 #include <vtkStringArray.h>
-
+#include <creaImageIOGimmick.h>
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 namespace creaImageIO
 {
 
@@ -28,22 +31,17 @@ namespace creaImageIO
   //=====================================================================  
   bool DicomImageReader::CanRead(const std::string& filename)
   { 
-    //      std::cout << "## Reader "<<GetName()
-    //<<" ::CanRead("<<filename<<")"
-    //		<<std::endl;
-    //      return true;
-    
-    
-    //      GDCM_NAME_SPACE
-    //  std::cout << "GDCM_NAME_SPACE = '" << STRINGIFY_SYMBOL(GDCM_NAME_SPACE)
-    // << "'" 
-    // <<std::endl;
-    
+    GDCM_NAME_SPACE::Document*doc;
     GDCM_NAME_SPACE::File* file = GDCM_NAME_SPACE::File::New();
     file->SetLoadMode( GDCM_NAME_SPACE::LD_ALL);
     file->SetFileName(filename.c_str());
     file->Load();
     bool ok = file->IsReadable();
+	if(!ok)
+	{
+		doc = (GDCM_NAME_SPACE::Document*)file;	
+		ok = doc->IsReadable();
+	}
     file->Delete();
     return ok;
   }
@@ -52,10 +50,6 @@ namespace creaImageIO
   //=====================================================================
   vtkImageData* DicomImageReader::ReadImage(const std::string& filename)
   {
-    //      std::cout << "## Reader "<<GetName()
-    //<<" ::Read("<<filename<<")"
-    //		<<std::endl;
-    
     vtkImageData* im = 0;
     try
       {
@@ -71,7 +65,7 @@ namespace creaImageIO
       }
     return im;
   }
-  
+
   //=====================================================================
   void DicomImageReader::PushBackExtensions(std::vector<std::string>& v)
   {
@@ -83,38 +77,45 @@ namespace creaImageIO
   //========================================================================
   std::string irclean(const std::string& str)
   {
-    if (str == "GDCM::Unfound") 
-      {
-	return "";
-      }
-    if (str[str.size()-1]==' ')
-      {
-	return str.substr(0,str.size()-1);
-      }
-    if (str[str.size()-1]==0)
-      {
-	return str.substr(0,str.size()-1);
-      }
+	  if(str.size() > 0)
+	  {
+		if (str == "GDCM::Unfound") 
+		  {
+		return "";
+		  }
+		if (str[str.size()-1]==' ')
+		  {
+		return irclean(str.substr(0,str.size()-1));
+		  }
+		if (str[str.size()-1]==0)
+		  {
+		return irclean(str.substr(0,str.size()-1));
+		  }
+	  }
     
     return str;
   }
   //========================================================================
-
+ 
   //=====================================================================
   void DicomImageReader::ReadAttributes(const std::string& filename, 
 		      std::map<std::string,std::string>& attr)
   {
-    //    std::cout << "DicomImageReader::ReadDicomInfo '"<<filename<<"'"<<std::endl;
     GimmickMessage(2,"Reading attributes from DICOM file '"
 		   <<filename<<"'"<<std::endl);
-    
-    GDCM_NAME_SPACE::File* file = GDCM_NAME_SPACE::File::New();
+
+    //GDCM_NAME_SPACE::File* file = GDCM_NAME_SPACE::File::New();
+	boost::shared_ptr<GDCM_NAME_SPACE::File> file(GDCM_NAME_SPACE::File::New(), DicomImageReader::deleter());
+
+    GDCM_NAME_SPACE::Document *doc= GDCM_NAME_SPACE::File::New();
+    doc->SetLoadMode( GDCM_NAME_SPACE::LD_ALL);
+    doc->SetFileName(filename.c_str());
+    doc->Load();
     file->SetLoadMode( GDCM_NAME_SPACE::LD_ALL);
     file->SetFileName(filename.c_str());
     file->Load();
-    if (file->IsReadable())
+    if (file->IsReadable())// ||((GDCM_NAME_SPACE::Document*) file)->IsReadable())
       {
-	
 	std::map<std::string,std::string>::iterator i;
 	for (i=attr.begin();i!=attr.end();++i)
 	  {
@@ -127,27 +128,29 @@ namespace creaImageIO
 	    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 gr;
 		uint16_t el;
+		uint16_t gr;
+		
 		tree::AttributeDescriptor::GetDicomGroupElementFromKey(i->first,gr,el);
-		//		  GimmickMessage(2,"Key '"<<i->first<<"' : "<<gr<<"|"<<el
-		//				 <<std::endl);
 		if ( ( gr!=0 ) && ( el!=0 ) )
 		  {
-		    std::string val = file->GetEntryString(gr,el);
+		    std::string val =  file->GetEntryString(gr,el);
 		    i->second = irclean(val);
-		    //		      GimmickMessage(2,"Key '"<<i->first<<"' : "<<gr<<"|"<<el
-		    //				     <<"="<<i->second<<std::endl);
 		  }
 	      }
 	  }
       }
-    file->Delete();
   }
-  
+
   //=====================================================================
   
 } // namespace creaImageIO