move directory

[creaImageIO.git] / src2 / creaImageIODicomImageReader.cpp

diff --git a/src2/creaImageIODicomImageReader.cpp b/src2/creaImageIODicomImageReader.cpp
index 95619e5f11ccf6f5a8c3b3fa0de968c2f829effe..8ff8b5b102c3fc64e790710e3b95a383b98a909d 100644 (file)
--- a/src2/creaImageIODicomImageReader.cpp
+++ b/src2/creaImageIODicomImageReader.cpp
@@ -1,11 +1,18 @@
 #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
 {
 
@@ -13,7 +20,9 @@ namespace creaImageIO
   DicomImageReader::DicomImageReader()
   {
     mReader = vtkGdcmReader::New();
+//EED  mReader->SetFlipY(false);
     SetName ( "Dicom" );
+
   };
   //=====================================================================
   
@@ -27,22 +36,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;
   }
@@ -51,10 +55,6 @@ namespace creaImageIO
   //=====================================================================
   vtkImageData* DicomImageReader::ReadImage(const std::string& filename)
   {
-    //      std::cout << "## Reader "<<GetName()
-    //<<" ::Read("<<filename<<")"
-    //         <<std::endl;
-    
     vtkImageData* im = 0;
     try
       {
@@ -70,7 +70,7 @@ namespace creaImageIO
       }
     return im;
   }
-  
+
   //=====================================================================
   void DicomImageReader::PushBackExtensions(std::vector<std::string>& v)
   {
@@ -82,38 +82,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)
          {
@@ -126,27 +133,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