X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FAnonymizeNoLoad.cxx;h=dc7eadc9aea8e294e038fab4fbffbecc6c170845;hb=d0f6827609a499057f4bad725522060590af3d82;hp=238f68c1b898ffe67a70d105dd22f13ecb1cd1b9;hpb=c227f2b6e0b17c14620f47a8110d17b44188288b;p=gdcm.git diff --git a/Example/AnonymizeNoLoad.cxx b/Example/AnonymizeNoLoad.cxx index 238f68c1..dc7eadc9 100644 --- a/Example/AnonymizeNoLoad.cxx +++ b/Example/AnonymizeNoLoad.cxx @@ -1,10 +1,10 @@ -*========================================================================= +/*========================================================================= Program: gdcm Module: $RCSfile: AnonymizeNoLoad.cxx,v $ Language: C++ - Date: $Date: 2005/07/20 13:39:00 $ - Version: $Revision: 1.6 $ + Date: $Date: 2007/06/06 13:03:57 $ + Version: $Revision: 1.21 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -28,29 +28,29 @@ int main(int argc, char *argv[]) { START_USAGE(usage) - "\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] ", - " [ { [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 ", - " 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 ", - " debug : user wants to run the program in 'debug mode' ", + "\n AnonymizeNoLoad :\n ", + "Anonymize a gdcm-parsable Dicom image even if pixels aren't gdcm readable ", + " Warning : the image is OVERWRITTEN ", + " to preserve image integrity, use a copy. ", + "usage: AnonymizeNoLoad {filein=inputFileName|dirin=inputDirectoryName} ", + " [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 ", + " 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 ", + " debug : developper 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 (am->ArgMgrDefined("usage")) + if (am->ArgMgrDefined("usage") || argc == 1) { am->ArgMgrUsage(usage); // Display 'usage' delete am; @@ -58,63 +58,68 @@ int main(int argc, char *argv[]) } if (am->ArgMgrDefined("debug")) - gdcm::Debug::DebugOn(); + GDCM_NAME_SPACE::Debug::DebugOn(); - char *fileName = am->ArgMgrGetString("filein",(char *)0); - char *dirName = am->ArgMgrGetString("dirin",(char *)0); + const char *fileName = am->ArgMgrGetString("filein"); + const char *dirName = am->ArgMgrGetString("dirin"); if ( (fileName == 0 && dirName == 0) || - (fileName != 0 && dirName != 0) ) + (fileName != 0 && dirName != 0) ) { std::cout <ArgMgrDefined("noshadowseq") ) - loadMode |= NO_SHADOWSEQ; + loadMode |= GDCM_NAME_SPACE::LD_NOSHADOWSEQ; else { - if ( am->ArgMgrDefined("noshadow") ) - loadMode |= NO_SHADOW; + if ( am->ArgMgrDefined("noshadow") ) + loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) - loadMode |= NO_SEQ; + loadMode |= GDCM_NAME_SPACE::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_NAME_SPACE::File *f; if ( fileName != 0 ) // ====== Deal with a single file ====== { // // Parse the input file. // - gdcm::File *f; - f = new gdcm::File( ); + f = GDCM_NAME_SPACE::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 ) + // GDCM_NAME_SPACE::File::IsReadable() is no usable here, because we deal with + // any kind of GDCM_NAME_SPACE::Readable *document* + // not only GDCM_NAME_SPACE::File (as opposed to GDCM_NAME_SPACE::DicomDir) + if ( !f->Load() ) { std::cout <Delete(); return 1; } std::cout << fileName << " is readable " << std::endl; @@ -124,23 +129,22 @@ int main(int argc, char *argv[]) // File will be overwritten // - // // Choose the fields to anonymize. // // Institution name - f->AddAnonymizeElement( 0x0008, 0x0080, "Xanadoo" ); + f->AddAnonymizeElement( 0x0008, 0x0080, "gdcm-Xanadoo Hospital" ); // Patient's name - f->AddAnonymizeElement( 0x0010, 0x0010, "g^Fantomas" ); + f->AddAnonymizeElement( 0x0010, 0x0010, "gdcm^Fantomas" ); // Patient's ID f->AddAnonymizeElement( 0x0010, 0x0020,"1515" ); // Patient's Birthdate - f->AddAnonymizeElement( 0x0010, 0x0030,"11.11.1111" ); + f->AddAnonymizeElement( 0x0010, 0x0030,"11111111" ); // Patient's Adress - f->AddAnonymizeElement( 0x0010, 0x1040,"Sing-sing" ); + f->AddAnonymizeElement( 0x0010, 0x1040,"gdcm at Sing-sing.org" ); // Patient's Mother's Birth Name - f->AddAnonymizeElement( 0x0010, 0x1060,"g^Vampirella" ); + f->AddAnonymizeElement( 0x0010, 0x1060,"gdcm^Vampirella" ); // Study Instance UID f->AddAnonymizeElement( 0x0020, 0x000d, "9.99.999.9999" ); // Telephone @@ -161,13 +165,12 @@ int main(int argc, char *argv[]) std::cout <<"Let's AnonymizeNoLoad " << std::endl; - // The gdcm::File remains untouched in memory + // The GDCM_NAME_SPACE::File remains untouched in memory 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,29 +178,26 @@ int main(int argc, char *argv[]) // f->ClearAnonymizeList(); - delete f; + f->Delete(); return 0; } else // ====== Deal with a (single Patient) Directory ====== { std::cout << "dirName [" << dirName << "]" << std::endl; - gdcm::DirList dirList(dirName,1); // gets recursively the file list - gdcm::DirListType fileList = dirList.GetFilenames(); - for( gdcm::DirListType::iterator it = fileList.begin(); + GDCM_NAME_SPACE::DirList dirList(dirName,1); // gets recursively the file list + GDCM_NAME_SPACE::DirListType fileList = dirList.GetFilenames(); + for( GDCM_NAME_SPACE::DirListType::iterator it = fileList.begin(); it != fileList.end(); ++it ) { - - gdcm::File *f; - f = new gdcm::File( ); + f = GDCM_NAME_SPACE::File::New( ); f->SetLoadMode(loadMode); f->SetFileName( it->c_str() ); - bool res = f->Load(); - if ( !res ) + if ( !f->Load() ) { - delete f; + f->Delete(); continue; } // @@ -205,23 +205,25 @@ int main(int argc, char *argv[]) // // Institution name - f->AddAnonymizeElement( 0x0008, 0x0080, "Xanadoo" ); + f->AddAnonymizeElement( 0x0008, 0x0080, "gdcm-Xanadoo Hospital" ); // Patient's name - f->AddAnonymizeElement( 0x0010, 0x0010, "g^Fantomas" ); + f->AddAnonymizeElement( 0x0010, 0x0010, "gdcm^Fantomas" ); // Patient's ID f->AddAnonymizeElement( 0x0010, 0x0020,"1515" ); // Patient's Birthdate - f->AddAnonymizeElement( 0x0010, 0x0030,"11.11.1111" ); + f->AddAnonymizeElement( 0x0010, 0x0030,"11111111" ); // Patient's Adress - f->AddAnonymizeElement( 0x0010, 0x1040,"Sing-sing" ); + f->AddAnonymizeElement( 0x0010, 0x1040,"gdcm at Sing-sing.org" ); // Patient's Mother's Birth Name - f->AddAnonymizeElement( 0x0010, 0x1060,"g^Vampirella" ); + f->AddAnonymizeElement( 0x0010, 0x1060,"gdcm^Vampirella" ); // Study Instance UID // we may not brutaly overwrite it //f->AddAnonymizeElement( 0x0020, 0x000d, "9.99.999.9999" ); // Telephone f->AddAnonymizeElement(0x0010, 0x2154, "3615" ); + // deal with user defined Elements set + for (int ri=0; riAddAnonymizeElement((uint32_t)elemsToRubOut[2*ri], @@ -229,7 +231,8 @@ int main(int argc, char *argv[]) } std::cout <<"Let's AnonymizeNoLoad " << it->c_str() << std::endl; - // The gdcm::File remains untouched in memory + // The GDCM_NAME_SPACE::File remains untouched in memory + // The Dicom file is overwritten on disc f->AnonymizeNoLoad(); @@ -239,10 +242,9 @@ int main(int argc, char *argv[]) f->ClearAnonymizeList(); - delete f; - } - - } + f->Delete(); + } + } return 0; }