X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestDicomDir.cxx;h=11f8aa6d5d4754c42a3445a6fda4c36c9cd7c804;hb=9a8932b74aab77d55d7b478b1996611c7d588daa;hp=16f0e63b29772bda8289732478ab09f87bd9df3d;hpb=d13926efb3131d364199ef4672b73ce73d21dbce;p=gdcm.git

diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx
index 16f0e63b..11f8aa6d 100644
--- a/Testing/TestDicomDir.cxx
+++ b/Testing/TestDicomDir.cxx
@@ -1,7 +1,7 @@
 #include <iostream>
 #include "gdcm.h"
 #include "gdcmHeaderEntry.h"
-#include "gdcmDICOMDIR.h"
+#include "gdcmDicomDir.h"
 
 #include <fstream>
 #ifdef GDCM_NO_ANSI_STRING_STREAM
@@ -10,147 +10,140 @@
 # else
 #  include <sstream>
 #endif
+#include <string>
+#include <iostream>
 
 #define  ostringstream ostrstream
 //extern "C"
 
 
-void aff (ListTag::iterator deb, ListTag::iterator fin);
-
-// ===============================================================================
-
-void aff (ListTag::iterator deb, ListTag::iterator fin, int nbFFFE) {
-   int count =0;
-   for (ListTag::iterator i= deb; i!= fin; i++) {  
-         if( (*i)->GetGroup() == 0xfffe) {
-	    count ++;
-	    if (count == nbFFFE) break;
-	 }
-   	(*i)->SetPrintLevel(0);
-	(*i)->Print();
-   } 
-}
-
-
-int main(int argc, char* argv[])
+int testDicomDir(int argc, char* argv[])
 {  
-   gdcmDICOMDIR* e1;
-   unsigned short int g, e;
-   int o;
+   gdcmDicomDir *e1;
+   ListTag::iterator deb , fin;
+   
+   ListDicomDirPatient::iterator  itPatient;
+   ListDicomDirStudy::iterator    itStudy;
+   ListDicomDirSerie::iterator    itSerie;
+   ListDicomDirImage::iterator    itImage;
    TSKey v;
     
-   string a; 
+   std::string file; 
    if (argc > 1) 
-      a = argv[1];    
-   else	
-      a = "DICOMDIR";
-      
- e1 = new gdcmDICOMDIR(a);
+      file = argv[1];    
+   else {
+      file += GDCM_DATA_ROOT;
+      file += "/DICOMDIR";
+    }
 
-  if(e1->GetPatients().begin() == e1->GetPatients().end() )
-        std::cout << "Liste Vide" << std::endl;
+   e1 = new gdcmDicomDir(file.c_str());
+   if (argc > 2) {
+      int level = atoi(argv[2]);   
+      e1->SetPrintLevel(level);
+   }
 
-// Exemples exploitation de la structure
+   if(e1->GetDicomDirPatients().begin() == e1->GetDicomDirPatients().end() )
+   {
+      std::cout<<"Empty list"<<std::endl;
+      return(1);
+   }
 
-ListTag::iterator deb , fin;
-lPatient::iterator  itPatient;
+// Simple examples of structure exploitation 
+// DON'T REMOVE neither the folowing code, nor the commented out lines
 
-   cout << std::endl << std::endl  
-	<< " = Liste des PATIENT ==========================================" 
-	<< std::endl<< std::endl;	
+/*
+  cout << std::endl << std::endl  
+	     << " = Liste des PATIENT ==========================================" 
+	     << std::endl<< std::endl;	
 
 
-    itPatient = e1->GetPatients().begin();	
-    while ( itPatient != e1->GetPatients().end() ) {  // on degouline la liste de PATIENT
-	//cout << " = PATIENT ==========================================" << std::endl;	
-        //deb = (*itPatient)->beginObj;	
-	//fin =  (*((*itPatient)->GetStudies()).begin())->beginObj;
-	//e1->SetPrintLevel(2);
-	//aff(deb,fin,1); 
-	std::cout << (*itPatient)->GetEntryByNumber(0x0010, 0x0010) << std::endl; // Patient's Name   
-	itPatient ++;    
-    }    
+   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;	
+        << 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 ++;    
+   }   
+ */
  
-    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 
-	lStudy::iterator itStudy = ((*itPatient)->GetStudies()).begin();	
-	while (itStudy != (*itPatient)->GetStudies().end() ) { // on degouline les STUDY de ce patient	
-	   std::cout << "--- "<< (*itStudy)->GetEntryByNumber(0x0008, 0x1030) << std::endl; // Stdy Description 
-		
-	   
-	   ++itStudy;		
-	}  
-	itPatient ++;    
-    }    
-
-   cout << std::endl << std::endl  
-	<< " = Liste des PATIENT/STUDY/SERIE ==========================================" 
-	<< std::endl<< std::endl;	
- 
-    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 
-	lStudy::iterator 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 
-	   lSerie::iterator 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 	   	
-	   ++itSerie;   
-	   }			   
-	   ++itStudy;		
-	}  
-	itPatient ++;    
-    }    
+   std::cout << std::endl << std::endl  
+	     << " = Liste des PATIENT/STUDY/SERIE ==========================================" 
+	     << std::endl<< std::endl;	
  
