X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOImageReader.cpp;h=b1f9279e47a7412c525c21ba847a8abc6698ba3e;hb=96ca5a0d7b7ccd6b4291160c19afd48e3207db2a;hp=3e02d4005fb8ec8f2ae4e647aed556ff775af81c;hpb=2df647c186de559388c62bfebba8795b860ee8ae;p=creaImageIO.git

diff --git a/src2/creaImageIOImageReader.cpp b/src2/creaImageIOImageReader.cpp
index 3e02d40..b1f9279 100644
--- a/src2/creaImageIOImageReader.cpp
+++ b/src2/creaImageIOImageReader.cpp
@@ -46,17 +46,7 @@ namespace creaImageIO
     Register(new DicomImageReader);
     Register(new UltrasonixImageReader);
 
-    /*
-    std::cout << "## Registered file extensions : "<<std::endl;
-    std::vector<std::string>::const_iterator i;
-    for (i=GetKnownExtensions().begin();
-	 i!=GetKnownExtensions().end();
-	 i++)
-      {
-	std::cout << "'"<<(*i)<<"'"<<std::endl;
-      }
-    */
-    // 
+ 
     mUnreadableImage = vtkImageData::New();
     int dim[3];
     dim[0] = dim[1] = 128; 
@@ -81,12 +71,9 @@ namespace creaImageIO
   //=====================================================================
   ImageReader::~ImageReader()
   {
-    //    std::cout << "#### ImageReader::~ImageReader()"<<std::endl;
-    std::vector<AbstractImageReader*>::iterator i;
+      std::vector<AbstractImageReader*>::iterator i;
     for (i=mReader.begin(); i!=mReader.end(); i++)
       {
-	//	std::cout << "#### ImageReader::UnRegister("
-	//		  << (*i)->GetName()<<")"<<std::endl;
 	delete (*i);
       }
     mReader.clear();
@@ -101,23 +88,19 @@ namespace creaImageIO
   //=====================================================================
   void ImageReader::Register(AbstractImageReader* r)
   {
-    //    std::cout << "#### ImageReader::Register("<<r->GetName()<<")"<<std::endl;
     mReader.push_back(r);
-    //    r->PushBackExtensions(mKnownExtensions);
+
   }
   //=====================================================================
 
   //=====================================================================
   // Returns true iff the file is readable
   bool ImageReader::CanRead( const std::string& filename ) 
-  //			     const std::string& exclude )
   {
-    //    std::cout << "## ImageReader::CanRead("<<filename<<")"<<std::endl;
     bool ok = false;
     std::vector<AbstractImageReader*>::iterator i;
     for (i=mReader.begin(); i!=mReader.end(); i++)
       {
-	//	if ((*i)->GetName()==exclude) continue;
 	ok = (*i)->CanRead(filename);
 	if (ok) 
 	  {
@@ -133,29 +116,22 @@ namespace creaImageIO
   //=====================================================================
   // Reads the file (CanRead must be called before : no test here)
   vtkImageData*  ImageReader::ReadImage( const std::string& filename)
-  //					 const std::string& exclude )
   {
-    //    std::cout << "## ImageReader::Read("<<filename<<")"<<std::endl;
     if (mLastFilename!=filename)
       {
-	if (!CanRead(filename)) //,exclude)) 
+	if (!CanRead(filename))  
 	  { 
-	    //	    std::cout << "  -- Cannot read image "<<std::endl;
 	    vtkImageData* im = vtkImageData::New();
 	    im->ShallowCopy(mUnreadableImage);
 	    return im;
 	  }
       }
     vtkImageData* i = mLastReader->ReadImage(mLastFilename);
-    //    std::cout << "i="<<i<<std::endl;
     if (i==0) 
       {
-	//	std::cout << "i=UNREAD"<<i<<std::endl;
 	i = vtkImageData::New();
 	i->ShallowCopy(mUnreadableImage);
       }
-    //    std::cout << "i="<<i<<std::endl;
-    //std::cout<<"return: "<<i->GetScalarTypeAsString()<<", pointer="<<i<<std::endl;
     return i;
   }
   //=====================================================================
@@ -165,8 +141,6 @@ namespace creaImageIO
    void ImageReader::ReadAttributes(const std::string& filename, 
 				    std::map<std::string,std::string>& attr)
    {
-     // std::cout << "ImageReader::ReadDicomInfo '"<<filename<<"'"<<std::endl;
-    //    std::cout << "## ImageReader::Read("<<filename<<")"<<std::endl;
     if (mLastFilename!=filename)
       {
 	if (!CanRead(filename))