X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOVtkImageReader.cpp;h=c4dd1bfd798c74dfaab63d7a4db323389e78c67b;hb=37692ca5ea7fb8414cb70bcae0ce16e51da57568;hp=69dd65f03a8b8be541a48a811f51714529d9052c;hpb=2df647c186de559388c62bfebba8795b860ee8ae;p=creaImageIO.git

diff --git a/src2/creaImageIOVtkImageReader.cpp b/src2/creaImageIOVtkImageReader.cpp
index 69dd65f..c4dd1bf 100644
--- a/src2/creaImageIOVtkImageReader.cpp
+++ b/src2/creaImageIOVtkImageReader.cpp
@@ -2,7 +2,10 @@
 #include <vtkImageReader2.h>
 #include <creaImageIOSystem.h>
 #include "boost/filesystem/path.hpp"
-
+#include <creaImageIOGimmick.h>
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 namespace creaImageIO
 {
 
@@ -14,7 +17,12 @@ namespace creaImageIO
   {
     if (name.size() == 0) 
       {
-	SetName ( mReader->GetDescriptiveName() );
+		  const char *test =mReader->GetDescriptiveName();
+		  if(test != "")
+		  {
+			SetName ( "toto");// mReader->GetDescriptiveName());
+		  }
+		
       }
     else 
       {
@@ -38,19 +46,22 @@ namespace creaImageIO
   //=====================================================================
   bool VtkImageReader::CanRead(const std::string& filename)
   { 
-    //      std::cout << "## Reader "<<GetName()
-    //<<" ::CanRead("<<filename<<")"
-    //		<<std::endl;
+
     return (mReader->CanReadFile(filename.c_str())!=0);
+/*	  if(filename != "")
+	  {
+		return (mReader->CanReadFile(filename.c_str())!=0);
+	  }
+	  else
+	  {
+		  return false;
+	  }*/
   }
   //=====================================================================
   
   //=====================================================================
   vtkImageData* VtkImageReader::ReadImage(const std::string& filename)
   {
-    //      std::cout << "## Reader "<<GetName()
-    //<<" ::Read("<<filename<<")"
-    //		<<std::endl;
     vtkImageData* im = 0;
     try
       {
@@ -108,7 +119,6 @@ namespace creaImageIO
   void VtkImageReader::ReadAttributes(const std::string& filename, 
 				      std::map<std::string,std::string>& attr)
   {
-    //      std::cout << "VtkImageReader::ReadDicomInfo '"<<filename<<"'"<<std::endl;
     GimmickMessage(2,"Reading attributes from '"<<filename<<std::endl);
     // Get image dimensions
     // How to get the image info without loading it in vtk ?
@@ -125,14 +135,10 @@ namespace creaImageIO
     // Planes 
     char planes[128];
     sprintf(planes,"%i",ext[5]-ext[4]);
-    
-    
-    // 
-    std::map<std::string,std::string>::iterator i;
+   
+	std::map<std::string,std::string>::iterator i;
     if ( (i = attr.find("FullFileName")) != attr.end())
       {
-	//	  boost::filesystem::path full_path(filename);
-	// std::string f = full_path.leaf();
 	i->second = filename;
       }
     if ( (i = attr.find("D0004_1500")) != attr.end())
@@ -152,7 +158,7 @@ namespace creaImageIO
     
     if ( (i = attr.find("D0028_0012")) != attr.end())
       {
-	i->second = planes;
+		i->second = planes;
       }
 	  if ( (i = attr.find("FullFileDirectory")) != attr.end())
       {