X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FBuildUpDicomDir.cxx;h=5259293bdde4a3ba3597967b2cfcc6a193e3e1fc;hb=eaf1ca262cccaac8f8560427a305f10cc6f9e517;hp=54493a15a01a791764d471a7fad2b1fdadf8d320;hpb=a12b9768f8dad74ef6b76c5c77b312ebab679625;p=gdcm.git

diff --git a/Example/BuildUpDicomDir.cxx b/Example/BuildUpDicomDir.cxx
index 54493a15..5259293b 100644
--- a/Example/BuildUpDicomDir.cxx
+++ b/Example/BuildUpDicomDir.cxx
@@ -42,17 +42,19 @@
   
 int main(int argc, char* argv[])
 {
-   if (argc) {
-      std::cerr << "Usage: " << argv[0] << " dummy ";
-   }
+   std::string dirName = "NewDICOMDIR";
 
-   gdcmDicomDir *dcmdir;
-   std::string dirName;  
-
-   printf( "BuildUpDicomDir: entering  BuildUpDicomDir\n");
+   if ( argc > 2 )
+      {
+      std::cerr << "Usage: " << argv[0] << " [dicomdirname] ";
+      dirName = argv[1];
+      }
 
+   gdcmDicomDir *dcmdir;
    dcmdir=new gdcmDicomDir();
-   printf( "BuildUpDicomDir: exiting new DicomDir\n");
+
+   printf( "\n------- BuildUpDicomDir: Test Print Meta only -----\n");
+   ((gdcmDocument *)dcmdir)->Print();
 
    gdcmDicomDirPatient *p1=dcmdir->NewPatient();
    p1->SetEntryByNumber("patientONE",0x0010, 0x0010);
@@ -67,26 +69,26 @@ int main(int argc, char* argv[])
    (void)s2111; //not used
 
    gdcmDicomDirStudy *s11=p1->NewStudy();  
-       s11->SetEntryByNumber("StudyDescrOne.One",0x0008, 0x1030);
-       // Name of the physician reading study
-       // Header Entry to be created
-       s11->SetEntryByNumber("Dr Mabuse",0x0008, 0x1060);
+   s11->SetEntryByNumber("StudyDescrOne.One",0x0008, 0x1030);
+   // Name of the physician reading study
+   // Header Entry to be created
+   s11->SetEntryByNumber("Dr Mabuse",0x0008, 0x1060);
 
-   gdcmDicomDirPatient *p3=dcmdir->NewPatient();
+   gdcmDicomDirPatient *p3 = dcmdir->NewPatient();
    p3->SetEntryByNumber("patientTHREE",0x0010, 0x0010);
 
-   printf( "\n------- BuildUpDicomDir: Test Print of Patient ONE -----\n");
+   std::cout << "\n------- BuildUpDicomDir: Test Print of Patient ONE -----\n";
    p1->Print();
-   printf( "\n------- BuildUpDicomDir: Test Print of Patient THREE -----\n");
+   std::cout << "\n------- BuildUpDicomDir: Test Print of Patient THREE -----\n";
    p3->Print();
-   printf( "\n------- BuildUpDicomDir: Test Print of Patient TWO -------\n");
+   std::cout << "\n------- BuildUpDicomDir: Test Print of Patient TWO -------\n";
    p2->Print();
-   printf( "\n------- BuildUpDicomDir: Test Full Print-------------------\n");  
+   std::cout << "\n------- BuildUpDicomDir: Test Full Print-------------------\n";
    dcmdir->SetPrintLevel(-1);
    dcmdir->Print();
 
-   dcmdir->Write("NewDICOMDIR");
-   std::cout<<std::flush;
+   dcmdir->WriteDicomDir( dirName );
+   std::cout << std::endl;
 
    delete dcmdir;