X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FReWrite.cxx;h=ae4530c16c8f7f5b849cf2dcd294f4885447d6d1;hb=d0f6827609a499057f4bad725522060590af3d82;hp=65b5c8504e02d79378530477399c7ac4459726c5;hpb=8b37460973bc9cafbc230ef9806cc73ae2e202ac;p=gdcm.git diff --git a/Example/ReWrite.cxx b/Example/ReWrite.cxx index 65b5c850..ae4530c1 100644 --- a/Example/ReWrite.cxx +++ b/Example/ReWrite.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: ReWrite.cxx,v $ Language: C++ - Date: $Date: 2007/07/25 13:15:14 $ - Version: $Revision: 1.28 $ + 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 @@ -31,8 +31,9 @@ int main(int argc, char *argv[]) " 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 ", @@ -40,6 +41,9 @@ int main(int argc, char *argv[]) " [firstframe=beg] [lastframe=end] ", " ", " 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)", @@ -49,7 +53,8 @@ int main(int argc, char *argv[]) " debug : developper wants to run the program in 'debug mode' ", FINISH_USAGE - // ----- Initialize Arguments Manager ------ + // ----- Initialize Arguments Manager ------ + GDCM_NAME_SPACE::ArgMgr *am = new GDCM_NAME_SPACE::ArgMgr(argc, argv); if (argc == 1 || am->ArgMgrDefined("usage")) @@ -87,9 +92,9 @@ int main(int argc, char *argv[]) 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(); @@ -148,11 +153,12 @@ int main(int argc, char *argv[]) delete am; // we don't need Argument Manager any longer // ----------- End Arguments Manager --------- - GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New(); + + f->SetMaxSizeLoadEntry(0x7fffffff); f->SetLoadMode( loadMode ); - f->SetFileName( fileName ); + bool res = f->Load(); if ( !res ) { @@ -168,10 +174,10 @@ int main(int argc, char *argv[]) } GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f); - void *imageData; + uint8_t *imageData; int dataSize; - int nX,nY,nZ,sPP,planarConfig; + int nX,nY,nZ,sPP,planarConfig; std::string pixelType, transferSyntaxName; nX=f->GetXSize(); nY=f->GetYSize(); @@ -196,7 +202,9 @@ int main(int argc, char *argv[]) transferSyntaxName = f->GetTransferSyntaxName(); std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl; - + + fh->SetKeepOverlays( keepoverlays ); + if(monochrome1) fh->SetPhotometricInterpretationToMonochrome1(); @@ -273,16 +281,96 @@ int main(int argc, char *argv[]) } } + +//------------------------------ Set the Writing mode --------------------------------- + + switch (mode[0]) + { + case 'A' : + case 'a' : + // Writting an ACR file + // from a full gdcm readable File + std::cout << "WriteACR" << std::endl; + fh->SetWriteTypeToAcr(); + break; + + 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; + fh->SetWriteTypeToDcmImplVR(); + break; + + case 'X' : + case 'x' : + // writting a DICOM Explicit VR + // from a full gdcm readable File + std::cout << "WriteDCM Explicit VR" << std::endl; + // fh->WriteDcmExplVR(outputFileName); + // Try this one : + fh->SetWriteTypeToDcmExplVR(); + + break; + + case 'R' : + case 'r' : + // Writting a Raw File, + std::cout << "WriteRaw" << std::endl; + fh->WriteRawData(outputFileName); + break; + + case 'J' : + case 'j' : + // 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 + // from a full gdcm readable File + std::cout << "WriteDCM Jpeg 2000" << std::endl; + fh->SetWriteTypeToJPEG2000(); + break; + + // Just for fun : + // Write a 'Video inverse' version of the file. + // *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; iSetWriteTypeToDcmExplVR(); + 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; @@ -296,27 +384,27 @@ int main(int argc, char *argv[]) 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; @@ -324,32 +412,32 @@ int main(int argc, char *argv[]) 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; @@ -357,11 +445,11 @@ int main(int argc, char *argv[]) { for (int lineNb=roiBoundVal[2], lineCount=0; lineNb<=roiBoundVal[3]; lineNb++, lineCount++) { - /// \todo increment data pointer, don't multiply so much! + /// \todo : increment data pointer, don't multiply so much! memcpy( (void *)(destCopy + frameCount*lgrSubFrame + lineCount*lgrSubLine), (void *)(srcCopy + frameNb*frameSize + lineNb*lineSize + lineOffset ), lgrSubLine); - } + } } // Set the image size @@ -376,74 +464,23 @@ int main(int argc, char *argv[]) str << end-beg+1; fh->InsertEntryString(str.str(),0x0028,0x0008, "IS"); // Number of Frames - fh->SetImageData(subImage,lgrSubImage); - - } + //fh->SetImageData(subImage,lgrSubImage); + fh->SetUserData(subImage,lgrSubImage); // ensures the compression (if any) + } + else + { + fh->SetUserData(imageData,dataSize); // ensures the compression (if any) + } -//----------------------------------- Write, now! --------------------------------- - switch (mode[0]) - { - case 'A' : - case 'a' : - // Writting an ACR file - // from a full gdcm readable File - std::cout << "WriteACR" << std::endl; - fh->WriteAcr(outputFileName); - break; - - 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; - 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; - // fh->WriteDcmExplVR(outputFileName); - // Try this one : - fh->SetWriteTypeToDcmExplVR(); - fh->Write(outputFileName); - break; +//----------------------------------- Write, now! --------------------------------- - case 'R' : - case 'r' : - // Writting a Raw File, - std::cout << "WriteRaw" << std::endl; - fh->WriteRawData(outputFileName); - break; - - // Just for fun : - // Write a 'Video inverse' version of the file. - // *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; iWriteDcmExplVR(outputFileName); - break; - } + if (mode[0] != 'R' && mode[0] != 'r') + res = fh->Write(outputFileName); + + if(!res) + std::cout <<"Fail to write [" << outputFileName << "]" <Delete(); fh->Delete();