X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOImageReader.cpp;h=4b67e04c005f2c37ae91a1dc7fefdc588ef82741;hb=3a22e19184c369b130d4caa992a8e98e50c7a0ee;hp=9fda22674db7677e06378a37f9d10e8fe1c5f617;hpb=8ea2f1bd62212fe32dc949959a71a385141e7fa6;p=creaImageIO.git

diff --git a/src2/creaImageIOImageReader.cpp b/src2/creaImageIOImageReader.cpp
index 9fda226..4b67e04 100644
--- a/src2/creaImageIOImageReader.cpp
+++ b/src2/creaImageIOImageReader.cpp
@@ -3,9 +3,13 @@
 #include <creaImageIOSystem.h>
 
 #include <creaImageIOVtkImageReader.h>
-#include <creaImageIODicomImageReader.h>
+#if defined (USE_GDCM)
+	#include <creaImageIODicomImageReader.h>
+#endif
+#if defined(USE_GDCM2)
+	#include <creaImageIODicomImageReader2.h>
+#endif
 #include <creaImageIOUltrasonixImageReader.h>
-
 #include <vtkPNGReader.h>
 #include <vtkTIFFReader.h>
 #include <vtkJPEGReader.h>
@@ -43,6 +47,7 @@ namespace creaImageIO
     Register(boost::shared_ptr<AbstractImageReader>(new DicomImageReader));
     Register(boost::shared_ptr<AbstractImageReader>(new UltrasonixImageReader));
 
+	UnRegister(".txt");
  
     mUnreadableImage = vtkImageData::New();
     int dim[3];
@@ -87,14 +92,48 @@ namespace creaImageIO
   {
     mReader.push_back(r);
 
+  }
+
+  void ImageReader::UnRegister(const std::string i_val)
+  {
+    mUnReader.push_back(i_val);
+
   }
   //=====================================================================
 
+   //=====================================================================
+  // Returns true iff the file is readable
+  bool ImageReader::ShallNotRead( const std::string& filename ) 
+  {
+    bool ok = true;
+	if(filename != "")
+	{
+		std::vector<std::string >::iterator i ;
+		for (i=mUnReader.begin(); i!=mUnReader.end(); i++)
+		{
+			
+			if ( (*i).c_str() == filename) 
+			{
+				ok = false;
+				break;
+			}
+		}
+	}
+	return ok;
+	
+  }
+
+
   //=====================================================================
   // Returns true iff the file is readable
   bool ImageReader::CanRead( const std::string& filename ) 
   {
     bool ok = false;
+
+	if( !ShallNotRead(filename))
+	{
+		return ok;
+	}
 	if(filename != "")
 	{
 		std::vector<boost::shared_ptr<AbstractImageReader> >::iterator i;