X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestDicomDir.cxx;h=6039f22a4b041cf6fbdb9b41c57b117a2637248e;hb=693be63ee7a331d55d3791caa637e40679f31251;hp=98f01cc0e055305ae889145fe78dc96eece14a08;hpb=0e0403151bbff57175d2b974ee2d14b8195f9234;p=gdcm.git

diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx
index 98f01cc0..6039f22a 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/01/31 03:22:24 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2005/02/03 10:00:06 $
+  Version:   $Revision: 1.38 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,9 +39,10 @@ int CompareSQItem(gdcm::SQItem *pa1, gdcm::SQItem *pa2 )
    {
       // locate the corresponding element in 'source' file 
       e1 = pa1->GetDocEntry( e2->GetGroup(),e2->GetElement() );
+
+      // an element doesn't exist in origin file
       if (!e1)
       {
-      // an element doesn't exist in source file
        std::cout << "DicomDir element " << std::hex 
                  << e2->GetGroup() << "," <<e2->GetElement() << std::endl;
        return 1; 
@@ -51,9 +52,21 @@ int CompareSQItem(gdcm::SQItem *pa1, gdcm::SQItem *pa2 )
            !dynamic_cast<gdcm::ValEntry*>(e2) )
          continue;
 
+      // a value is read as GDCM_UNFOUND 
+      if ( ((gdcm::ValEntry*)e1)->GetValue() == gdcm::GDCM_UNFOUND )
+      {
+         std::cout << "for gdcm source DicomDir : element (" << std::hex 
+                   << e1->GetGroup() << "," <<e1->GetElement() 
+                   << ") has values [" << gdcm::GDCM_UNFOUND << "]"
+                   << std::endl;
+         return 1;
+      }
+
+      // values differ in source file and destination file
       if ( ((gdcm::ValEntry*)e1)->GetValue() != 
            ((gdcm::ValEntry*)e2)->GetValue() )
       {
+ 
          // serious trouble : values differ in source and destination file
          std::cout << "for gdcm DicomDir element (" << std::hex 
                    << e2->GetGroup() << "," <<e2->GetElement() 
@@ -67,14 +80,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;
     
@@ -173,7 +186,6 @@ int TestDicomDir(int argc, char* argv[])
              << std::endl<< std::endl;
   // Read what we wrote  
    gdcm::DicomDir *d2 = new gdcm::DicomDir("NewDICOMDIR");
-
    if (!d2)
    {
       std::cout << std::endl << std::endl  
@@ -186,9 +198,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(); 
@@ -196,6 +208,8 @@ int TestDicomDir(int argc, char* argv[])
    if (!d2)
    {
       std::cout << "NewDICOMDIR contains no Patient ?!?" << std::endl;
+      delete dicomdir;
+      delete d2;
       return 1;
    }
    
@@ -203,7 +217,11 @@ int TestDicomDir(int argc, char* argv[])
    {  // we process all the PATIENT of this DICOMDIR
 
       if ( CompareSQItem(pa2,pa1) == 1 )
-        return 1;
+      {
+         delete dicomdir;
+         delete d2;
+         return 1;
+      }
   
       // just to allow human reader to be sure ...
       std::cout << pa2->GetEntryValue(0x0010, 0x0010) 
@@ -215,7 +233,11 @@ int TestDicomDir(int argc, char* argv[])
       while ( st1 && st2 )   
       {
          if ( CompareSQItem(st2,st1) == 1 )
-           return 1;
+         {
+            delete dicomdir;
+            delete d2;
+            return 1;
+         }
 
          // just to allow human reader to be sure ...
          std::cout << "--- "<< st2->GetEntryValue(0x0008, 0x1030);
@@ -240,7 +262,11 @@ int TestDicomDir(int argc, char* argv[])
             while ( im1 && im2 ) // we process all the IMAGE of this serie
             {
                if ( CompareSQItem(im2,im1) == 1 )
+               {
+                  delete dicomdir;
+                  delete d2;
                   return 1; 
+               }
 
                im1 = se1->GetNextImage();   
                im2 = se2->GetNextImage();   
@@ -257,6 +283,7 @@ int TestDicomDir(int argc, char* argv[])
    
    std::cout << std::flush;
    delete dicomdir;
+   delete d2;
 
    return 0;
 }