X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestCopyRescaleDicom.cxx;h=eaff8b4c891e5678c8118a40243e90d0d98758df;hb=be54aab0103af7dee1a3bb5b8b3ee93b59ca9073;hp=9b29da1fe148efe9488582acafb35c128ccf3d5a;hpb=bfc3823268759435c3aae396f3081dbebf137223;p=gdcm.git diff --git a/Testing/TestCopyRescaleDicom.cxx b/Testing/TestCopyRescaleDicom.cxx index 9b29da1f..eaff8b4c 100644 --- a/Testing/TestCopyRescaleDicom.cxx +++ b/Testing/TestCopyRescaleDicom.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestCopyRescaleDicom.cxx,v $ Language: C++ - Date: $Date: 2004/12/07 16:55:56 $ - Version: $Revision: 1.1 $ + Date: $Date: 2005/01/24 16:44:54 $ + Version: $Revision: 1.10 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#include "gdcmHeader.h" #include "gdcmFile.h" +#include "gdcmFileHelper.h" #include "gdcmValEntry.h" #include "gdcmBinEntry.h" @@ -43,79 +43,79 @@ int CopyRescaleDicom(std::string const & filename, //////////////// Step 1: std::cout << " 1..."; - gdcm::Header *originalH = new gdcm::Header( filename ); - gdcm::Header *copyH = new gdcm::Header( ); + gdcm::File *originalH = new gdcm::File( filename ); + gdcm::File *copyH = new gdcm::File( ); //First of all copy the header field by field - // Warning :Accessor gdcmElementSet::GetEntry() should not exist - // It was commented out by Mathieu, that was a *good* idea - // (the user does NOT have to know the way we implemented the Header !) - // Waiting for a 'clean' solution, I keep the method ...JPRx - - //////////////// Step 2: std::cout << "2..."; - originalH->Initialize(); - gdcm::DocEntry* d = originalH->GetNextEntry(); - + // Copy of the header content + gdcm::DocEntry* d = originalH->GetFirstEntry(); while(d) { - if ( gdcm::ValEntry* v = dynamic_cast(d) ) + if ( gdcm::BinEntry* b = dynamic_cast(d) ) + { + copyH->Insert( + b->GetBinArea(), + b->GetLength(), + b->GetGroup(), + b->GetElement(), + b->GetVR() ); + } + else if ( gdcm::ValEntry* v = dynamic_cast(d) ) { - copyH->ReplaceOrCreateByNumber( + copyH->Insert( v->GetValue(), v->GetGroup(), v->GetElement(), v->GetVR() ); } + else + { + // We skip pb of SQ recursive exploration + } d=originalH->GetNextEntry(); } - gdcm::File *original = new gdcm::File( originalH ); - gdcm::File *copy = new gdcm::File( copyH ); + gdcm::FileHelper *original = new gdcm::FileHelper( originalH ); + gdcm::FileHelper *copy = new gdcm::FileHelper( copyH ); size_t dataSize = original->GetImageDataSize(); - uint8_t* imageData = original->GetImageData(); - - size_t rescaleSize = dataSize / 2; -#ifdef VERSION_1 - uint8_t *rescaleImage = new uint8_t[dataSize]; -#endif - - //2 case now, if 16 bits input then try to downscale to 8bits just for - //fun: - const std::string & bitsStored = originalH->GetEntryByNumber(0x0028,0x0101); -// std::cout << "BitsStored: " << bitsStored << std::endl; + size_t rescaleSize; + uint8_t *rescaleImage; + const std::string & bitsStored = originalH->GetEntryValue(0x0028,0x0101); if( bitsStored == "16" ) { - uint16_t* imageData16 = (uint16_t*)original->GetImageData(); - copyH->ReplaceOrCreateByNumber( "8", 0x0028, 0x0100); // BitsAllocated - copyH->ReplaceOrCreateByNumber( "8", 0x0028, 0x0101); // BitsStored - copyH->ReplaceOrCreateByNumber( "7", 0x0028, 0x0102); // HighBit - copyH->ReplaceOrCreateByNumber( "0", 0x0028, 0x0103); //Pixel Representation + std::cout << "Rescale..."; + copyH->Insert( "8", 0x0028, 0x0100); // BitsAllocated + copyH->Insert( "8", 0x0028, 0x0101); // BitsStored + copyH->Insert( "7", 0x0028, 0x0102); // HighBit + copyH->Insert( "0", 0x0028, 0x0103); //Pixel Representation // We assume the value were from 0 to uint16_t max + rescaleSize = dataSize / 2; + rescaleImage = new uint8_t[dataSize]; + + uint16_t* imageData16 = (uint16_t*)original->GetImageData(); for(unsigned int i=0; iSetImageData(rescaleImage, rescaleSize); -#endif } else { - copy->SetImageData(imageData, dataSize); + std::cout << "Same..."; + rescaleSize = dataSize; + rescaleImage = new uint8_t[dataSize]; + memcpy(rescaleImage,original->GetImageData(),dataSize); } + copy->SetImageData(rescaleImage, rescaleSize); + //////////////// Step 3: std::cout << "3..."; copy->SetWriteModeToRGB(); @@ -128,6 +128,7 @@ int CopyRescaleDicom(std::string const & filename, delete copy; delete originalH; delete copyH; + delete[] rescaleImage; return 1; } @@ -137,16 +138,17 @@ int CopyRescaleDicom(std::string const & filename, //////////////// Step 4: std::cout << "4..."; - copy = new gdcm::File( output ); + copy = new gdcm::FileHelper( output ); //Is the file written still gdcm parsable ? - if ( !copy->GetHeader()->IsReadable() ) + if ( !copy->GetFile()->IsReadable() ) { std::cout << " Failed" << std::endl << " " << output << " not readable" << std::endl; delete original; delete originalH; + delete[] rescaleImage; return 1; } @@ -156,7 +158,27 @@ int CopyRescaleDicom(std::string const & filename, size_t dataSizeWritten = copy->GetImageDataSize(); uint8_t* imageDataWritten = copy->GetImageData(); - if (dataSize != dataSizeWritten) + if (originalH->GetXSize() != copy->GetFile()->GetXSize() || + originalH->GetYSize() != copy->GetFile()->GetYSize() || + originalH->GetZSize() != copy->GetFile()->GetZSize()) + { + std::cout << "Failed" << std::endl + << " X Size differs: " + << "X: " << originalH->GetXSize() << " # " + << copy->GetFile()->GetXSize() << " | " + << "Y: " << originalH->GetYSize() << " # " + << copy->GetFile()->GetYSize() << " | " + << "Z: " << originalH->GetZSize() << " # " + << copy->GetFile()->GetZSize() << std::endl; + delete original; + delete copy; + delete originalH; + delete[] rescaleImage; + + return 1; + } + + if (rescaleSize != dataSizeWritten) { std::cout << " Failed" << std::endl << " Pixel areas lengths differ: " @@ -165,11 +187,12 @@ int CopyRescaleDicom(std::string const & filename, delete original; delete copy; delete originalH; + delete[] rescaleImage; return 1; } - if (int res = memcmp(imageData, imageDataWritten, dataSize) !=0) + if (int res = memcmp(rescaleImage, imageDataWritten, rescaleSize) !=0) { (void)res; std::cout << " Failed" << std::endl @@ -178,6 +201,7 @@ int CopyRescaleDicom(std::string const & filename, delete original; delete copy; delete originalH; + delete[] rescaleImage; return 1; } @@ -186,9 +210,7 @@ int CopyRescaleDicom(std::string const & filename, delete original; delete copy; delete originalH; -#ifdef VERSION_1 delete[] rescaleImage; -#endif return 0; } @@ -223,7 +245,7 @@ int TestCopyRescaleDicom(int argc, char* argv[]) << std::endl; std::cout << " apply the following to each filename.xxx: " << std::endl; - std::cout << " step 1: parse the image (as gdcmHeader) and call" + std::cout << " step 1: parse the image (as gdcmFile) and call" << " IsReadable(). After that, call GetImageData() and " << "GetImageDataSize() " << std::endl;