X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Testing%2FTestDicomDir.cxx;h=e47753c9243ac9cc43f94b0a113c42f80054d156;hb=d7a36753bfb317ab76a8bef8dec6780abd472356;hp=db226de843f79dd1322825962e3428c7c7ddf3e9;hpb=4a07b1470f68d316f570fef1f07b9f9c77e90ee1;p=gdcm.git

diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx
index db226de8..e47753c9 100644
--- a/Testing/TestDicomDir.cxx
+++ b/Testing/TestDicomDir.cxx
@@ -22,10 +22,11 @@ int main(int argc, char* argv[])
 {  
    gdcmDicomDir *e1;
    ListTag::iterator deb , fin;
-   ListPatient::iterator  itPatient;
-   ListStudy::iterator itStudy;
-   ListSerie::iterator itSerie;
-   ListImage::iterator itImage;
+   
+   ListDicomDirPatient::iterator  itPatient;
+   ListDicomDirStudy::iterator    itStudy;
+   ListDicomDirSerie::iterator    itSerie;
+   ListDicomDirImage::iterator    itImage;
    TSKey v;
     
    std::string file; 
@@ -40,13 +41,101 @@ int main(int argc, char* argv[])
 	   e1->SetPrintLevel(level);
 	}
 
-   if(e1->GetPatients().begin() == e1->GetPatients().end() )
+   if(e1->GetDicomDirPatients().begin() == e1->GetDicomDirPatients().end() )
    {
       std::cout<<"Empty list"<<std::endl;
       return(1);
    }
 
-// DICOM DIR
+// 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;	
+
+
+   itPatient = e1->GetDicomDirPatients().begin();	
+   while ( itPatient != e1->GetDicomDirPatients().end() ) {  // on degouline la liste de PATIENT
+      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;	
+
+   itPatient = e1->GetDicomDirPatients().begin();	
+   while ( itPatient != e1->GetDicomDirPatients().end() ) {  // on degouline la liste de PATIENT
+      std::cout << (*itPatient)->GetEntryByNumber(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)->GetEntryByNumber(0x0008, 0x1030) << std::endl; // Study Description
+         ++itStudy;		
+      }
+      itPatient ++;    
+   }   
+ */
+ 
+   cout << std::endl << std::endl  
+	     << " = Liste des PATIENT/STUDY/SERIE ==========================================" 
+	     << std::endl<< std::endl;	
+ 
+   itPatient = e1->GetDicomDirPatients().begin();	
+   while ( itPatient != e1->GetDicomDirPatients().end() ) {  // on degouline la liste de PATIENT
+       // Patient's Name, Patient ID 
+      std::cout << "Pat.Name:[" << (*itPatient)->GetEntryByNumber(0x0010, 0x0010) <<"]";
+      std::cout << " Pat.ID:[";
+      std::cout << (*itPatient)->GetEntryByNumber(0x0010, 0x0020) << "]" << std::endl;
+      itStudy = ((*itPatient)->GetDicomDirStudies()).begin();	
+      while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) { // on degouline les STUDY de ce patient	
+         std::cout << "--- Stud.descr:["    << (*itStudy)->GetEntryByNumber(0x0008, 0x1030) << "]";// Study Description 
+         std::cout << " Stud.ID:["<< (*itStudy)->GetEntryByNumber(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)->GetEntryByNumber(0x0008, 0x103e)<< "]";// Serie Description
+            std::cout << " Ser.nb:[" <<   (*itSerie)->GetEntryByNumber(0x0020, 0x0011);            // Serie number
+            std::cout << "] Mod.:["    <<   (*itSerie)->GetEntryByNumber(0x0008, 0x0060) << "]";   // Modality
+	    std::cout << std::endl;	    
+            ++itSerie;   
+         }
+         ++itStudy;		
+      }
+      itPatient ++;    
+   } 
+   
+    
+ /*
+   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 la liste de PATIENT
+      std::cout << (*itPatient)->GetEntryByNumber(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)->GetEntryByNumber(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)->GetEntryByNumber(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)->GetEntryByNumber(0x0004, 0x1500) << std::endl; // File name
+               ++itImage;   
+            }
+            ++itSerie;   
+         }
+         ++itStudy;		
+      }  
+      itPatient ++;    
+   }   
+ */  
+
    cout << std::endl << std::endl  
         << " = Contenu Complet du DICOMDIR ==========================================" 
         << std::endl<< std::endl;