* src/gdcmDicomDir*.[h|cxx] : rename methods to be logik in their name.

[gdcm.git] / Example / PrintDicomDir.cxx

diff --git a/Example/PrintDicomDir.cxx b/Example/PrintDicomDir.cxx
index 5e589900e755b4e46a25e1e34cc2c555cb85ac34..cc8c9a7f869f594729b7db1d44b681a7edca2fbc 100644 (file)
--- 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/18 07:55:16 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2005/01/20 11:09:21 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -71,7 +71,7 @@ int main(int argc, char* argv[])
    }
 
    // Test if the DicomDir contains any Patient
-   pa = e1->GetFirstEntry();
+   pa = e1->GetFirstPatient();
    if ( pa  == 0)
    {
       std::cout<<"          DicomDir '"<<fileName
@@ -91,11 +91,11 @@ int main(int argc, char* argv[])
        << " =  PATIENT List ==========================================" 
        << std::endl<< std::endl;
 
-      pa = e1->GetFirstEntry();
+      pa = e1->GetFirstPatient();
       while (pa) 
       {
          std::cout << pa->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name   
-         pa = e1->GetNextEntry();    
+         pa = e1->GetNextPatient();    
       }
       break;
 
@@ -104,16 +104,17 @@ int main(int argc, char* argv[])
         << " = PATIENT/STUDY List =======================================" 
         << std::endl<< std::endl;
 
-      pa = e1->GetFirstEntry();
+      pa = e1->GetFirstPatient();
       while ( pa ) // on degouline les PATIENT de ce DICOMDIR
       {  
          std::cout << pa->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name 
-         st = pa->GetFirstEntry();
+
+         st = pa->GetFirstStudy();
          while ( st ) { // on degouline les STUDY de ce patient
             std::cout << "--- "<< st->GetEntry(0x0008, 0x1030) << std::endl; // Study Description
-            st = pa->GetNextEntry();
+            st = pa->GetNextStudy();
          }
-         pa = e1->GetNextEntry();    
+         pa = e1->GetNextPatient();    
       }   
       break;
 
@@ -122,29 +123,31 @@ int main(int argc, char* argv[])
         << " =  PATIENT/STUDY/SERIE List ==================================" 
         << std::endl<< std::endl;
 
-      pa = e1->GetFirstEntry(); 
+      pa = e1->GetFirstPatient(); 
       while ( pa )   // on degouline les PATIENT de ce DICOMDIR
       {
        // Patient's Name, Patient ID 
          std::cout << "Pat.Name:[" << pa->GetEntry(0x0010, 0x0010) <<"]"; // Patient's Name
          std::cout << " Pat.ID:[";
          std::cout << pa->GetEntry(0x0010, 0x0020) << "]" << std::endl; // Patient ID
-         st = pa->GetFirstEntry();
+
+         st = pa->GetFirstStudy();
          while ( st ) { // on degouline les STUDY de ce patient
             std::cout << "--- Stud.descr:["    << st->GetEntry(0x0008, 0x1030) << "]";// Study Description 
             std::cout << " Stud.ID:["          << st->GetEntry(0x0020, 0x0010);       // Study ID
             std::cout << "]" << std::endl;
-            se = st->GetFirstEntry();
+
+            se = st->GetFirstSerie();
             while ( se ) { // on degouline les SERIES de cette study
                std::cout << "--- --- Ser.Descr:["<< se->GetEntry(0x0008, 0x103e)<< "]";  // Series Description
                std::cout << " Ser.nb:["         <<  se->GetEntry(0x0020, 0x0011);        // Series number
                std::cout << "] Mod.:["          <<  se->GetEntry(0x0008, 0x0060) << "]"; // Modality
                std::cout << std::endl;    
-               se = st->GetNextEntry();   
+               se = st->GetNextSerie();   
             }
-            st = pa->GetNextEntry();
+            st = pa->GetNextStudy();
          }
-         pa = e1->GetNextEntry();    
+         pa = e1->GetNextPatient();    
       } 
       break;
 
@@ -153,28 +156,31 @@ int main(int argc, char* argv[])
            << " = PATIENT/STUDY/SERIE/IMAGE List ============================" 
            << std::endl<< std::endl;
  
-      pa = e1->GetFirstEntry(); 
+      pa = e1->GetFirstPatient(); 
       while ( pa ) {  // les PATIENT de ce DICOMDIR
          std::cout << pa->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name
-         st = pa->GetFirstEntry();
+
+         st = pa->GetFirstStudy();
          while ( st ) { // on degouline les STUDY de ce patient
             std::cout << "--- "<< st->GetEntry(0x0008, 0x1030) << std::endl;    // Study Description
             std::cout << " Stud.ID:["          << st->GetEntry(0x0020, 0x0010); // Study ID
-            se = st->GetFirstEntry();
+
+            se = st->GetFirstSerie();
             while ( se ) { // on degouline les SERIES de cette study
                std::cout << "--- --- "<< se->GetEntry(0x0008, 0x103e) << std::endl;      // Serie Description
                std::cout << " Ser.nb:["         <<  se->GetEntry(0x0020, 0x0011);        // Series number
                std::cout << "] Mod.:["          <<  se->GetEntry(0x0008, 0x0060) << "]"; // Modality
-               im = se->GetFirstEntry();
+
+               im = se->GetFirstImage();
                while ( im ) { // on degouline les Images de cette serie
                   std::cout << "--- --- --- "<< im->GetEntry(0x0004, 0x1500) << std::endl; // File name
-                  im = se->GetNextEntry();   
+                  im = se->GetNextImage();   
                }
-               se = st->GetNextEntry();   
+               se = st->GetNextSerie();   
            }
-            st = pa->GetNextEntry();
+            st = pa->GetNextStudy();
         }     
-        pa = e1->GetNextEntry();    
+        pa = e1->GetNextPatient();    
       }
       break;