X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FAnonymizeNoLoad.cxx;h=25321a7ac268161357341f329f496e9102957b90;hb=1b20e56c29494e7d1bef31d3ade5de833347c228;hp=4f3cfcdbaed29d4d4625671321c6e075ac353f27;hpb=6cd1838c9b1c4c6b99a5a32893fbd2107626fe57;p=gdcm.git

diff --git a/Example/AnonymizeNoLoad.cxx b/Example/AnonymizeNoLoad.cxx
index 4f3cfcdb..25321a7a 100644
--- a/Example/AnonymizeNoLoad.cxx
+++ b/Example/AnonymizeNoLoad.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: AnonymizeNoLoad.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/07/20 14:48:15 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/11/02 10:11:29 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,18 +28,18 @@
 int main(int argc, char *argv[])
 {
    START_USAGE(usage)
-   "\n AnonymizeNoLoad :\n",
+   "\n AnonymizeNoLoad :\n                                                    ",
    "Anonymize a gdcm-readable Dicom image even if pixels aren't gdcm readable ",
    "         Warning : Warning : the image is overwritten                     ",
    "                   to preserve image integrity, use a copy.               ",
    "usage: AnonymizeNoLoad {filein=inputFileName|dirin=inputDirectoryName}    ",
-   "                       [rubout=listOfPrivateElementsToRubOut]             ", 
+   "                       [rubout=listOfElementsToRubOut]                    ",
    "                       [ { [noshadowseq] | [noshadow][noseq] } ] [debug]  ",
    "       inputFileName : Name of the (single) file user wants to anonymize  ",
    "       inputDirectoryName : user wants to anonymize *all* the files       ",
    "                            within the (single Patient!) directory        ",
-   "       listOfPrivateElementsToRubOut : group,elem (in hexa) of private    ",
-   "                           Elements to rub out                            ",
+   "       listOfElementsToRubOut : group-elem,g2-e2,... (in hexa, no space)  ",
+   "                                of extra Elements to rub out              ",
    "       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                   ",
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
   
    gdcm::ArgMgr *am = new gdcm::ArgMgr(argc, argv);
   
-   if (am->ArgMgrDefined("usage")) 
+   if (am->ArgMgrDefined("usage") || argc == 1) 
    {
       am->ArgMgrUsage(usage); // Display 'usage'
       delete am;
@@ -65,56 +65,61 @@ int main(int argc, char *argv[])
 
    if ( (fileName == 0 && dirName == 0)
         ||
-      (fileName != 0 && dirName != 0) )
+        (fileName != 0 && dirName != 0) )
    {
        std::cout <<std::endl
-                 << "Either 'filein' or 'dirin' must be present;" << std::endl
-                 << "Not both" << std::endl;
+                 << "Either 'filein=' or 'dirin=' must be present;" 
+                 << std::endl << "Not both" << std::endl;
+       am->ArgMgrUsage(usage); // Display 'usage'  
        delete am;
        return 0;
  }
  
-   int loadMode = 0x00000000;
+   int loadMode = gdcm::LD_ALL;
    if ( am->ArgMgrDefined("noshadowseq") )
-      loadMode |= NO_SHADOWSEQ;
+      loadMode |= gdcm::LD_NOSHADOWSEQ;
    else 
    {
-   if ( am->ArgMgrDefined("noshadow") )
-         loadMode |= NO_SHADOW;
+      if ( am->ArgMgrDefined("noshadow") )
+         loadMode |= gdcm::LD_NOSHADOW;
       if ( am->ArgMgrDefined("noseq") )
-         loadMode |= NO_SEQ;
+         loadMode |= gdcm::LD_NOSEQ;
    }
 
    int rubOutNb;
    uint16_t *elemsToRubOut = am->ArgMgrGetXInt16Enum("rubout", &rubOutNb);
+
+   /* if unused Param we give up */
+   if ( am->ArgMgrPrintUnusedLabels() )
+   {
+      am->ArgMgrUsage(usage);
+      delete am;
+      return 0;
+   } 
  
-   std::cout << " ---------------------------- rubOutNb " << rubOutNb
-             << std::endl;
    delete am;  // ------ we don't need Arguments Manager any longer ------
 
-
+   gdcm::File *f;
    if ( fileName != 0 ) // ====== Deal with a single file ======
    {
 
    // 
    //   Parse the input file.
    // 
-      gdcm::File *f;
-      f = new gdcm::File( );
+      f = gdcm::File::New( );
       f->SetLoadMode(loadMode);
       f->SetFileName( fileName );
-      bool res = f->Load();
 
       // gdcm::File::IsReadable() is no usable here, because we deal with
       // any kind of gdcm::Readable *document*
       // not only gdcm::File (as opposed to gdcm::DicomDir)
-      if ( !res ) 
+      if ( !f->Load() ) 
       {
           std::cout <<std::endl
               << "Sorry, " << fileName <<"  not a gdcm-readable "
               << "DICOM / ACR Document"
               << std::endl;
-           delete f;
+           f->Delete();
            return 1;
       }
       std::cout << fileName << " is readable " << std::endl;
@@ -165,9 +170,8 @@ int main(int argc, char *argv[])
 
       f->AnonymizeNoLoad();
 
-      // No need to write the File : modif were done on disc !
-      // File was overwritten ...
-
+      // No need to write the file : modif were done on disc !
+      //  ( The Dicom file is overwritten )
       std::cout <<"End AnonymizeNoLoad" << std::endl;
 
       // 
@@ -175,7 +179,7 @@ int main(int argc, char *argv[])
       //   
       f->ClearAnonymizeList();
  
-      delete f;
+      f->Delete();
       return 0;
 
    }
@@ -188,16 +192,13 @@ int main(int argc, char *argv[])
                                  it != fileList.end();
                                  ++it )
       {
-
-         gdcm::File *f;
-         f = new gdcm::File( );
+         f = gdcm::File::New( );
          f->SetLoadMode(loadMode);
          f->SetFileName( it->c_str() );
-         bool res = f->Load();
 
-         if ( !res )
+         if ( !f->Load() )
          {
-            delete f; 
+            f->Delete();
             continue;
          }
          // 
@@ -222,6 +223,8 @@ int main(int argc, char *argv[])
          // Telephone
          f->AddAnonymizeElement(0x0010, 0x2154, "3615" );
 
+         // deal with user defined Elements set
+
          for (int ri=0; ri<rubOutNb; ri++)
          {
             f->AddAnonymizeElement((uint32_t)elemsToRubOut[2*ri], 
@@ -230,6 +233,7 @@ int main(int argc, char *argv[])
          std::cout <<"Let's AnonymizeNoLoad " << it->c_str() << std::endl;
 
          // The gdcm::File remains untouched in memory
+         // The Dicom file is overwritten on disc
 
          f->AnonymizeNoLoad();
 
@@ -239,10 +243,9 @@ int main(int argc, char *argv[])
 
          f->ClearAnonymizeList();
     
-         delete f;         
-        }
-
-     }
+         f->Delete();
+      }
+   }
    return 0;
 }