X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestDicomDir.cxx;h=5690f519dfdd3f6644e5608bde555b476b96a54e;hb=a81c9428c7478837959d6aba096d5a3c240b5753;hp=97d8835a88e1c41bb6d04527658dbd62dc839f10;hpb=593533841170a4c0e5d0f644b8c8dd5bbeb4ff3c;p=gdcm.git

diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx
index 97d8835a..5690f519 100644
--- a/Testing/TestDicomDir.cxx
+++ b/Testing/TestDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/01 10:52:09 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2007/04/12 13:06:02 $
+  Version:   $Revision: 1.45 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,7 +16,7 @@
                                                                                 
 =========================================================================*/
 #include "gdcmDocEntry.h"
-#include "gdcmValEntry.h"
+#include "gdcmDataEntry.h"
 #include "gdcmDicomDir.h"
 #include "gdcmDicomDirPatient.h"
 #include "gdcmDicomDirStudy.h"
@@ -27,6 +27,8 @@
 #include <iostream>
 #include <fstream>
 
+#include <stdlib.h>
+
 // check *all* the dicom elements (gdcm::DocEntry)
 // of this gdcm::DicomDirObject
 int CompareSQItem(gdcm::SQItem *pa1, gdcm::SQItem *pa2 )
@@ -48,12 +50,12 @@ int CompareSQItem(gdcm::SQItem *pa1, gdcm::SQItem *pa2 )
        return 1; 
       }
       // skip SeqEntries (I don't want to deal with 'recursion pbs' here)
-      if ( !dynamic_cast<gdcm::ValEntry*>(e1) ||
-           !dynamic_cast<gdcm::ValEntry*>(e2) )
+      if ( !dynamic_cast<gdcm::DataEntry *>(e1) ||
+           !dynamic_cast<gdcm::DataEntry *>(e2) )
          continue;
 
       // a value is read as GDCM_UNFOUND 
-      if ( ((gdcm::ValEntry*)e1)->GetValue() == gdcm::GDCM_UNFOUND )
+      if ( ((gdcm::DataEntry *)e1)->GetString() == gdcm::GDCM_UNFOUND )
       {
          std::cout << "for gdcm source DicomDir : element (" << std::hex 
                    << e1->GetGroup() << "," <<e1->GetElement() 
@@ -63,16 +65,19 @@ int CompareSQItem(gdcm::SQItem *pa1, gdcm::SQItem *pa2 )
       }
 
       // values differ in source file and destination file
-      if ( ((gdcm::ValEntry*)e1)->GetValue() != 
-           ((gdcm::ValEntry*)e2)->GetValue() )
+      if ( ((gdcm::DataEntry *)e1)->GetString() != 
+           ((gdcm::DataEntry *)e2)->GetString() )
       {
  
+ /// \todo : check the value *written on disc*, not the value converted as a std::string
+ ///         (this comparison doesn't make the difference between Ox(ff) and "255" ...)
+ 
          // serious trouble : values differ in source and destination file
          std::cout << "for gdcm DicomDir element (" << std::hex 
                    << e2->GetGroup() << "," <<e2->GetElement() 
                    << ") values differ [" 
-                   << ((gdcm::ValEntry*)e1)->GetValue() << "] != [" 
-                   << ((gdcm::ValEntry*)e2)->GetValue() << "]"
+                   << ((gdcm::DataEntry *)e1)->GetString() << "] != [" 
+                   << ((gdcm::DataEntry *)e2)->GetString() << "]"
                    << std::endl;
           return 1;
       }
@@ -80,14 +85,14 @@ int CompareSQItem(gdcm::SQItem *pa1, gdcm::SQItem *pa2 )
    return 0;
 } 
  
-int TestDicomDir(int argc, char* argv[])
+int TestDicomDir(int argc, char *argv[])
 {  
    gdcm::DicomDir *dicomdir;
    
-   gdcm::DicomDirPatient * pa1;
-   gdcm::DicomDirStudy *st1;
-   gdcm::DicomDirSerie *se1;
-   gdcm::DicomDirImage *im1;
+   gdcm::DicomDirPatient *pa1;
+   gdcm::DicomDirStudy   *st1;
+   gdcm::DicomDirSerie   *se1;
+   gdcm::DicomDirImage   *im1;
 
    gdcm::TSKey v;
     
@@ -100,21 +105,26 @@ int TestDicomDir(int argc, char* argv[])
       file += "/DICOMDIR";
    }
 
