X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOImageReader.cpp;h=54257c1abc7fa45ea2fe87807f48ee28c5d6ddc5;hb=6b60375e24eb65bde68033daa2618d1f95b5d3ed;hp=a7937ccc8e7e017816a2f359c849ace037d0a514;hpb=805ec93a6b36ad6acf63458414c545a737322354;p=creaImageIO.git

diff --git a/src2/creaImageIOImageReader.cpp b/src2/creaImageIOImageReader.cpp
index a7937cc..54257c1 100644
--- a/src2/creaImageIOImageReader.cpp
+++ b/src2/creaImageIOImageReader.cpp
@@ -4,6 +4,7 @@
 
 #include <creaImageIOVtkImageReader.h>
 #include <creaImageIODicomImageReader.h>
+#include <creaImageIOUltrasonixImageReader.h>
 
 #include <vtkPNGReader.h>
 #include <vtkTIFFReader.h>
@@ -22,40 +23,6 @@ namespace creaImageIO
   
 
 
-  //===================================================================== 
-  /*
-  void IRFillFields(DicomNode* node, 
-		  GDCM_NAME_SPACE::File* gdcmFile)
-  {
-    const DicomNodeTypeDescription::FieldDescriptionMapType& dm
-      = node->GetTypeDescription().GetFieldDescriptionMap();
-    DicomNodeTypeDescription::FieldDescriptionMapType::const_iterator i;
-    
-	
-    DicomNode::FieldValueMapType& vm = node->GetFieldValueMap();
-    for (i=dm.begin(); i!=dm.end(); ++i)
-      {
-	if ( (i->second.flags==0) && 
-	     (i->second.group!=0) && 
-	     (i->second.element!=0) )
-	  {
-		uint16_t gr = i->second.group;
-		uint16_t el = i->second.element;
-
-		std::string val = gdcmFile->GetEntryString(gr,el);
-
-	    vm[i->first] = irclean(val);
-	  }
-	else 
-	  {
-	    vm[i->first] = "";
-	  }
-      }
-  }
-  */
-  //=====================================================================
-
-
 
 
   //=====================================================================
@@ -69,26 +36,18 @@ namespace creaImageIO
     //    std::cout << "#### ImageReader::ImageReader()"<<std::endl;
     if (mUnreadableImage!=0) return;
 
-    Register(new VtkImageReader(vtkPNGReader::New()));
-    Register(new VtkImageReader(vtkTIFFReader::New()));
+
+    Register(new VtkImageReader(vtkPNGReader::New(), "PNG", ".png"));
+    Register(new VtkImageReader(vtkTIFFReader::New(), "JPEG", ".jpeg"));
     Register(new VtkImageReader(vtkJPEGReader::New()));
     Register(new VtkImageReader(vtkBMPReader::New()));
     Register(new VtkImageReader(vtkSLCReader::New()));
     Register(new VtkImageReader(vtkMetaImageReader::New(),"MHD",".mhd"));
     //   Register(new VtkImageReader(vtkGESignalReader::New()));
     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; 
@@ -113,12 +72,9 @@ namespace creaImageIO
   //=====================================================================
   ImageReader::~ImageReader()
   {
-    //    std::cout << "#### ImageReader::~ImageReader()"<<std::endl;
-    std::vector<SpecificImageReader*>::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();
@@ -131,62 +87,56 @@ namespace creaImageIO
   //=====================================================================
 
   //=====================================================================
-  void ImageReader::Register(SpecificImageReader* r)
+  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 )
+  bool ImageReader::CanRead( const std::string& filename ) 
   {
-    //    std::cout << "## ImageReader::CanRead("<<filename<<")"<<std::endl;
     bool ok = false;
-    std::vector<SpecificImageReader*>::iterator i;
-    for (i=mReader.begin(); i!=mReader.end(); i++)
-      {
-	if ((*i)->GetName()==exclude) continue;
-	ok = (*i)->CanRead(filename);
-	if (ok) 
-	  {
-	    mLastFilename = filename;
-	    mLastReader = *i;
-	    break;
-	  }
-      }
-    return ok;
+	if(filename != "")
+	{
+	    std::vector<AbstractImageReader*>::iterator i;
+		for (i=mReader.begin(); i!=mReader.end(); i++)
+		{
+			ok = (*i)->CanRead(filename);
+			if (ok) 
+			{
+				mLastFilename = filename;
+				mLastReader = *i;
+				break;
+			}
+		}
+	}
+	return ok;
+	
   }
   //=====================================================================
 
   //=====================================================================
   // Reads the file (CanRead must be called before : no test here)
-  vtkImageData*  ImageReader::ReadImage( const std::string& filename, 
-					 const std::string& exclude )
+  vtkImageData*  ImageReader::ReadImage( const std::string& filename)
   {
-    //    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;
     return i;
   }
   //=====================================================================
@@ -196,8 +146,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)) 
@@ -210,5 +158,16 @@ namespace creaImageIO
   //=====================================================================
 
 
-
+  //=====================================================================
+  /// Pushes back all kwown extensions (without dot) in the vector given
+  void ImageReader::PushBackExtensions(std::vector<std::string>& v)
+  {
+    std::vector<AbstractImageReader*>::iterator i;
+    for (i=mReader.begin(); i!=mReader.end(); i++)
+      {
+	(*i)->PushBackExtensions(v);
+      }
+  }
+  //=====================================================================
+  
 } // namespace creaImageIO