X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FReWrite.cxx;h=6e01d868167dd343502e2ecb6d445a702c948f83;hb=0ee1d8c4c2c59be9b1ff698b219835a76ac86f2a;hp=b43bfcd8d61132efd3a51bcc3185fcfd33e5ada9;hpb=3ecbd58ec54f901f661d8513b910fb7356290c7b;p=gdcm.git diff --git a/Example/ReWrite.cxx b/Example/ReWrite.cxx index b43bfcd8..6e01d868 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/04 10:43:19 $ - Version: $Revision: 1.27 $ + Date: $Date: 2007/08/24 10:48:08 $ + Version: $Revision: 1.30 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -40,6 +40,7 @@ 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)", @@ -49,21 +50,22 @@ 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")) { 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); @@ -71,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"); @@ -157,21 +159,21 @@ int main(int argc, char *argv[]) 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(); @@ -273,6 +275,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) // --------------------------------------------------------------------- @@ -357,7 +440,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); @@ -376,74 +459,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();