-   dicomdir = new gdcm::DicomDir(file);
+   std::cout << "DicomDir we're going to deal with : ["<< file << "]" 
+             << std::endl;
+
+   dicomdir = gdcm::DicomDir::New();
+   dicomdir->SetFileName(file);
+   dicomdir->Load();
    if (argc > 2) 
    {
       int level = atoi(argv[2]);   
       dicomdir->SetPrintLevel(level);
    }
 
-   // Test if the DicomDir is readable
+   // Test if the DICOMDIR file is readable
    if( !dicomdir->IsReadable() )
    {
       std::cout<<"          DicomDir '"<<file
                <<"' is not readable"<<std::endl
                <<"          ...Failed"<<std::endl;
 
-      delete dicomdir;
+      dicomdir->Delete();
       return 1;
    }
    else
@@ -123,14 +133,14 @@ int TestDicomDir(int argc, char* argv[])
                <<"' is readable"<<std::endl;
    }
 
-   // Test if the DicomDir contains any patient
+   // Test if the gdcm::DicomDir contains any patient
    if( !dicomdir->GetFirstPatient() )
    {
       std::cout<<"          DicomDir '"<<file
                <<" has no patient"<<std::endl
                <<"          ...Failed"<<std::endl;
 
-      delete dicomdir;
+      dicomdir->Delete();
       return 1;
    }
 
@@ -141,27 +151,27 @@ int TestDicomDir(int argc, char* argv[])
 
    pa1 = dicomdir->GetFirstPatient(); 
    while ( pa1 ) 