-   cout << std::endl << std::endl  
-	<< " = Contenu Complet du DICOMDIR ==========================================" 
-	<< 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 ++;    
+   } 
    
-    	
-    itPatient = e1->GetPatients().begin();	
-    while ( itPatient != e1->GetPatients().end() ) {  // on degouline la liste de PATIENT
-	cout << " = PATIENT ==========================================" << std::endl;	
-        deb = (*itPatient)->beginObj;	
-	fin =  (*((*itPatient)->GetStudies()).begin())->beginObj;
-	e1->SetPrintLevel(2);
-	aff(deb,fin,1);
-	
-	lStudy::iterator itStudy = ((*itPatient)->GetStudies()).begin();	
-	while (itStudy != (*itPatient)->GetStudies().end() ) { // on degouline les STUDY de ce patient	
-           std::cout << " ==== STUDY ==========================================" <<std::endl;		   
-           deb = (*itStudy)->beginObj;	
-	   fin = (*((*itStudy)->GetSeries()).begin())->beginObj;
-	   //e1->SetPrintLevel(2);
-	   aff(deb,fin,1);		   		   	
-	
-	   lSerie::iterator itSerie = ((*itStudy)->GetSeries()).begin();
-	   while (itSerie != (*itStudy)->GetSeries().end() ) { // on degouline les SERIES de cette study	   
-	      cout << " ======= SERIES ==========================================" << std::endl;	      
-              deb = (*itSerie)->beginObj;	
-	      fin = (*((*itSerie)->GetImages()).begin())->beginObj;
-	      //e1->SetPrintLevel(2);
-	      aff(deb,fin,1);	      
-	      		      
-	      lImage::iterator itImage = ((*itSerie)->GetImages()).begin();
-	      while (itImage != (*itSerie)->GetImages().end() ) {  // on degouline les IMAGE de cette serie 
-	      
-	         cout << " ========== IMAGE ==========================================" << std::endl;	
-		 std::cout << "--- --- --- File Name: "<< (*itImage)->GetEntryByNumber(0x0004, 0x1500) << std::endl; // Referenced File 
-	                  
-	      ++itImage;
-	      }	  	      	      
-	      ++itSerie;   
-	   }	
-	   ++itStudy;	
-	 }		     	   
-	itPatient ++;    
-    }
     
-    delete e1;
+ /*
+   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 ++;    
+   }   
+ */  
+
+   std::cout << std::endl << std::endl  
+        << " = Contenu Complet du DICOMDIR ==========================================" 
+        << std::endl<< std::endl;	
+   e1->Print();
+   
+   std::cout<<std::flush;
+   delete e1;
+
+   return(0);
 }