X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintDicomDir.cxx;h=f8abf2826c3804ef13384615a2f9b9076e39b810;hb=12ce4ae613d03ac7244f0a026c677e46792a8046;hp=cc8c9a7f869f594729b7db1d44b681a7edca2fbc;hpb=060ddb1e7fabdfc43c258dfd575df80e4023fd32;p=gdcm.git

diff --git a/Example/PrintDicomDir.cxx b/Example/PrintDicomDir.cxx
index cc8c9a7f..f8abf282 100644
--- a/Example/PrintDicomDir.cxx
+++ b/Example/PrintDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/20 11:09:21 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2005/06/08 08:09:07 $
+  Version:   $Revision: 1.23 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -25,11 +25,33 @@
 #include "gdcmTS.h"
 #include "gdcmDebug.h"
 
+#include "gdcmArgMgr.h"
+
 #include <fstream>
 #include <iostream>
 
 int main(int argc, char* argv[])
-{  
+{
+   START_USAGE(usage)
+   " \n PrintDicomDir :\n",
+   " Display the tree-like structure of a DICOMDIR File",
+   " usage: PrintDicomDir filein=fileName [level=n] [debug] ",
+   "        detail = 1 : Patients, 2 : Studies, 3 : Series, 4 : Images ",
+   "                 5 : Full Content ",
+   "        level = 0,1,2 : depending on user (what he wants to see)",
+   "        debug    : user wants to run the program in 'debug mode' ",
+   FINISH_USAGE
+
+   // Initialize Arguments Manager   
+   gdcm::ArgMgr *am= new gdcm::ArgMgr(argc, argv);
+  
+   if (argc == 1) 
+   {
+      am->ArgMgrUsage(usage); // Display 'usage'
+      delete am;
+      return 0;
+   }
+  
    gdcm::DicomDir *e1;
    gdcm::TSKey v;
 
@@ -38,26 +60,32 @@ int main(int argc, char* argv[])
    gdcm::DicomDirSerie *se;
    gdcm::DicomDirImage *im;
   
-   std::string fileName; 
-   if (argc > 1) 
-      fileName = argv[1];    
-   else 
-   {
-      fileName = GDCM_DATA_ROOT;
-      fileName += "/DICOMDIR";
-   }
+   char *fileName;
+   fileName  = am->ArgMgrWantString("filein",usage); 
+
+   int level  = am->ArgMgrGetInt("level", 2);
 
-   if (argc > 3)
-      gdcm::Debug::SetDebugOn();
+   int detailLevel = am->ArgMgrGetInt("detail", 2);
+
+   if (am->ArgMgrDefined("debug"))
+      gdcm::Debug::DebugOn();
+
+   /* if unused Param we give up */
+   if ( am->ArgMgrPrintUnusedLabels() )
+   { 
+      am->ArgMgrUsage(usage);
+      delete am;
+      return 0;
+   } 
+
+   // new style is useless, since it has no effect for *reading* a DICOMDIR
+   // (only meaningfull when *creating* a DICOMDIR)
 
    e1 = new gdcm::DicomDir( fileName );
 
-   e1->SetPrintLevel(2);
-   int detailLevel;
-   if (argc > 2)
-      detailLevel = atoi(argv[2]);   
-   else
-      detailLevel = 3;
+   //e1 = new gdcm::DicomDir();
+   //e1->SetParseDir(false);
+   //e1->Load(  fileName );
 
    // Test if the DicomDir is readable
    if( !e1->IsReadable() )
@@ -70,6 +98,8 @@ int main(int argc, char* argv[])
       return 1;
    }
 
+   e1->SetPrintLevel(level);
+
    // Test if the DicomDir contains any Patient
    pa = e1->GetFirstPatient();
    if ( pa  == 0)
@@ -94,7 +124,7 @@ int main(int argc, char* argv[])
       pa = e1->GetFirstPatient();
       while (pa) 
       {
-         std::cout << pa->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name   
+         std::cout << pa->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name   
          pa = e1->GetNextPatient();    
       }
       break;
@@ -107,11 +137,11 @@ int main(int argc, char* argv[])
       pa = e1->GetFirstPatient();
       while ( pa ) // on degouline les PATIENT de ce DICOMDIR
       {  
-         std::cout << pa->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name 
+         std::cout << pa->GetEntryValue(0x0010, 0x0010) << std::endl; // Patient's Name 
 
          st = pa->GetFirstStudy();
          while ( st ) { // on degouline les STUDY de ce patient
-            std::cout << "--- "<< st->GetEntry(0x0008, 0x1030) << std::endl; // Study Description
+            std::cout << "--- "<< st->GetEntryValue(0x0008, 0x1030) << std::endl; // Study Description
             st = pa->GetNextStudy();
          }
          pa = e1->GetNextPatient();    
@@ -127,21 +157,21 @@ int main(int argc, char* argv[])
       while ( pa )   // on degouline les PATIENT de ce DICOMDIR
       {
        // Patient's Name, Patient ID 
-         std::cout << "Pat.Name:[" << pa->GetEntry(0x0010, 0x0010) <<"]"; // Patient's Name
+         std::cout << "Pat.Name:[" << pa->GetEntryValue(0x0010, 0x0010) <<"]"; // Patient's Name
          std::cout << " Pat.ID:[";
-         std::cout << pa->GetEntry(0x0010, 0x0020) << "]" << std::endl; // Patient ID
+         std::cout << pa->GetEntryValue(0x0010, 0x0020) << "]" << std::endl; // Patient ID
 
          st = pa->GetFirstStudy();
          while ( st ) { // on degouline les STUDY de ce patient
-            std::cout << "--- Stud.descr:["    << st->GetEntry(0x0008, 0x1030) << "]";// Study Description 
-            std::cout << " Stud.ID:["          << st->GetEntry(0x0020, 0x0010);       // Study ID
+            std::cout << "--- Stud.descr:["    << st->GetEntryValue(0x0008, 0x1030) << "]";// Study Description 
+            std::cout << " Stud.ID:["          << st->GetEntryValue(0x0020, 0x0010);       // Study ID
             std::cout << "]" << std::endl;
 
             se = st->GetFirstSerie();
             while ( se ) { // on degouline les SERIES de cette study
-               std::cout << "--- --- Ser.Descr:["<< se->GetEntry(0x0008, 0x103e)<< "]";  // Series Description
-               std::cout << " Ser.nb:["         <<  se->GetEntry(0x0020, 0x0011);        // Series number
-               std::cout << "] Mod.:["          <<  se->GetEntry(0x0008, 0x0060) << "]"; // Modality
+               std::cout << "--- --- Ser.Descr:["<< se->GetEntryValue(0x0008, 0x103e)<< "]";  // Series Description
+               std::cout << " Ser.nb:["         <<  se->GetEntryValue(0x0020, 0x0011);        // Series number
+               std::cout << "] Mod.:["          <<  se->GetEntryValue(0x0008, 0x0060) << "]"; // Modality
                std::cout << std::endl;    
                se = st->GetNextSerie();   
             }
@@ -158,22 +188,27 @@ int main(int argc, char* argv[])
  
       pa = e1->GetFirstPatient(); 
       while ( pa ) {  // les PATIENT de ce DICOMDIR
-         std::cout << pa->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name
+       // Patient's Name, Patient ID 
+         std::cout << "Pat.Name:[" << pa->GetEntryValue(0x0010, 0x0010) <<"]"; // Patient's Name
+         std::cout << " Pat.ID:[";
+         std::cout << pa->GetEntryValue(0x0010, 0x0020) << "]" << std::endl; // Patient ID
 
          st = pa->GetFirstStudy();
          while ( st ) { // on degouline les STUDY de ce patient
-            std::cout << "--- "<< st->GetEntry(0x0008, 0x1030) << std::endl;    // Study Description
-            std::cout << " Stud.ID:["          << st->GetEntry(0x0020, 0x0010); // Study ID
+            std::cout << "--- Stud.descr:["    << st->GetEntryValue(0x0008, 0x1030) << "]";// Study Description 
+            std::cout << " Stud.ID:["          << st->GetEntryValue(0x0020, 0x0010);       // Study ID
+            std::cout << "]" << std::endl;
 
             se = st->GetFirstSerie();
             while ( se ) { // on degouline les SERIES de cette 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
+               std::cout << "--- --- Ser.Descr:["<< se->GetEntryValue(0x0008, 0x103e)<< "]";  // Series Description
+               std::cout << " Ser.nb:["         <<  se->GetEntryValue(0x0020, 0x0011);        // Series number
+               std::cout << "] Mod.:["          <<  se->GetEntryValue(0x0008, 0x0060) << "]"; // Modality
+               std::cout << std::endl;    
 
                im = se->GetFirstImage();
                while ( im ) { // on degouline les Images de cette serie
-                  std::cout << "--- --- --- "<< im->GetEntry(0x0004, 0x1500) << std::endl; // File name
+                  std::cout << "--- --- --- "<< im->GetEntryValue(0x0004, 0x1500) << std::endl; // File name
                   im = se->GetNextImage();   
                }
                se = st->GetNextSerie();   
@@ -208,16 +243,16 @@ int main(int argc, char* argv[])
  
    itPatient = e1->GetDicomDirPatients().begin();
    while ( itPatient != e1->GetDicomDirPatients().end() ) {  // on degouline les PATIENT de ce DICOMDIR
-      std::cout << (*itPatient)->GetEntry(0x0010, 0x0010) << std::endl; // Patient's Name
+      std::cout << (*itPatient)->GetEntryValue(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)->GetEntry(0x0008, 0x1030) << std::endl; // Study Description
+         std::cout << "--- "<< (*itStudy)->GetEntryValue(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)->GetEntry(0x0008, 0x103e) << std::endl; // Serie Description
+            std::cout << "--- --- "<< (*itSerie)->GetEntryValue(0x0008, 0x103e) << std::endl; // Serie Description
             itImage = ((*itSerie)->GetDicomDirImages()).begin();
             while (itImage != (*itSerie)->GetDicomDirImages().end() ) { // on degouline les IMAGES de cette serie
-               std::cout << "--- --- --- "<< (*itImage)->GetEntry(0x0004, 0x1500) << std::endl; // File name
+               std::cout << "--- --- --- "<< (*itImage)->GetEntryValue(0x0004, 0x1500) << std::endl; // File name
                ++itImage;   
             }
             ++itSerie;