X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FReWrite.cxx;h=f72921ffb1c1b20cd9defac89b118c94b429c0fc;hb=9fbd2a1441b5584a66a9422f4db9ff4722c48fac;hp=677ebdad637754c45218c8002e674b88d3123f81;hpb=8fd45dc6d321d1419854dc0e4fa6a37d6826b655;p=gdcm.git diff --git a/Example/ReWrite.cxx b/Example/ReWrite.cxx index 677ebdad..f72921ff 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/05/23 14:18:04 $ - Version: $Revision: 1.26 $ + Date: $Date: 2007/08/29 15:58:19 $ + Version: $Revision: 1.31 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -32,7 +32,7 @@ int main(int argc, char *argv[]) " (usefull when the file header is not very straight). ", " ", " usage: ReWrite filein=inputFileName fileout=outputFileName ", - " [mode=write mode] [noshadow] [noseq][debug] ", + " [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,29 +40,32 @@ 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) ", + " 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)", " noseq : user doesn't want to load Sequences ", - " rgb : user wants to tranform LUT (if any) to RGB pixels ", - " warning : developper wants to run the program in 'warning mode'", + " rgb : user wants to transform LUT (if any) to RGB pixels ", + " warning : developper wants to run the program in 'warning mode'", " 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")) { am->ArgMgrUsage(usage); // Display 'usage' delete am; - return 0; + return 1; } char *fileName = am->ArgMgrWantString("filein",usage); if ( fileName == NULL ) { std::cout << "'filein= ...' is mandatory" << std::endl; delete am; - return 0; + return 1; } char *outputFileName = am->ArgMgrWantString("fileout",usage); @@ -70,7 +73,7 @@ int main(int argc, char *argv[]) { std::cout << "'fileout= ...' is mandatory" << std::endl; delete am; - return 0; + return 1; } const char *mode = am->ArgMgrGetString("mode","X"); @@ -88,6 +91,8 @@ int main(int argc, char *argv[]) bool rgb = ( 0 != am->ArgMgrDefined("RGB") ); + bool monochrome1 = ( 0 != am->ArgMgrDefined("monochrome1") ); + if (am->ArgMgrDefined("debug")) GDCM_NAME_SPACE::Debug::DebugOn(); @@ -145,30 +150,32 @@ 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(0x7fff); + f->SetLoadMode( loadMode ); + f->SetFileName( fileName ); bool res = f->Load(); - if ( !res ) + if ( !res ) { f->Delete(); - return 0; + return 1; } if (!f->IsReadable()) { std::cerr << "Sorry, not a Readable DICOM / ACR File" <Delete(); - return 0; + return 1; } - 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(); @@ -193,7 +200,9 @@ int main(int argc, char *argv[]) transferSyntaxName = f->GetTransferSyntaxName(); std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl; - + + if(monochrome1) + fh->SetPhotometricInterpretationToMonochrome1(); if (rgb) { @@ -268,6 +277,87 @@ 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) // --------------------------------------------------------------------- @@ -352,7 +442,7 @@ 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); @@ -371,74 +461,20 @@ 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') + fh->Write(outputFileName); f->Delete(); fh->Delete();