Program: gdcm
Module: $RCSfile: ReWrite.cxx,v $
Language: C++
- Date: $Date: 2005/06/09 21:32:14 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2005/07/21 04:55:50 $
+ Version: $Revision: 1.9 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
{
START_USAGE(usage)
" \n ReWrite :\n",
- " Re write a full gdcm-readable Dicom image",
- " (usefull when the file header is not very straight).",
- " ",
- " usage: ReWrite filein=inputFileName fileout=anonymizedFileName ",
- " [mode=write mode] [noshadow] [noseq][debug] ",
- " mode = a (ACR), x (Explicit VR Dicom), r (RAW : only pixels)",
+ " Re write a full gdcm-readable Dicom image ",
+ " (usefull when the file header is not very straight). ",
+ " ",
+ " usage: ReWrite filein=inputFileName fileout=anonymizedFileName ",
+ " [mode=write mode] [noshadow] [noseq][debug] ",
+ " ",
+ " mode = a (ACR), x (Explicit VR Dicom), r (RAW : only pixels) ",
+ " 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' ",
+ " noseq : user doesn't want to load Sequences ",
+ " rgb : user wants to tranform LUT (if any) to RGB pixels ",
+ " 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 (argc == 1 || am->ArgMgrDefined("usage"))
{
am->ArgMgrUsage(usage); // Display 'usage'
delete am;
char *fileName = am->ArgMgrWantString("filein",usage);
if ( fileName == NULL )
{
+ std::cout << "'filein= ...' is mandatory" << std::endl;
delete am;
return 0;
}
char *outputFileName = am->ArgMgrWantString("fileout",usage);
if ( outputFileName == NULL )
{
+ std::cout << "'fileout= ...' is mandatory" << std::endl;
delete am;
return 0;
}
- char *mode = am->ArgMgrGetString("filein","X");
+ char *mode = am->ArgMgrGetString("mode",(char *)"X");
- int loadMode;
- if ( am->ArgMgrDefined("noshadow") && am->ArgMgrDefined("noseq") )
- loadMode = NO_SEQ | NO_SHADOW;
- else if ( am->ArgMgrDefined("noshadow") )
- loadMode = NO_SHADOW;
- else if ( am->ArgMgrDefined("noseq") )
- loadMode = NO_SEQ;
- else
- loadMode = 0;
+ int loadMode = 0x00000000;
+ if ( am->ArgMgrDefined("noshadowseq") )
+ loadMode |= NO_SHADOWSEQ;
+ else
+ {
+ if ( am->ArgMgrDefined("noshadow") )
+ loadMode |= NO_SHADOW;
+ if ( am->ArgMgrDefined("noseq") )
+ loadMode |= NO_SEQ;
+ }
+
+ bool rgb = ( 0 != am->ArgMgrDefined("RGB") );
if (am->ArgMgrDefined("debug"))
gdcm::Debug::DebugOn();
- // if unused Param we give up
+ // if unused Params we give up
if ( am->ArgMgrPrintUnusedLabels() )
{
am->ArgMgrUsage(usage);
delete am; // we don't need Argument Manager any longer
- int dataSize;
-
- gdcm::File *e1 = new gdcm::File();
- e1->SetLoadMode(loadMode);
+ // ----------- End Arguments Manager ---------
- bool res = e1->Load( fileName );
+ gdcm::File *f = new gdcm::File();
+ f->SetLoadMode( loadMode );
+ f->SetFileName( fileName );
+ bool res = f->Load();
if ( !res )
{
- delete e1;
- delete am;
+ delete f;
return 0;
}
- if (!e1->IsReadable())
+
+ if (!f->IsReadable())
{
std::cerr << "Sorry, not a Readable DICOM / ACR File" <<std::endl;
- delete e1;
- delete am;
+ delete f;
return 0;
}
- gdcm::FileHelper *f1 = new gdcm::FileHelper(e1);
-
-// ---
+ gdcm::FileHelper *fh = new gdcm::FileHelper(f);
+ void *imageData;
+ int dataSize;
+
+ if (rgb)
+ {
+ dataSize = fh->GetImageDataSize();
+ imageData = fh->GetImageData(); // somewhat important... can't remember
+ fh->SetWriteModeToRGB();
+ }
+ else
+ {
+ dataSize = fh->GetImageDataRawSize();
+ imageData = fh->GetImageDataRaw();// somewhat important... can't remember
+ fh->SetWriteModeToRaw();
+ }
- dataSize = f1->GetImageDataSize();
+ if ( imageData == 0 ) // to avoid warning
+ {
+ std::cout << "Was unable to read pixels " << std::endl;
+ }
std::cout <<std::endl <<" dataSize " << dataSize << std::endl;
int nX,nY,nZ,sPP,planarConfig;
std::string pixelType, transferSyntaxName;
- nX=e1->GetXSize();
- nY=e1->GetYSize();
- nZ=e1->GetZSize();
+ nX=f->GetXSize();
+ nY=f->GetYSize();
+ nZ=f->GetZSize();
std::cout << " DIMX=" << nX << " DIMY=" << nY << " DIMZ=" << nZ << std::endl;
- pixelType = e1->GetPixelType();
- sPP = e1->GetSamplesPerPixel();
- planarConfig = e1->GetPlanarConfiguration();
+ pixelType = f->GetPixelType();
+ sPP = f->GetSamplesPerPixel();
+ planarConfig = f->GetPlanarConfiguration();
std::cout << " pixelType=" << pixelType
<< " SampleserPixel=" << sPP
<< " PlanarConfiguration=" << planarConfig
<< " PhotometricInterpretation="
- << e1->GetEntryValue(0x0028,0x0004)
+ << f->GetEntryValue(0x0028,0x0004)
<< std::endl;
- int numberOfScalarComponents=e1->GetNumberOfScalarComponents();
- std::cout << "NumberOfScalarComponents " << numberOfScalarComponents <<std::endl;
- transferSyntaxName = e1->GetTransferSyntaxName();
- std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl;
-
- f1->GetImageData(); // somewhat important... can't remember
+ int numberOfScalarComponents=f->GetNumberOfScalarComponents();
+ std::cout << "NumberOfScalarComponents " << numberOfScalarComponents
+ <<std::endl;
+ transferSyntaxName = f->GetTransferSyntaxName();
+ std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]"
+ << std::endl;
switch (mode[0])
{
case 'A' :
+ case 'a' :
// Writting an ACR file
// from a full gdcm readable File
std::cout << "WriteACR" << std::endl;
- f1->WriteAcr(outputFileName);
+ fh->WriteAcr(outputFileName);
break;
- case 'D' : // Not documented in the 'usage', because the method is known to be bugged.
-
+ case 'D' : // Not documented in the 'usage', because the method
+ case 'd' : // is known to be bugged.
// Writting a DICOM Implicit VR file
// from a full gdcm readable File
std::cout << "WriteDCM Implicit VR" << std::endl;
- f1->WriteDcmImplVR(outputFileName);
+ fh->WriteDcmImplVR(outputFileName);
break;
case 'X' :
+ case 'x' :
// writting a DICOM Explicit VR
// from a full gdcm readable File
std::cout << "WriteDCM Explicit VR" << std::endl;
- f1->WriteDcmExplVR(outputFileName);
+ fh->WriteDcmExplVR(outputFileName);
break;
case 'R' :
+ case 'r' :
// Writting a Raw File,
std::cout << "WriteRaw" << std::endl;
- f1->WriteRawData(outputFileName);
+ fh->WriteRawData(outputFileName);
break;
}
- delete e1;
- delete f1;
- delete am;
+ delete f;
+ delete fh;
return 0;
}