X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintDicomDir.cxx;h=8f6e250915d7a498b807751d4c5d00ee1597ca45;hb=0a655fde787d29a2d739e675edf89d5de9840b9c;hp=0fd1386623117d9ff91b35f626c8bd0a4d1b0e61;hpb=f5c6165e85bd1bc727e0b73e2abd3302855cce16;p=gdcm.git

diff --git a/Example/PrintDicomDir.cxx b/Example/PrintDicomDir.cxx
index 0fd13866..8f6e2509 100644
--- a/Example/PrintDicomDir.cxx
+++ b/Example/PrintDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/13 14:20:18 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2005/02/01 10:34:59 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -31,13 +31,13 @@
 int main(int argc, char* argv[])
 {  
    gdcm::DicomDir *e1;
-   
-   gdcm::ListDicomDirPatient::const_iterator  itPatient;
-   gdcm::ListDicomDirStudy::const_iterator    itStudy;
-   gdcm::ListDicomDirSerie::const_iterator    itSerie;
-   gdcm::ListDicomDirImage::const_iterator    itImage;
    gdcm::TSKey v;
-    
+
+   gdcm::DicomDirPatient *pa;
+   gdcm::DicomDirStudy *st;
+   gdcm::DicomDirSerie *se;
+   gdcm::DicomDirImage *im;
+  
    std::string fileName; 
    if (argc > 1) 
       fileName = argv[1];    
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
    }
 
    if (argc > 3)
-      gdcm::Debug::SetDebugOn();
+      gdcm::Debug::DebugOn();
 
    e1 = new gdcm::DicomDir( fileName );
 
@@ -59,11 +59,27 @@ int main(int argc, char* argv[])
    else
       detailLevel = 3;
 
+   // Test if the DicomDir is readable
+   if( !e1->IsReadable() )
+   {
+      std::cout<<"          DicomDir '"<<fileName
+               <<"' is not readable"<<std::endl
+               <<"          ...Failed"<<std::endl;
+
+      delete e1;
+      return 1;
+   }
 
-   if(e1->GetDicomDirPatients().begin() == e1->GetDicomDirPatients().end() )
+   // Test if the DicomDir contains any Patient
+   pa = e1->GetFirstPatient();
+   if ( pa  == 0)
    {
-      std::cout<<"Empty list"<<std::endl;
-      return(1);
+      std::cout<<"          DicomDir '"<<fileName
+               <<" has no patient"<<std::endl
+               <<"          ...Failed"<<std::endl;
+
+      delete e1;
+      return 1;
    }
 
 // Structure use Examples 
@@ -75,11 +91,11 @@ int main(int argc, char* argv[])
        << " =  PATIENT List ==========================================" 
        << std::endl<< std::endl;
 
-      itPatient = e1->GetDicomDirPatients().begin();
-      while ( itPatient != e1->GetDicomDirPatients().end() ) // on degouline la liste de PATIENT
+      pa = e1->GetFirstPatient();
+      while (pa) 
       {
-         std::cout << (*itPatient)->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name   
-         itPatient ++;    
+         std::cout << pa->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name   
+         pa = e1->GetNextPatient();    
       }
       break;
 
@@ -88,15 +104,17 @@ int main(int argc, char* argv[])
         << " = PATIENT/STUDY List =======================================" 
         << std::endl<< std::endl;
 
-      itPatient = e1->GetDicomDirPatients().begin();
-      while ( itPatient != e1->GetDicomDirPatients().end() ) {  // on degouline la liste de PATIENT
-         std::cout << (*itPatient)->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name 
-         itStudy = ((*itPatient)->GetDicomDirStudies()).begin();
-         while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) { // on degouline les STUDY de ce patient
-            std::cout << "--- "<< (*itStudy)->GetEntry(0x0008, 0x1030) << std::endl; // Study Description
-            ++itStudy;
+      pa = e1->GetFirstPatient();
+      while ( pa ) // on degouline les PATIENT de ce DICOMDIR
+      {  
+         std::cout << pa->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name 
+
+         st = pa->GetFirstStudy();
+         while ( st ) { // on degouline les STUDY de ce patient
+            std::cout << "--- "<< st->GetEntryValue(0x0008, 0x1030) << std::endl; // Study Description
+            st = pa->GetNextStudy();
          }
-         itPatient ++;    
+         pa = e1->GetNextPatient();    
       }   
       break;
 
@@ -104,30 +122,32 @@ int main(int argc, char* argv[])
       std::cout << std::endl << std::endl  
         << " =  PATIENT/STUDY/SERIE List ==================================" 
         << std::endl<< std::endl;
- 
-      itPatient = e1->GetDicomDirPatients().begin();
-      while ( itPatient != e1->GetDicomDirPatients().end() )   // on degouline la liste de PATIENT
+
+      pa = e1->GetFirstPatient(); 
+      while ( pa )   // on degouline les PATIENT de ce DICOMDIR
       {
        // Patient's Name, Patient ID 
-         std::cout << "Pat.Name:[" << (*itPatient)->GetEntry(0x0010, 0x0010) <<"]"; // Patient's Name
+         std::cout << "Pat.Name:[" << pa->GetEntryValue(0x0010, 0x0010) <<"]"; // Patient's Name
          std::cout << " Pat.ID:[";
-         std::cout << (*itPatient)->GetEntry(0x0010, 0x0020) << "]" << std::endl; // Patient ID
-         itStudy = ((*itPatient)->GetDicomDirStudies()).begin();
-         while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) { // on degouline les STUDY de ce patient
-            std::cout << "--- Stud.descr:["    << (*itStudy)->GetEntry(0x0008, 0x1030) << "]";// Study Description 
-            std::cout << " Stud.ID:["          << (*itStudy)->GetEntry(0x0020, 0x0010);       // Study ID
+         std::cout << pa->GetEntryValue(0x0010, 0x0020) << "]" << std::endl; // Patient ID
+
+         st = pa->GetFirstStudy();
+         while ( st ) { // on degouline les STUDY de ce patient
+            std::cout << "--- Stud.descr:["    << st->GetEntryValue(0x0008, 0x1030) << "]";// Study Description 
+            std::cout << " Stud.ID:["          << st->GetEntryValue(0x0020, 0x0010);       // Study ID
             std::cout << "]" << std::endl;
-            itSerie = ((*itStudy)->GetDicomDirSeries()).begin();
-            while (itSerie != (*itStudy)->GetDicomDirSeries().end() ) { // on degouline les SERIES de cette study
-               std::cout << "--- --- Ser.Descr:["<< (*itSerie)->GetEntry(0x0008, 0x103e)<< "]";  // Series Description
-               std::cout << " Ser.nb:["         <<  (*itSerie)->GetEntry(0x0020, 0x0011);        // Series number
-               std::cout << "] Mod.:["          <<  (*itSerie)->GetEntry(0x0008, 0x0060) << "]"; // Modality
-              std::cout << std::endl;    
-               ++itSerie;   
+
+            se = st->GetFirstSerie();
+            while ( se ) { // on degouline les SERIES de cette study
+               std::cout << "--- --- Ser.Descr:["<< se->GetEntryValue(0x0008, 0x103e)<< "]";  // Series Description
+               std::cout << " Ser.nb:["         <<  se->GetEntryValue(0x0020, 0x0011);        // Series number
+               std::cout << "] Mod.:["          <<  se->GetEntryValue(0x0008, 0x0060) << "]"; // Modality
+               std::cout << std::endl;    
+               se = st->GetNextSerie();   
             }
-            ++itStudy;
+            st = pa->GetNextStudy();
          }
-         itPatient ++;    
+         pa = e1->GetNextPatient();    
       } 
       break;
 
@@ -136,25 +156,31 @@ int main(int argc, char* argv[])
            << " = PATIENT/STUDY/SERIE/IMAGE List ============================" 
            << std::endl<< std::endl;
  
-      itPatient = e1->GetDicomDirPatients().begin();
-      while ( itPatient != e1->GetDicomDirPatients().end() ) {  // on degouline la liste de PATIENT
-         std::cout << (*itPatient)->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name
-         itStudy = ((*itPatient)->GetDicomDirStudies()).begin();
-         while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) { // on degouline les STUDY de ce patient
-            std::cout << "--- "<< (*itStudy)->GetEntry(0x0008, 0x1030) << std::endl; // Study Description
-            itSerie = ((*itStudy)->GetDicomDirSeries()).begin();
-            while (itSerie != (*itStudy)->GetDicomDirSeries().end() ) { // on degouline les SERIES de cette study
-               std::cout << "--- --- "<< (*itSerie)->GetEntry(0x0008, 0x103e) << std::endl; // Serie Description
-               itImage = ((*itSerie)->GetDicomDirImages()).begin();
-               while (itImage != (*itSerie)->GetDicomDirImages().end() ) { // on degouline les SERIES de cette study
-                  std::cout << "--- --- --- "<< (*itImage)->GetEntry(0x0004, 0x1500) << std::endl; // File name
-                  ++itImage;   
+      pa = e1->GetFirstPatient(); 
+      while ( pa ) {  // les PATIENT de ce DICOMDIR
+         std::cout << pa->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name
+
+         st = pa->GetFirstStudy();
+         while ( st ) { // on degouline les STUDY de ce patient
+            std::cout << "--- "<< st->GetEntryValue(0x0008, 0x1030) << std::endl;    // Study Description
+            std::cout << " Stud.ID:["          << st->GetEntryValue(0x0020, 0x0010); // Study ID
+
+            se = st->GetFirstSerie();
+            while ( se ) { // on degouline les SERIES de cette study
+               std::cout << "--- --- "<< se->GetEntryValue(0x0008, 0x103e) << std::endl;      // Serie Description
+               std::cout << " Ser.nb:["         <<  se->GetEntryValue(0x0020, 0x0011);        // Series number
+               std::cout << "] Mod.:["          <<  se->GetEntryValue(0x0008, 0x0060) << "]"; // Modality
+
+               im = se->GetFirstImage();
+               while ( im ) { // on degouline les Images de cette serie
+                  std::cout << "--- --- --- "<< im->GetEntryValue(0x0004, 0x1500) << std::endl; // File name
+                  im = se->GetNextImage();   
                }
-               ++itSerie;   
+               se = st->GetNextSerie();   
            }
-           ++itStudy;
-        }  
-        itPatient ++;    
+            st = pa->GetNextStudy();
+        }     
+        pa = e1->GetNextPatient();    
       }
       break;
 
@@ -168,6 +194,40 @@ int main(int argc, char* argv[])
    }  // end switch
 
 
+ /*
+   // Previous code.
+   // Kept as an example. Please don't remove
+ 
+   gdcm::ListDicomDirPatient::const_iterator  itPatient;
+   gdcm::ListDicomDirStudy::const_iterator    itStudy;
+   gdcm::ListDicomDirSerie::const_iterator    itSerie;
+   gdcm::ListDicomDirImage::const_iterator    itImage;
+   cout << std::endl << std::endl
+        << " = Liste des PATIENT/STUDY/SERIE/IMAGE ===================================" 
+        << std::endl<< std::endl;
+ 
+   itPatient = e1->GetDicomDirPatients().begin();
+   while ( itPatient != e1->GetDicomDirPatients().end() ) {  // on degouline les PATIENT de ce DICOMDIR
+      std::cout << (*itPatient)->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name
+      itStudy = ((*itPatient)->GetDicomDirStudies()).begin();
+      while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) { // on degouline les STUDY de ce patient
+         std::cout << "--- "<< (*itStudy)->GetEntryValue(0x0008, 0x1030) << std::endl; // Study Description
+         itSerie = ((*itStudy)->GetDicomDirSeries()).begin();
+         while (itSerie != (*itStudy)->GetDicomDirSeries().end() ) { // on degouline les SERIES de cette study
+            std::cout << "--- --- "<< (*itSerie)->GetEntryValue(0x0008, 0x103e) << std::endl; // Serie Description
+            itImage = ((*itSerie)->GetDicomDirImages()).begin();
+            while (itImage != (*itSerie)->GetDicomDirImages().end() ) { // on degouline les IMAGES de cette serie
+               std::cout << "--- --- --- "<< (*itImage)->GetEntryValue(0x0004, 0x1500) << std::endl; // File name
+               ++itImage;   
+            }
+            ++itSerie;   
+         }
+         ++itStudy;
+      }  
+      itPatient ++;    
+   }   
+ */  
+
 
    if(e1->IsReadable())
       std::cout <<std::endl<<fileName<<" is Readable"<<std::endl;