X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Testing%2FTestDicomDir.cxx;h=abcf31faf5869f42bebd88c7665f2b7fb2dec368;hb=c094e185dd6404df031524ccae8e1b51e3b84871;hp=11f8aa6d5d4754c42a3445a6fda4c36c9cd7c804;hpb=8f68ff1b50850c4b4890d15af2218e3ef12da4e2;p=gdcm.git

diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx
index 11f8aa6d..abcf31fa 100644
--- a/Testing/TestDicomDir.cxx
+++ b/Testing/TestDicomDir.cxx
@@ -1,149 +1,127 @@
-#include <iostream>
-#include "gdcm.h"
-#include "gdcmHeaderEntry.h"
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: TestDicomDir.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/01/20 11:09:22 $
+  Version:   $Revision: 1.31 $
+                                                                                
+  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 <fstream>
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
-#include <string>
 #include <iostream>
+#include <fstream>
 
-#define  ostringstream ostrstream
-//extern "C"
-
-
-int testDicomDir(int argc, char* argv[])
+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::DicomDirPatient *pa;
+   gdcm::DicomDirStudy *st;
+   gdcm::DicomDirSerie *se;
+   gdcm::DicomDirImage *im;
+
+   gdcm::TSKey v;
     
    std::string file; 
    if (argc > 1) 
       file = argv[1];    
-   else {
+   else 
+   {
       file += GDCM_DATA_ROOT;
       file += "/DICOMDIR";
-    }
+   }
 
-   e1 = new gdcmDicomDir(file.c_str());
-   if (argc > 2) {
+   e1 = new gdcm::DicomDir(file);
+   if (argc > 2) 
+   {
       int level = atoi(argv[2]);   
       e1->SetPrintLevel(level);
    }
 
-   if(e1->GetDicomDirPatients().begin() == e1->GetDicomDirPatients().end() )
+   // Test if the DicomDir is readable
+   if( !e1->IsReadable() )
+   {
+      std::cout<<"          DicomDir '"<<file
+               <<"' is not readable"<<std::endl
+               <<"          ...Failed"<<std::endl;
+
+      delete e1;
+      return 1;
+   }
+   else
    {
-      std::cout<<"Empty list"<<std::endl;
-      return(1);
+      std::cout<<"          DicomDir '"<<file
+               <<"' is readable"<<std::endl;
    }
 
-// Simple examples of structure exploitation 
-// DON'T REMOVE neither the folowing code, nor the commented out lines
+   // Test if the DicomDir contains any Patient
+   if( !e1->GetFirstPatient() )
+   {
+      std::cout<<"          DicomDir '"<<file
+               <<" has no patient"<<std::endl
+               <<"          ...Failed"<<std::endl;
 
-/*
-  cout << std::endl << std::endl  
-	     << " = Liste des PATIENT ==========================================" 
-	     << std::endl<< std::endl;	
+      delete e1;
+      return 1;
+   }
 
+   // step by step structure full exploitation
+   std::cout << std::endl << std::endl  
+             << " = PATIENT/STUDY/SERIE/IMAGE List ============================" 
+             << std::endl<< std::endl;
+  
+   pa = e1->GetFirstPatient(); 
+   while ( pa ) 
+   {  // we process all the PATIENT of this DICOMDIR 
+      std::cout << pa->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name
 
-   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 ++;    
-   }
-*/
+      st = pa->GetFirstStudy();
+      while ( st ) 
+      { // we process all the STUDY of this patient
+         std::cout << "--- "<< st->GetEntry(0x0008, 0x1030) << std::endl;    // Study Description
+         std::cout << " Stud.ID:["          << st->GetEntry(0x0020, 0x0010); // Study ID
 
-/*        
-   cout << std::endl << std::endl  
-        << " = Liste des PATIENT/STUDY ==========================================" 
-        << std::endl<< std::endl;	
+         se = st->GetFirstSerie();
+         while ( se ) 
+         { // we process all the SERIES of this study
+            std::cout << "--- --- "<< se->GetEntry(0x0008, 0x103e) << std::endl;      // Serie Description
+            std::cout << " Ser.nb:["         <<  se->GetEntry(0x0020, 0x0011);        // Series number
+            std::cout << "] Mod.:["          <<  se->GetEntry(0x0008, 0x0060) << "]"; // Modality
 
-   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 ++;    
-   }   
- */
- 
-   std::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;   
+            im = se->GetFirstImage();
+            while ( im ) { // we process all the IMAGE of this serie
+               std::cout << "--- --- --- "<< im->GetEntry(0x0004, 0x1500) << std::endl; // File name
+               im = se->GetNextImage();   
             }
-            ++itSerie;   
+            se = st->GetNextSerie();   
          }
-         ++itStudy;		
+         st = pa->GetNextStudy();
       }  
-      itPatient ++;    
-   }   
- */  
+      pa = e1->GetNextPatient();
+   }  
 
    std::cout << std::endl << std::endl  
-        << " = Contenu Complet du DICOMDIR ==========================================" 
-        << std::endl<< std::endl;	
+             << " = DICOMDIR full content ====================================" 
+             << std::endl<< std::endl;
    e1->Print();
    
    std::cout<<std::flush;
    delete e1;
 
-   return(0);
+   return 0;
 }