From e3b1014c07e783d2b54604b47bd0e6453656832b Mon Sep 17 00:00:00 2001
From: jpr <jpr>
Date: Fri, 6 Feb 2004 16:46:09 +0000
Subject: [PATCH] 2004-02-06 Jean-Pierre Roux      * ENH : - now
 gdcmDicomDir::CreateDicomDir() returns also the meta elements              -
 GDCM_META added to gdcmDicomDirType 	     - class gdcmMeta created      *
 ENH : - A brief summary is now displayed at the beginning of 'testDicomDir' 
      to help disaster magnitude estimation      * REM  : Now useless
 Test/explDICOMDIR.cxx

---
 ChangeLog                | 11 +++++++----
 Testing/TestDicomDir.cxx | 27 ++++++++++++++++-----------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e30d1a3d..8637425f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 2004-02-06 Jean-Pierre Roux
-     * ENH : now gdcmDicomDir::CreateDicomDir() returns also the meta elements
-             GDCM_META added to gdcmDicomDirType
-	     class gdcmMeta created
+     * ENH : - now gdcmDicomDir::CreateDicomDir() returns also the meta elements
+             - GDCM_META added to gdcmDicomDirType
+	     - class gdcmMeta created
+     * ENH : - A brief summary is now displayed at the beginning of 'testDicomDir'
+	     to help disaster magnitude estimation
+     * REM  : Now useless Test/explDICOMDIR.cxx
 
 2004-02-05 Benoit Regrain
      * ENH : add methods in gdcmObject to get the hash table or the list of
@@ -13,7 +16,7 @@
      * FIX : even length for some strings when writting the dicom dir
      * FIX : sort the images in the dicom dir
      * FIX : Bug fix for python use of dicom dir
-     * Add a python demo
+     * ADD : a python demo
 
 2004-02-04 Jean-Pierre Roux
      * FIX : Final solution (?) for icone embedded images
diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx
index 37f842f1..646d23ef 100644
--- a/Testing/TestDicomDir.cxx
+++ b/Testing/TestDicomDir.cxx
@@ -47,10 +47,9 @@ int main(int argc, char* argv[])
    }
 
 // Exemples exploitation de la structure
-
 // DON'T REMOVE neither the folowing code, nor the commented out lines
 
-
+/*
   cout << std::endl << std::endl  
 	     << " = Liste des PATIENT ==========================================" 
 	     << std::endl<< std::endl;	
@@ -61,9 +60,9 @@ int main(int argc, char* argv[])
       std::cout << (*itPatient)->GetEntryByNumber(0x0010, 0x0010) << std::endl; // Patient's Name   
       itPatient ++;    
    }
+*/
 
-/*   
-     
+/*        
    cout << std::endl << std::endl  
         << " = Liste des PATIENT/STUDY ==========================================" 
         << std::endl<< std::endl;	
@@ -77,8 +76,7 @@ int main(int argc, char* argv[])
          ++itStudy;		
       }
       itPatient ++;    
-   }
-   
+   }   
  */
  
    cout << std::endl << std::endl  
@@ -87,13 +85,21 @@ int main(int argc, char* argv[])
  
    itPatient = e1->GetPatients().begin();	
    while ( itPatient != e1->GetPatients().end() ) {  // on degouline la liste de PATIENT
-      std::cout << (*itPatient)->GetEntryByNumber(0x0010, 0x0010) << std::endl; // Patient's Name 
+       // Patient's Name, Patient ID 
+      std::cout << (*itPatient)->GetEntryByNumber(0x0010, 0x0010) ;
+      std::cout << " ID : ";
+      std::cout << (*itPatient)->GetEntryByNumber(0x0010, 0x0020) << std::endl;
       itStudy = ((*itPatient)->GetStudies()).begin();	
       while (itStudy != (*itPatient)->GetStudies().end() ) { // on degouline les STUDY de ce patient	
-         std::cout << "--- "<< (*itStudy)->GetEntryByNumber(0x0008, 0x1030) << std::endl; // Study Description 
+         std::cout << "--- "    << (*itStudy)->GetEntryByNumber(0x0008, 0x1030);              // Study Description 
+         std::cout << " Stud ID: ["<< (*itStudy)->GetEntryByNumber(0x0020, 0x0010);  // Study ID
+	 std::cout << "]" << std::endl;
          itSerie = ((*itStudy)->GetSeries()).begin();
          while (itSerie != (*itStudy)->GetSeries().end() ) { // on degouline les SERIES de cette study	   
-            std::cout << "--- ---  "<< (*itSerie)->GetEntryByNumber(0x0008, 0x103e) << std::endl; // Serie Description
+            std::cout << "--- ---  "<< (*itSerie)->GetEntryByNumber(0x0008, 0x103e);                  // Serie Description
+            std::cout << " Ser nb: [" <<   (*itSerie)->GetEntryByNumber(0x0020, 0x0011)             ; // Serie number
+            std::cout << "] Mod : "    <<   (*itSerie)->GetEntryByNumber(0x0008, 0x0060) << std::endl; // Modality
+	    
             ++itSerie;   
          }
          ++itStudy;		
@@ -126,8 +132,7 @@ int main(int argc, char* argv[])
          ++itStudy;		
       }  
       itPatient ++;    
-   }
-   
+   }   
  */  
 
    cout << std::endl << std::endl  
-- 
2.48.1