X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestDicomDir.cxx;h=d0ab6c0e25dd375e40dc1de81b54e312673b5932;hb=018ae9242a852cb91debaf71951d00876fc3d876;hp=646d23ef5a37b2ad78ab569a2c41a14282e024b4;hpb=e3b1014c07e783d2b54604b47bd0e6453656832b;p=gdcm.git

diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx
index 646d23ef..d0ab6c0e 100644
--- a/Testing/TestDicomDir.cxx
+++ b/Testing/TestDicomDir.cxx
@@ -1,62 +1,51 @@
 #include <iostream>
 #include "gdcm.h"
-#include "gdcmHeaderEntry.h"
+#include "gdcmDocEntry.h"
 #include "gdcmDicomDir.h"
 
 #include <fstream>
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
-#include <string>
-#include <iostream>
-
-#define  ostringstream ostrstream
-//extern "C"
-
-using namespace std;
 
-int main(int argc, char* argv[])
+int TestDicomDir(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; 
    if (argc > 1) 
       file = argv[1];    
-   else	
-      file = "../gdcmData/DICOMDIR";
-      
-   e1 = new gdcmDicomDir(file.c_str());
-	if (argc > 2) {
-	   int level = atoi(argv[2]);   
-	   e1->SetPrintLevel(level);
-	}
+   else {
+      file += GDCM_DATA_ROOT;
+      file += "/DICOMDIR";
+    }
 
-   if(e1->GetPatients().begin() == e1->GetPatients().end() )
+   e1 = new gdcmDicomDir(file);
+   if (argc > 2) {
+      int level = atoi(argv[2]);   
+      e1->SetPrintLevel(level);
+   }
+
+   if(e1->GetDicomDirPatients().begin() == e1->GetDicomDirPatients().end() )
    {
       std::cout<<"Empty list"<<std::endl;
       return(1);
    }
 
-// Exemples exploitation de la structure
-// DON'T REMOVE neither the folowing code, nor the commented out lines
+// Simple examples of structure exploitation 
+// DON'T REMOVE neither the following code, nor the commented out lines
 
 /*
   cout << std::endl << std::endl  
-	     << " = Liste des PATIENT ==========================================" 
-	     << 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
+   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 ++;    
    }
@@ -65,44 +54,44 @@ int main(int argc, char* argv[])
 /*        
    cout << std::endl << std::endl  
         << " = Liste des PATIENT/STUDY ==========================================" 
-        << std::endl<< std::endl;	
+        << std::endl<< std::endl;
 
-   itPatient = e1->GetPatients().begin();	
-   while ( itPatient != e1->GetPatients().end() ) {  // on degouline la liste de PATIENT
+   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)->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;		
+      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;	
+   std::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
+   itPatient = e1->GetDicomDirPatients().begin();
+   while ( itPatient != e1->GetDicomDirPatients().end() ) {  // on degouline la liste de PATIENT
        // 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);              // 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);                  // Serie Description
-            std::cout << " Ser nb: [" <<   (*itSerie)->GetEntryByNumber(0x0020, 0x0011)             ; // Serie number
-            std::cout << "] Mod : "    <<   (*itSerie)->GetEntryByNumber(0x0008, 0x0060) << std::endl; // Modality
-	    
+      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;		
+         ++itStudy;
       }
       itPatient ++;    
    } 
@@ -110,34 +99,34 @@ int main(int argc, char* argv[])
     
  /*
    cout << std::endl << std::endl  
-	     << " = Liste des PATIENT/STUDY/SERIE/IMAGE ===================================" 
-	     << std::endl<< std::endl;
+        << " = Liste des PATIENT/STUDY/SERIE/IMAGE ===================================" 
+        << std::endl<< std::endl;
  
-   itPatient = e1->GetPatients().begin();	
-   while ( itPatient != e1->GetPatients().end() ) {  // on degouline la liste de PATIENT
+   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)->GetStudies()).begin();	
-      while (itStudy != (*itPatient)->GetStudies().end() ) { // on degouline les STUDY de ce patient	
+      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)->GetSeries()).begin();
-         while (itSerie != (*itStudy)->GetSeries().end() ) { // on degouline les SERIES de cette study	   
+         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)->GetImages()).begin();
-            while (itImage != (*itSerie)->GetImages().end() ) { // on degouline les SERIES de cette study	   
+            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;		
+         ++itStudy;
       }  
       itPatient ++;    
    }   
  */  
 
-   cout << std::endl << std::endl  
+   std::cout << std::endl << std::endl  
         << " = Contenu Complet du DICOMDIR ==========================================" 
-        << std::endl<< std::endl;	
+        << std::endl<< std::endl;
    e1->Print();
    
    std::cout<<std::flush;