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

diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx
index 4da27044..a855b871 100644
--- a/Testing/TestDicomDir.cxx
+++ b/Testing/TestDicomDir.cxx
@@ -1,189 +1,156 @@
-#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 <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"
-
-using namespace std;
-
-
-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;
-   ListTag::iterator deb , fin;
-   ListPatient::iterator  itPatient;
-   ListStudy::iterator itStudy;
-   ListSerie::iterator itSerie;
-   ListImage::iterator itImage;
-   TSKey v;
+   gdcm::DicomDir *e1;
+   
+   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) 
       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";
+    }
+
+   e1 = new gdcm::DicomDir(file);
+   if (argc > 2) {
+      int level = atoi(argv[2]);   
+      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);
    }
 
-// Exemples exploitation de la structure
-// PATIENT
-/*   cout << std::endl << std::endl  
-	     << " = Liste des PATIENT ==========================================" 
-	     << std::endl<< std::endl;	
+// 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;
 
 
-   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 ++;    
-   }    
+   }
+*/
 
-// STUDY
+/*        
    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 ++;    
-   }
-
-// SERIE
-   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 
-      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 
-         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
+   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;		
+         ++itStudy;
       }
       itPatient ++;    
-   }
- 
-// IMAGE
+   } 
+   
+    
+ /*
    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 ++;    
-   }*/
- 
-// DICOM DIR
-   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();
    
-    	
-/*   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);
-
-      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);		   		   	
-
-         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);	      
-
-            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 ++;    
-   }*/
-
+   std::cout<<std::flush;
    delete e1;
 
    return(0);