-   {  // we process all the PATIENT of this DICOMDIR 
-      std::cout << pa1->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name
+   {  // we process all the PATIENT of this gdcm::DicomDir 
+      std::cout << pa1->GetEntryString(0x0010, 0x0010) << std::endl; // Patient's Name
 
       st1 = pa1->GetFirstStudy();
       while ( st1 ) 
       { // we process all the STUDY of this patient
-         std::cout << "--- "<< st1->GetEntryValue(0x0008, 0x1030) // Study Description
+         std::cout << "--- "<< st1->GetEntryString(0x0008, 0x1030) // Study Description
          << std::endl;  
-         std::cout << " Stud.ID:[" << st1->GetEntryValue(0x0020, 0x0010) // Study ID
+         std::cout << " Stud.ID:[" << st1->GetEntryString(0x0020, 0x0010) // Study ID
          << "]"; 
 
          se1 = st1->GetFirstSerie();
          while ( se1 ) 
          { // we process all the SERIES of this study
-            std::cout << "--- --- "<< se1->GetEntryValue(0x0008, 0x103e) << std::endl;      // Serie Description
-            std::cout << " Ser.nb:["         <<  se1->GetEntryValue(0x0020, 0x0011);        // Series number
-            std::cout << "] Mod.:["          <<  se1->GetEntryValue(0x0008, 0x0060) << "]"; // Modality
+            std::cout << "--- --- "<< se1->GetEntryString(0x0008, 0x103e) << std::endl;      // Serie Description
+            std::cout << " Ser.nb:["         <<  se1->GetEntryString(0x0020, 0x0011);        // Series number
+            std::cout << "] Mod.:["          <<  se1->GetEntryString(0x0008, 0x0060) << "]"; // Modality
 
             im1 = se1->GetFirstImage();
             while ( im1 ) { // we process all the IMAGE of this serie
-               std::cout << "--- --- --- "<< im1->GetEntryValue(0x0004, 0x1500) << std::endl; // File name
+               std::cout << "--- --- --- "<< im1->GetEntryString(0x0004, 0x1500) << std::endl; // File name
                im1 = se1->GetNextImage();   
             }
             se1 = st1->GetNextSerie();   
@@ -171,22 +181,34 @@ int TestDicomDir(int argc, char* argv[])
       pa1 = dicomdir->GetNextPatient();
    }  
 
+/*
+// this one is *really* too much verbose!
+
    std::cout << std::endl << std::endl  
              << " = DICOMDIR full content ====================================" 
              << std::endl<< std::endl;
-  // dicomdir->Print();
-
+   dicomdir->Print();
+   std::cout << std::endl << std::endl  
+             << " = end of DICOMDIR full content ====================================" 
+             << std::endl<< std::endl;
+*/
    // ------------------------- second stage ---------------------------
+ 
+ 
+ gdcm::Debug::DebugOn();
+ 
     
    // Write on disc what we read
-   dicomdir->WriteDicomDir("NewDICOMDIR");
+   dicomdir->Write("NewDICOMDIR");
 
    std::cout << std::endl << std::endl  
              << "NewDICOMDIR written on disc =================================" 
              << std::endl<< std::endl;
   // Read what we wrote  
-   gdcm::DicomDir *d2 = new gdcm::DicomDir("NewDICOMDIR");
-   if (!d2)
+   gdcm::DicomDir *d2 = gdcm::DicomDir::New();
+   d2->SetFileName("NewDICOMDIR");
+   d2->Load();
+   if (!d2->IsReadable())
    {
       std::cout << std::endl << std::endl  
                 << "Read NewDicomDir from disc failed ========================" 
@@ -198,9 +220,9 @@ int TestDicomDir(int argc, char* argv[])
              << std::endl<< std::endl;
   
    gdcm::DicomDirPatient *pa2;
-   gdcm::DicomDirStudy *st2;
-   gdcm::DicomDirSerie *se2;
-   gdcm::DicomDirImage *im2;
+   gdcm::DicomDirStudy   *st2;
+   gdcm::DicomDirSerie   *se2;
+   gdcm::DicomDirImage   *im2;
 
    pa1 = dicomdir->GetFirstPatient(); 
    pa2 = d2->GetFirstPatient(); 
@@ -208,8 +230,8 @@ int TestDicomDir(int argc, char* argv[])
    if (!d2)
    {
       std::cout << "NewDICOMDIR contains no Patient ?!?" << std::endl;
-      delete dicomdir;
-      delete d2;
+      dicomdir->Delete();
+      d2->Delete();
       return 1;
    }
    
@@ -218,13 +240,13 @@ int TestDicomDir(int argc, char* argv[])
 
       if ( CompareSQItem(pa2,pa1) == 1 )
       {
-         delete dicomdir;
-         delete d2;
+         dicomdir->Delete();
+         d2->Delete();
          return 1;
       }
   
       // just to allow human reader to be sure ...
-      std::cout << pa2->GetEntryValue(0x0010, 0x0010) 
+      std::cout << pa2->GetEntryString(0x0010, 0x0010) 
                 << std::endl; // Patient's Name
  
       st1 = pa1->GetFirstStudy();
@@ -234,16 +256,16 @@ int TestDicomDir(int argc, char* argv[])
       {
          if ( CompareSQItem(st2,st1) == 1 )
          {
-            delete dicomdir;
-            delete d2;
+            dicomdir->Delete();
+            d2->Delete();
             return 1;
          }
 
          // just to allow human reader to be sure ...
-         std::cout << "--- "<< st2->GetEntryValue(0x0008, 0x1030);
+         std::cout << "--- "<< st2->GetEntryString(0x0008, 0x1030);
          // << std::endl;    // Study Description
          std::cout << " Stud.ID:["          
-                   << st2->GetEntryValue(0x0020, 0x0010)
+                   << st2->GetEntryString(0x0020, 0x0010)
                    << "]" << std::endl; // Study ID
   
          se1 = st1->GetFirstSerie();
@@ -252,10 +274,11 @@ int TestDicomDir(int argc, char* argv[])
          while ( se1 && se2 ) 
          { // we process all the SERIE of this study
             if ( CompareSQItem(se2,se1) == 1 )
-              return 1; 
-            std::cout << "--- --- " << se2->GetEntryValue(0x0008, 0x103e);      // Serie Description
-            std::cout << " Ser.nb:["<< se2->GetEntryValue(0x0020, 0x0011);        // Series number
-            std::cout << "] Mod.:[" << se2->GetEntryValue(0x0008, 0x0060) << "]" << std::endl; // Modality
+              return 1;
+
+            std::cout << "--- --- " << se2->GetEntryString(0x0008, 0x103e);      // Serie Description
+            std::cout << " Ser.nb:["<< se2->GetEntryString(0x0020, 0x0011);        // Series number
+            std::cout << "] Mod.:[" << se2->GetEntryString(0x0008, 0x0060) << "]" << std::endl; // Modality
             im1 = se1->GetFirstImage();
             im2 = se2->GetFirstImage();
 
@@ -263,8 +286,8 @@ int TestDicomDir(int argc, char* argv[])
             {
                if ( CompareSQItem(im2,im1) == 1 )
                {
-                  delete dicomdir;
-                  delete d2;
+                  dicomdir->Delete();
+                  d2->Delete();
                   return 1; 
                }
 
@@ -282,8 +305,8 @@ int TestDicomDir(int argc, char* argv[])
    }
    
    std::cout << std::flush;
-   delete dicomdir;
-   delete d2;
+   dicomdir->Delete();
+   d2->Delete();
 
    return 0;
 }