Program: gdcm
Module: $RCSfile: ReWrite.cxx,v $
Language: C++
- Date: $Date: 2007/08/29 15:58:19 $
- Version: $Revision: 1.31 $
+ Date: $Date: 2008/05/16 10:40:23 $
+ Version: $Revision: 1.35 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
" Re write a full gdcm-readable Dicom image ",
" (usefull when the file header is not very straight). ",
" ",
- " usage: ReWrite filein=inputFileName fileout=outputFileName ",
- " [mode=write mode] [monochrome1] [noshadow] [noseq][debug] ",
+ " usage: ReWrite filein=inputFileName fileout=outputFileName ",
+ " [keepoverlays] [mode=write mode] [monochrome1] ",
+ " [noshadow] [noseq][debug] ",
" --> The following line to 'rubout' a burnt-in Patient name ",
" [rubout=xBegin,xEnd,yBegin,yEnd [ruboutvalue=n (<255)] ] ",
" --> The 2 following lines, to extract a sub image within some frames ",
" ",
" mode = a (ACR), x (Explicit VR Dicom), r (RAW : only pixels) ",
" j (jpeg lossless), 2 (jpeg2000) ",
+ " NOTE : JPEG encapsulated in a Dicom File, not JPEG File !",
+ " keepoverlays : user wants to keep ACR-NEMA-like overlays ",
" monochrome1 = user wants MONOCHROME1 photom. interp. (0=white) ",
" noshadowseq: user doesn't want to load Private Sequences ",
" noshadow : user doesn't want to load Private groups (odd number)",
loadMode |= GDCM_NAME_SPACE::LD_NOSEQ;
}
- bool rgb = ( 0 != am->ArgMgrDefined("RGB") );
-
- bool monochrome1 = ( 0 != am->ArgMgrDefined("monochrome1") );
+ bool rgb = ( 0 != am->ArgMgrDefined("RGB") );
+ bool keepoverlays = ( 0 != am->ArgMgrDefined("keepoverlays") );
+ bool monochrome1 = ( 0 != am->ArgMgrDefined("monochrome1") );
if (am->ArgMgrDefined("debug"))
GDCM_NAME_SPACE::Debug::DebugOn();
// ----------- End Arguments Manager ---------
GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
- f->SetMaxSizeLoadEntry(0x7fff);
-
+ f->SetMaxSizeLoadEntry(0x7fffffff);
f->SetLoadMode( loadMode );
-
f->SetFileName( fileName );
+
bool res = f->Load();
if ( !res )
{
transferSyntaxName = f->GetTransferSyntaxName();
std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]"
<< std::endl;
-
+
+ fh->SetKeepOverlays( keepoverlays );
+
if(monochrome1)
fh->SetPhotometricInterpretationToMonochrome1();
case 'R' :
case 'r' :
- // Writting a Raw File,
+ // Writting a Raw File,
std::cout << "WriteRaw" << std::endl;
fh->WriteRawData(outputFileName);
break;
case 'J' :
case 'j' :
- // writting a DICOM Jpeg Lossless
+ // writting a DICOM Jpeg Lossless
// from a full gdcm readable File
std::cout << "WriteDCM Jpeg Lossless" << std::endl;
fh->SetWriteTypeToJPEG();
break;
case '2' :
- // writting a DICOM Jpeg 2000
+ // writting a DICOM Jpeg 2000
// from a full gdcm readable File
std::cout << "WriteDCM Jpeg 2000" << std::endl;
fh->SetWriteTypeToJPEG2000();
- break;
-
+ break;
+
// Just for fun :
// Write a 'Video inverse' version of the file.
- // *Not* described, on purpose, in the USAGE
+ // *Not* described, on purpose, in the USAGE
case 'V' :
case 'v' :
if ( fh->GetFile()->GetBitsAllocated() == 8)
{
std::cout << "videoinv for 8 bits" << std::endl;
- for (int i=0; i<dataSize; i++)
+ for (int i=0; i<dataSize; i++)
{
((uint8_t*)imageData)[i] = 255 - ((uint8_t*)imageData)[i];
}
}
else
{
- std::cout << "videoinv for 16 bits" << std::endl;
- for (int i=0; i<dataSize/2; i++)
+ std::cout << "videoinv for 16 bits" << std::endl;
+ for (int i=0; i<dataSize/2; i++)
{
((uint16_t*)imageData)[i] = 65535 - ((uint16_t*)imageData)[i];
}
break;
}
-
//
// user wants to keep only a part of the image (ROI, and/or some frames)
// ---------------------------------------------------------------------
// (==> this is no longer really 'ReWrite' !)
int subImDimX = nX;
- int subImDimY = nY;
+ int subImDimY = nY;
if (roi)
- {
+ {
if (roiBoundVal[0]<0 || roiBoundVal[0]>=nX)
{
std::cout << "xBegin out of bounds; 'roi' ignored" << std::endl;
if (roiBoundVal[0] > roiBoundVal[1])
{
std::cout << "xBegin greater than xEnd; 'roi' ignored" << std::endl;
- fail = true;
+ fail = true;
}
if (roiBoundVal[2]<0 || roiBoundVal[2]>=nY)
- {
+ {
std::cout << "yBegin out of bounds; 'roi' ignored" << std::endl;
- fail = true;
+ fail = true;
}
if (roiBoundVal[3]<0 || roiBoundVal[3]>=nY)
- {
+ {
std::cout << "yEnd out of bounds; 'roi' ignored" << std::endl;
- fail = true;
+ fail = true;
}
if (roiBoundVal[2] > roiBoundVal[3])
- {
+ {
std::cout << "yBegin greater than yEnd; 'roi' ignored" << std::endl;
- fail = true;
- }
- }
+ fail = true;
+ }
+ }
else
- {
+ {
roiBoundVal = new int[4];
roiBoundVal[0] = 0;
roiBoundVal[1] = nX-1;
roiBoundVal[3] = nY-1;
}
- subImDimX = roiBoundVal[1]-roiBoundVal[0]+1;
- subImDimY = roiBoundVal[3]-roiBoundVal[2]+1;
-
+ subImDimX = roiBoundVal[1]-roiBoundVal[0]+1;
+ subImDimY = roiBoundVal[3]-roiBoundVal[2]+1;
+
if (roi || beg != -1 || end != -1)
- {
+ {
if (beg == -1)
beg = 0;
if (end == -1)
end = nZ-1;
-
+
std::ostringstream str;
-
+
// Set the data that will be *actually* written.
int pixelSize = fh->GetFile()->GetPixelSize();
size_t lgrSubLine = subImDimX* pixelSize * numberOfScalarComponents;
size_t lgrSubFrame = subImDimY*lgrSubLine;
- ;
+
int lgrSubImage = (end-beg+1) * lgrSubFrame;
-
+
uint8_t * subImage = new uint8_t[lgrSubImage];
-
+
uint8_t * srcCopy = (uint8_t *) imageData;
uint8_t * destCopy = subImage;
int lineSize = nX*pixelSize*numberOfScalarComponents;
- int frameSize = nY*lineSize;
+ int frameSize = nY*lineSize;
int lineOffset = roiBoundVal[0]*pixelSize * numberOfScalarComponents;
memcpy( (void *)(destCopy + frameCount*lgrSubFrame + lineCount*lgrSubLine),
(void *)(srcCopy + frameNb*frameSize + lineNb*lineSize + lineOffset ),
lgrSubLine);
- }
+ }
}
// Set the image size
//----------------------------------- Write, now! ---------------------------------
if (mode[0] != 'R' && mode[0] != 'r')
- fh->Write(outputFileName);
+ res = fh->Write(outputFileName);
+
+ if(!res)
+ std::cout <<"Fail to write [" << outputFileName << "]" <<std::endl;
f->Delete();
fh->Delete();
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff