migration gdcm 2.0 clitkDicom2Image

* Remove readDicomHeader from clitkImageCommon which were used only in
  clitkDicom2Image tool.
* Make clitkDicom2Image compatible with gdcm 2.0

diff --git a/common/clitkImageCommon.cxx b/common/clitkImageCommon.cxx
index 4c66654cc11ad1e1e2ddd271c2910bc2a97ad004..40298452e5430218a3952fbf30a88398d17dc5f3 100644 (file)
--- a/common/clitkImageCommon.cxx
+++ b/common/clitkImageCommon.cxx
@@ -58,30 +58,6 @@ void clitk::ReadImageDimensionAndPixelType(const std::string & filename,
 }
 //--------------------------------------------------------------------
 
-//--------------------------------------------------------------------
-// Read a dicom header
-gdcm::File * clitk::readDicomHeader(const std::string & filename,
-                                    const bool verbose)
-{
-#if GDCM_MAJOR_VERSION == 2
-  gdcm::Reader hreader;
-  hreader.SetFileName(filename.c_str());
-  hreader.Read();
-  gdcm::SmartPointer<gdcm::File> p = hreader.GetFile();
-  return p;
-#else
-  if (verbose) {
-    std::cout << "Reading DICOM <" << filename << ">" << std::endl;
-  }
-  gdcm::File *header = new gdcm::File();
-  header->SetFileName(filename);
-  header->SetMaxSizeLoadEntry(16384); // required ?
-  header->Load();
-  return header;
-#endif
-}
-///--------------------------------------------------------------------
-
 //--------------------------------------------------------------------
 itk::ImageIOBase::Pointer clitk::readImageHeader(const std::string & filename, bool exit_on_error)
 {

diff --git a/common/clitkImageCommon.h b/common/clitkImageCommon.h
index 9559a80cdc49de39f666bdc59f9e9fd35ef2ce5a..3cd8ae51520d7623bb95e0ccca692e329142684e 100644 (file)
--- a/common/clitkImageCommon.h
+++ b/common/clitkImageCommon.h
@@ -26,12 +26,6 @@
 #include "itkImageFileReader.h"
 #include "itkImageSeriesReader.h"
 #include "itkImageFileWriter.h"
-#include "gdcmFile.h"
-#if GDCM_MAJOR_VERSION == 2
-  #include "gdcmReader.h"
-#else
-  #include "gdcmFileHelper.h"
-#endif
 
 namespace clitk {
   
@@ -82,10 +76,6 @@ namespace clitk {
   // Determine pixetype, dimension and number of pixel components  of an image file
   void ReadImageDimensionAndPixelType(const std::string & filename, int & dimension, std::string & pixeType, int & components);
 
-  //--------------------------------------------------------------------
-  // Read a dicom header  
-  gdcm::File * readDicomHeader(const std::string & filename, const bool verbose=false);
-
   //--------------------------------------------------------------------
   template<class ImageType>
   int ComputeHowManyDifferentIntensity(const typename ImageType::Pointer & image, 

diff --git a/tools/clitkDicom2Image.cxx b/tools/clitkDicom2Image.cxx
index 0390c60d553adde38959f994a328ba6043e81e0a..b13de42b419c04fef3d4475ca6c6ae8319688b4a 100644 (file)
--- a/tools/clitkDicom2Image.cxx
+++ b/tools/clitkDicom2Image.cxx
@@ -22,6 +22,12 @@
 #include "clitkImageCommon.h"
 #include "vvImageReader.h"
 #include "vvImageWriter.h"
+#include <gdcmFile.h>
+#if GDCM_MAJOR_VERSION == 2
+  #include <gdcmImageHelper.h>
+  #include <gdcmAttribute.h>
+  #include <gdcmReader.h>
+#endif
 
 //====================================================================
 int main(int argc, char * argv[])
@@ -48,13 +54,33 @@ int main(int argc, char * argv[])
   std::vector<double> sliceLocations;
   for(unsigned int i=0; i<args_info.inputs_num; i++) {
     //std::cout << "Reading <" << input_files[i] << std::endl;
-    gdcm::File * header = clitk::readDicomHeader(input_files[i]);
-    sliceLocations.push_back(header->GetZOrigin());
-    if (header->GetPixelSize() != 2) {
+#if GDCM_MAJOR_VERSION == 2
+    gdcm::Reader hreader;
+    hreader.SetFileName(input_files[i].c_str());
+    hreader.Read();
+    std::vector<double> theorigin = gdcm::ImageHelper::GetOriginValue(hreader.GetFile());
+    sliceLocations.push_back(theorigin[2]);
+    gdcm::Attribute<0x28, 0x100> pixel_size;
+    gdcm::DataSet& ds = hreader.GetFile().GetDataSet();
+    pixel_size.SetFromDataSet(ds);
+    if (pixel_size.GetValue() != 16)
+    {
       std::cerr << "Pixel type 2 bytes ! " << std::endl;
       std::cerr << "In file " << input_files[i] << std::endl;
       exit(0);
     }
+#else
+  gdcm::File *header = new gdcm::File();
+  header->SetFileName(input_files[i]);
+  header->SetMaxSizeLoadEntry(16384); // required ?
+  header->Load();
+  sliceLocations.push_back(header->GetZOrigin());
+  if (header->GetPixelSize() != 2) {
+    std::cerr << "Pixel type 2 bytes ! " << std::endl;
+    std::cerr << "In file " << input_files[i] << std::endl;
+    exit(0);
+  }
+#endif
   }
 
   //===========================================

diff --git a/tools/clitkDicomInfo.cxx b/tools/clitkDicomInfo.cxx
index d4506a2e6cbf52b73ef6d4c80438c951ec1778d6..fe2d869d8bbf2e756068ae0b488c30dc45641583 100644 (file)
--- a/tools/clitkDicomInfo.cxx
+++ b/tools/clitkDicomInfo.cxx
@@ -28,6 +28,10 @@
 
 // itk (gdcm) include
 #include "gdcmFile.h"
+#if GDCM_MAJOR_VERSION == 2
+  #include "gdcmReader.h"
+  #include "gdcmPrinter.h"
+#endif
 
 //--------------------------------------------------------------------
 int main(int argc, char * argv[])
@@ -41,11 +45,21 @@ int main(int argc, char * argv[])
 
   // Loop files
   for(unsigned int i=0; i<args_info.inputs_num; i++) {
+#if GDCM_MAJOR_VERSION == 2
+    gdcm::Reader reader;
+    reader.SetFileName(args_info.inputs[i]);
+    reader.Read();
+    gdcm::Printer printer;
+    printer.SetFile(reader.GetFile());
+    printer.SetStyle(gdcm::Printer::VERBOSE_STYLE);
+    printer.Print( std::cout );
+#else
     gdcm::File *header = new gdcm::File();
     header->SetFileName(args_info.inputs[i]);
     header->SetMaxSizeLoadEntry(163840);
     header->Load();
     header->Print();
+#endif
   }
 
   // this is the end my friend