X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FAnonymizeNoLoad.cxx;h=dc7eadc9aea8e294e038fab4fbffbecc6c170845;hb=7e3167602a9c730d1c515527b0fc47fa2168e47d;hp=5e66ae8203208ccc6f0de3e135f64592a9e92aeb;hpb=ed8f0888f5c1f2bfb64d5759a5dc9590858b31f2;p=gdcm.git diff --git a/Example/AnonymizeNoLoad.cxx b/Example/AnonymizeNoLoad.cxx index 5e66ae82..dc7eadc9 100644 --- a/Example/AnonymizeNoLoad.cxx +++ b/Example/AnonymizeNoLoad.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: AnonymizeNoLoad.cxx,v $ Language: C++ - Date: $Date: 2006/07/17 13:25:00 $ - Version: $Revision: 1.18 $ + 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 @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) START_USAGE(usage) "\n AnonymizeNoLoad :\n ", "Anonymize a gdcm-parsable Dicom image even if pixels aren't gdcm readable ", - " Warning : the image is OVERWRITTEN ", + " Warning : the image is OVERWRITTEN ", " to preserve image integrity, use a copy. ", "usage: AnonymizeNoLoad {filein=inputFileName|dirin=inputDirectoryName} ", " [rubout=listOfElementsToRubOut] ", @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) // ----- 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") || argc == 1) { @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) } if (am->ArgMgrDefined("debug")) - gdcm::Debug::DebugOn(); + GDCM_NAME_SPACE::Debug::DebugOn(); const char *fileName = am->ArgMgrGetString("filein"); const char *dirName = am->ArgMgrGetString("dirin"); @@ -75,15 +75,15 @@ int main(int argc, char *argv[]) return 0; } - int loadMode = gdcm::LD_ALL; + int loadMode = GDCM_NAME_SPACE::LD_ALL; if ( am->ArgMgrDefined("noshadowseq") ) - loadMode |= gdcm::LD_NOSHADOWSEQ; + loadMode |= GDCM_NAME_SPACE::LD_NOSHADOWSEQ; else { if ( am->ArgMgrDefined("noshadow") ) - loadMode |= gdcm::LD_NOSHADOW; + loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) - loadMode |= gdcm::LD_NOSEQ; + loadMode |= GDCM_NAME_SPACE::LD_NOSEQ; } int rubOutNb; @@ -99,20 +99,20 @@ int main(int argc, char *argv[]) delete am; // ------ we don't need Arguments Manager any longer ------ - gdcm::File *f; + GDCM_NAME_SPACE::File *f; if ( fileName != 0 ) // ====== Deal with a single file ====== { // // Parse the input file. // - f = gdcm::File::New( ); + f = GDCM_NAME_SPACE::File::New( ); f->SetLoadMode(loadMode); f->SetFileName( fileName ); - // 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) + // 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 <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,"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 @@ -166,7 +165,7 @@ 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(); @@ -186,13 +185,13 @@ int main(int argc, char *argv[]) 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 ) { - f = gdcm::File::New( ); + f = GDCM_NAME_SPACE::File::New( ); f->SetLoadMode(loadMode); f->SetFileName( it->c_str() ); @@ -206,17 +205,17 @@ 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,"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" ); @@ -232,7 +231,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 GDCM_NAME_SPACE::File remains untouched in memory // The Dicom file is overwritten on disc f->AnonymizeNoLoad();