X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FReWrite.cxx;h=9cdab8e3fafdbe770b8ca490bdb3a57c189c40be;hb=f8be63ebb26fa8fc3381c4ac129138fabf229412;hp=8060da83b45b1fc4bd6747b830eabcbb678f905c;hpb=ca9208bab6a8d415f4984f724439d211ebfac82d;p=gdcm.git diff --git a/Example/ReWrite.cxx b/Example/ReWrite.cxx index 8060da83..9cdab8e3 100644 --- a/Example/ReWrite.cxx +++ b/Example/ReWrite.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: ReWrite.cxx,v $ Language: C++ - Date: $Date: 2005/06/10 08:00:20 $ - Version: $Revision: 1.3 $ + Date: $Date: 2005/11/07 09:53:53 $ + Version: $Revision: 1.16 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,21 +27,24 @@ int main(int argc, char *argv[]) { 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; @@ -50,6 +53,7 @@ int main(int argc, char *argv[]) char *fileName = am->ArgMgrWantString("filein",usage); if ( fileName == NULL ) { + std::cout << "'filein= ...' is mandatory" << std::endl; delete am; return 0; } @@ -57,26 +61,30 @@ int main(int argc, char *argv[]) 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",(char *)"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 = gdcm::LD_ALL; + if ( am->ArgMgrDefined("noshadowseq") ) + loadMode |= gdcm::LD_NOSHADOWSEQ; + else + { + if ( am->ArgMgrDefined("noshadow") ) + loadMode |= gdcm::LD_NOSHADOW; + if ( am->ArgMgrDefined("noseq") ) + loadMode |= gdcm::LD_NOSEQ; + } + + 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); @@ -86,94 +94,141 @@ int main(int argc, char *argv[]) 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 = gdcm::File::New(); + f->SetLoadMode( loadMode ); + f->SetFileName( fileName ); + bool res = f->Load(); if ( !res ) { - delete e1; - delete am; + f->Delete(); return 0; } - if (!e1->IsReadable()) + + if (!f->IsReadable()) { std::cerr << "Sorry, not a Readable DICOM / ACR File" <Delete(); return 0; } - gdcm::FileHelper *f1 = new gdcm::FileHelper(e1); - -// --- + gdcm::FileHelper *fh = gdcm::FileHelper::New(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 <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->GetEntryString(0x0028,0x0004) << std::endl; - int numberOfScalarComponents=e1->GetNumberOfScalarComponents(); - std::cout << "NumberOfScalarComponents " << numberOfScalarComponents <GetTransferSyntaxName(); - std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl; - - f1->GetImageData(); // somewhat important... can't remember + int numberOfScalarComponents=f->GetNumberOfScalarComponents(); + std::cout << "NumberOfScalarComponents " << numberOfScalarComponents + <GetTransferSyntaxName(); + std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" + << std::endl; + + // Since we just ReWrite the image, we know no modification + // was performed on the pixels. + // We don't want this image appears as a 'Secondary Captured image' + fh->SetKeepMediaStorageSOPClassUID(true); switch (mode[0]) { - case 'A' : - // Writting an ACR file - // from a full gdcm readable File - - std::cout << "WriteACR" << std::endl; - f1->WriteAcr(outputFileName); - break; - - case 'D' : // Not documented in the 'usage', because the method 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); - break; - - case 'X' : - // writting a DICOM Explicit VR - // from a full gdcm readable File - - std::cout << "WriteDCM Explicit VR" << std::endl; - f1->WriteDcmExplVR(outputFileName); - break; - - case 'R' : - // Writting a Raw File, - - std::cout << "WriteRaw" << std::endl; - f1->WriteRawData(outputFileName); - break; - + 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; + + 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; } - delete e1; - delete f1; + + f->Delete(); + fh->Delete(); return 0; }