Modif to be RedHat 7.3 compliant (?!)

[gdcm.git] / Testing / TestDicomDir.cxx

diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx
index 5462c9ffe8533a938f552fc13897c6aacf42aee0..db226de843f79dd1322825962e3428c7c7ddf3e9 100644 (file)
--- a/Testing/TestDicomDir.cxx
+++ b/Testing/TestDicomDir.cxx
@@ -18,23 +18,6 @@
 
 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[])
 {  
    gdcmDicomDir *e1;
@@ -51,7 +34,7 @@ int main(int argc, char* argv[])
    else        
       file = "../gdcmData/DICOMDIR";
       
-   e1 = new gdcmDicomDir(file);
+   e1 = new gdcmDicomDir(file.c_str());
        if (argc > 2) {
           int level = atoi(argv[2]);   
           e1->SetPrintLevel(level);
@@ -63,127 +46,13 @@ int main(int argc, char* argv[])
       return(1);
    }
 
-// Exemples exploitation de la structure
-// PATIENT
-/*   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
-      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;      
-
-   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; // Stdy 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
-            ++itSerie;   
-         }
-         ++itStudy;            
-      }
-      itPatient ++;    
-   }
- 
-// IMAGE
-   cout << 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
-      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
-            itImage = ((*itSerie)->GetImages()).begin();
-            while (itImage != (*itSerie)->GetImages().end() ) { // on degouline les SERIES de cette study         
-               std::cout << "--- --- --- "<< (*itImage)->GetEntryByNumber(0x0004, 0x1500) << std::endl; // File name
-               ++itImage;   
-            }
-            ++itSerie;   
-         }
-         ++itStudy;            
-      }  
-      itPatient ++;    
-   }*/
- 
 // DICOM DIR
    cout << std::endl << std::endl  
         << " = Contenu Complet du DICOMDIR ==========================================" 
         << 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);