Program: gdcm
Module: $RCSfile: AnonymizeNoLoad.cxx,v $
Language: C++
- Date: $Date: 2005/07/12 14:55:43 $
- Version: $Revision: 1.4 $
+ 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
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}",
- " [ { [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",
- " 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-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=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 : user wants to run the program in 'debug mode' ",
FINISH_USAGE
// ----- Initialize Arguments Manager ------
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;
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;
}
- delete am; // ------ we don't need Arguments Manager any longer ------
+ 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;
+ }
+
+ 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;
// Telephone
f->AddAnonymizeElement(0x0010, 0x2154, "3615" );
+ for (int ri=0; ri<rubOutNb; ri++)
+ {
+ printf("%04x,%04x\n",elemsToRubOut[2*ri], elemsToRubOut[2*ri+1]);
+ f->AddAnonymizeElement((uint32_t)elemsToRubOut[2*ri],
+ (uint32_t)elemsToRubOut[2*ri+1],"*" );
+ }
+
// Aware use will add new fields here
//
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;
//
//
f->ClearAnonymizeList();
- delete f;
+ f->Delete();
return 0;
}
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;
}
//
//f->AddAnonymizeElement( 0x0020, 0x000d, "9.99.999.9999" );
// 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],
+ (uint32_t)elemsToRubOut[2*ri+1],"*" );
+ }
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();
f->ClearAnonymizeList();
- delete f;
- }
-
- }
+ f->Delete();
+ }
+ }
+ return 0;
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff