X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestDicomDir.cxx;h=a855b871da90c0b5cc27e1a494f3e795e2c491a7;hb=ba78e6c6d47d6db1528e8e88e5ebde7296a26692;hp=aa4c176d7a086723b80d0cee9752d67f6ea9f70b;hpb=16eead9d9f2128578afe6c524987e45e49bc3138;p=gdcm.git

diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx
index aa4c176d..a855b871 100644
--- a/Testing/TestDicomDir.cxx
+++ b/Testing/TestDicomDir.cxx
@@ -1,20 +1,40 @@
-#include <iostream>
-#include "gdcm.h"
-#include "gdcmHeaderEntry.h"
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: TestDicomDir.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/12/03 20:16:56 $
+  Version:   $Revision: 1.22 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+#include "gdcmDocEntry.h"
 #include "gdcmDicomDir.h"
+#include "gdcmDicomDirPatient.h"
+#include "gdcmDicomDirStudy.h"
+#include "gdcmDicomDirSerie.h"
+#include "gdcmDicomDirImage.h"
+#include "gdcmTS.h"
 
+#include <iostream>
 #include <fstream>
 
 int TestDicomDir(int argc, char* argv[])
 {  
-   gdcmDicomDir *e1;
-   ListTag::iterator deb , fin;
+   gdcm::DicomDir *e1;
    
-   ListDicomDirPatient::iterator  itPatient;
-   ListDicomDirStudy::iterator    itStudy;
-   ListDicomDirSerie::iterator    itSerie;
-   ListDicomDirImage::iterator    itImage;
-   TSKey v;
+   gdcm::ListDicomDirPatient::const_iterator  itPatient;
+   gdcm::ListDicomDirStudy::const_iterator    itStudy;
+   gdcm::ListDicomDirSerie::const_iterator    itSerie;
+   gdcm::ListDicomDirImage::const_iterator    itImage;
+   gdcm::TSKey v;
     
    std::string file; 
    if (argc > 1) 
@@ -24,7 +44,7 @@ int TestDicomDir(int argc, char* argv[])
       file += "/DICOMDIR";
     }
 
-   e1 = new gdcmDicomDir(file.c_str());
+   e1 = new gdcm::DicomDir(file);
    if (argc > 2) {
       int level = atoi(argv[2]);   
       e1->SetPrintLevel(level);
@@ -37,15 +57,15 @@ int TestDicomDir(int argc, char* argv[])
    }
 
 // Simple examples of structure exploitation 
-// DON'T REMOVE neither the folowing code, nor the commented out lines
+// 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->GetDicomDirPatients().begin();	
+   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 ++;    
@@ -55,44 +75,44 @@ int TestDicomDir(int argc, char* argv[])
 /*        
    cout << std::endl << std::endl  
         << " = Liste des PATIENT/STUDY ==========================================" 
-        << std::endl<< std::endl;	
+        << std::endl<< std::endl;
 
-   itPatient = e1->GetDicomDirPatients().begin();	
+   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	
+      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;		
+         ++itStudy;
       }
       itPatient ++;    
    }   
  */
  
    std::cout << std::endl << std::endl  
-	     << " = Liste des PATIENT/STUDY/SERIE ==========================================" 
-	     << std::endl<< std::endl;	
+             << " = Liste des PATIENT/STUDY/SERIE ==========================================" 
+             << std::endl<< std::endl;
  
-   itPatient = e1->GetDicomDirPatients().begin();	
+   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	
+      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;
+   std::cout << "]" << std::endl;
          itSerie = ((*itStudy)->GetDicomDirSeries()).begin();
-         while (itSerie != (*itStudy)->GetDicomDirSeries().end() ) { // on degouline les SERIES de cette study	   
+         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;	    
+            std::cout << std::endl;
             ++itSerie;   
          }
-         ++itStudy;		
+         ++itStudy;
       }
       itPatient ++;    
    } 
@@ -100,26 +120,26 @@ int TestDicomDir(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->GetDicomDirPatients().begin();	
+   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	
+      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	   
+         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	   
+            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 ++;    
    }   
@@ -127,7 +147,7 @@ int TestDicomDir(int argc, char* argv[])
 
    std::cout << std::endl << std::endl  
         << " = Contenu Complet du DICOMDIR ==========================================" 
-        << std::endl<< std::endl;	
+        << std::endl<< std::endl;
    e1->Print();
    
    std::cout<<std::flush;