X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FAnonymize.cxx;h=908726dc6498eb04a3779a4590e6ad5c93e0b2a6;hb=d37154e4495e1e1c18c44f6cae6ef2ff8a2891cf;hp=639856430c963ff5e4a65b2f7358b25f7f40c873;hpb=61f7dc4d582d5de456fc07ea25700df7c2f6320e;p=gdcm.git

diff --git a/Example/Anonymize.cxx b/Example/Anonymize.cxx
index 63985643..908726dc 100644
--- a/Example/Anonymize.cxx
+++ b/Example/Anonymize.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: Anonymize.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/07 09:53:53 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2007/06/15 13:18:50 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,19 +24,24 @@
 
 #include <iostream>
 
+
+/// \todo : AnonymizeDirectory
+///         That should split the images : Patient/Study/Serie
+///         and keeps coherent the StudyInstanceUID, SeriesInstanceUID
+///         (Now, a new one is generated fore each image :-( )
 int main(int argc, char *argv[])
 {
    START_USAGE(usage)
    " \n Anonymize :\n                                                         ",
    " Anonymize a full gdcm-readable Dicom image                               ",
    "          Warning : probably segfaults if pixels are not gdcm readable.   ",
-   "                    Use exAnonymizeNoLoad instead.                        ",
+   "                    Use AnonymizeNoLoad instead.                          ",
    " usage: Anonymize filein=inputFileName fileout=anonymizedFileName[debug]  ",
    "        debug    : user wants to run the program in 'debug mode'          ",
    FINISH_USAGE
 
    // ----- Initialize Arguments Manager ------   
-   gdcm::ArgMgr *am = new gdcm::ArgMgr(argc, argv);
+   GDCM_NAME_SPACE::ArgMgr *am = new GDCM_NAME_SPACE::ArgMgr(argc, argv);
   
    if (argc == 1 || am->ArgMgrDefined("usage")) 
    {
@@ -58,7 +63,7 @@ int main(int argc, char *argv[])
       return 0;
    }
    if (am->ArgMgrDefined("debug"))
-      gdcm::Debug::DebugOn();
+      GDCM_NAME_SPACE::Debug::DebugOn();
  
    // if unused Param we give up
    if ( am->ArgMgrPrintUnusedLabels() )
@@ -74,10 +79,10 @@ int main(int argc, char *argv[])
    //   Read the input file.
    // ============================================================
 
-   gdcm::File *f;
+   GDCM_NAME_SPACE::File *f;
 
-   f = gdcm::File::New(  );
-   f->SetLoadMode( gdcm::LD_ALL );
+   f = GDCM_NAME_SPACE::File::New(  );
+   f->SetLoadMode( GDCM_NAME_SPACE::LD_ALL );
    f->SetFileName( fileName );
    int res = f->Load();
 
@@ -95,7 +100,7 @@ int main(int argc, char *argv[])
    // ============================================================
 
    // We need a gdcm::FileHelper, since we want to load the pixels        
-   gdcm::FileHelper *fh = gdcm::FileHelper::New(f);
+   GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f);
 
    // unit8_t DOESN'T mean it's mandatory for the image to be a 8 bits one !
    // Feel free to cast if you know it's not. 
@@ -105,7 +110,7 @@ int main(int argc, char *argv[])
    if ( imageData == 0 )
    {
        std::cerr << "Sorry, Pixels of" << fileName <<"  are not "
-           << " gdcm-readable."       << std::endl
+                 << " gdcm-readable."       << std::endl
                  << "Use exAnonymizeNoLoad" << std::endl;
        f->Delete();
        fh->Delete();
@@ -118,7 +123,7 @@ int main(int argc, char *argv[])
    // Institution name 
    f->AddAnonymizeElement(0x0008, 0x0080, "Xanadoo"); 
    // Patient's name 
-   f->AddAnonymizeElement(0x0010, 0x0010, "Fantomas");   
+   f->AddAnonymizeElement(0x0010, 0x0010, "Fantomas^X");   
    // Patient's ID
    f->AddAnonymizeElement( 0x0010, 0x0020,"1515" );   
    // Study Instance UID
@@ -136,10 +141,12 @@ int main(int argc, char *argv[])
    //   Write a new file
    // ============================================================
    
-   // Since we just Anonymized the file, we know no modification 
+   // Since we just Anonymized the file, we know that no modification 
    // was performed on the pixels.
-   // We don't want this image appears as a 'Secondary Captured image'
-   fh->SetKeepMediaStorageSOPClassUID(true);
+   // The written image will not appear as a 'Secondary Captured image'
+   // nor as a DERIVED one  
+
+   fh->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE);
    
    fh->WriteDcmExplVR(outputFileName);
    std::cout <<"End Anonymize" << std::cout;