Unify user interface

[gdcm.git] / Example / ReWrite.cxx

diff --git a/Example/ReWrite.cxx b/Example/ReWrite.cxx
index 97f7d3f105922f031f09ee2594a0c1273b4082da..37d15073272714258874b4ce6f42d2fe27111ebc 100644 (file)
--- a/Example/ReWrite.cxx
+++ b/Example/ReWrite.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: ReWrite.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/07/07 17:31:53 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2005/07/21 04:55:50 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -29,10 +29,12 @@ int main(int argc, char *argv[])
    " \n ReWrite :\n",
    " Re write a full gdcm-readable Dicom image                              ",
    "     (usefull when the file header is not very straight).               ",
-   "",
+   "                                                                        ",
    " usage: ReWrite filein=inputFileName fileout=anonymizedFileName         ", 
    "       [mode=write mode] [noshadow] [noseq][debug]                      ", 
+   "                                                                        ",
    "        mode = a (ACR), x (Explicit VR Dicom), r (RAW : only pixels)    ",
+   "        noshadowseq: user doesn't want to load Private Sequences        ",
    "        noshadow : user doesn't want to load Private groups (odd number)",
    "        noseq    : user doesn't want to load Sequences                  ",
    "        rgb      : user wants to tranform LUT (if any) to RGB pixels    ",
@@ -42,7 +44,7 @@ int main(int argc, char *argv[])
    // ----- Initialize Arguments Manager ------   
    gdcm::ArgMgr *am = new gdcm::ArgMgr(argc, argv);
   
-   if (am->ArgMgrDefined("usage")) 
+   if (argc == 1 || am->ArgMgrDefined("usage")) 
    {
       am->ArgMgrUsage(usage); // Display 'usage'
       delete am;
@@ -51,6 +53,7 @@ int main(int argc, char *argv[])
    char *fileName = am->ArgMgrWantString("filein",usage);
    if ( fileName == NULL )
    {
+      std::cout << "'filein= ...' is mandatory" << std::endl;
       delete am;
       return 0;
    }
@@ -58,21 +61,23 @@ int main(int argc, char *argv[])
    char *outputFileName = am->ArgMgrWantString("fileout",usage);
    if ( outputFileName == NULL )
    {
+      std::cout << "'fileout= ...' is mandatory" << std::endl;
       delete am;
       return 0;
    }
 
    char *mode = am->ArgMgrGetString("mode",(char *)"X");
 
-   int loadMode;
-   if ( am->ArgMgrDefined("noshadow") && am->ArgMgrDefined("noseq") )
-       loadMode = NO_SEQ | NO_SHADOW;  
-   else if ( am->ArgMgrDefined("noshadow") )
-      loadMode = NO_SHADOW;
-   else if ( am->ArgMgrDefined("noseq") )
-      loadMode = NO_SEQ;
-   else
-      loadMode = 0;
+   int loadMode = 0x00000000;
+   if ( am->ArgMgrDefined("noshadowseq") )
+      loadMode |= NO_SHADOWSEQ;
+   else 
+   {
+   if ( am->ArgMgrDefined("noshadow") )
+         loadMode |= NO_SHADOW;
+      if ( am->ArgMgrDefined("noseq") )
+         loadMode |= NO_SEQ;
+   }
 
    bool rgb = ( 0 != am->ArgMgrDefined("RGB") );
 
@@ -149,9 +154,11 @@ int main(int argc, char *argv[])
              << std::endl;
 
    int numberOfScalarComponents=f->GetNumberOfScalarComponents();
-   std::cout << "NumberOfScalarComponents " << numberOfScalarComponents <<std::endl;
+   std::cout << "NumberOfScalarComponents " << numberOfScalarComponents 
+             <<std::endl;
    transferSyntaxName = f->GetTransferSyntaxName();
-   std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl;
+   std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" 
+             << std::endl;
 
    switch (mode[0])
    {
@@ -164,8 +171,8 @@ int main(int argc, char *argv[])
       fh->WriteAcr(outputFileName);
       break;
 
-   case 'D' : // Not documented in the 'usage', because the method is known to be bugged. 
-   case 'd' :
+   case 'D' : // Not documented in the 'usage', because the method 
+   case 'd' : //                             is known to be bugged. 
            // Writting a DICOM Implicit VR file
            // from a full gdcm readable File