move directory

[creaImageIO.git] / src2 / creaImageIOImageReader.cpp

diff --git a/src2/creaImageIOImageReader.cpp b/src2/creaImageIOImageReader.cpp
index 9fda22674db7677e06378a37f9d10e8fe1c5f617..4b67e04c005f2c37ae91a1dc7fefdc588ef82741 100644 (file)
--- 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;