X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestCopyRescaleDicom.cxx;h=907dad9b54eaaaee5ecfc7224b8646d423d7815e;hb=de5fc413dc579fc61f7e04397efd1dc1087fe3cf;hp=6616afa17340987ce594af802f771f2a3686c5f5;hpb=d00078b5e19310b379c8339fa8fe38362e8ca392;p=gdcm.git diff --git a/Testing/TestCopyRescaleDicom.cxx b/Testing/TestCopyRescaleDicom.cxx index 6616afa1..907dad9b 100644 --- a/Testing/TestCopyRescaleDicom.cxx +++ b/Testing/TestCopyRescaleDicom.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestCopyRescaleDicom.cxx,v $ Language: C++ - Date: $Date: 2005/01/20 16:16:59 $ - Version: $Revision: 1.7 $ + Date: $Date: 2005/04/19 10:02:40 $ + Version: $Revision: 1.18 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -15,7 +15,7 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#include "gdcmHeader.h" +#include "gdcmFile.h" #include "gdcmFileHelper.h" #include "gdcmValEntry.h" #include "gdcmBinEntry.h" @@ -23,12 +23,40 @@ //Generated file: #include "gdcmDataImages.h" -bool FileExists(const char* filename); +#ifndef _WIN32 +#include //for access, unlink +#else +#include //for _access on Win32 +#endif -bool RemoveFile(const char* source); +bool FileExists(const char *filename) +{ +#ifdef _MSC_VER +# define access _access +#endif +#ifndef R_OK +# define R_OK 04 +#endif + if ( access(filename, R_OK) != 0 ) + { + return false; + } + else + { + return true; + } +} + +bool RemoveFile(const char *source) +{ +#ifdef _MSC_VER +#define _unlink unlink +#endif + return unlink(source) != 0 ? false : true; +} -int CopyRescaleDicom(std::string const & filename, - std::string const & output ) +int CopyRescaleDicom(std::string const &filename, + std::string const &output ) { std::cout << " Testing: " << filename << std::endl; if( FileExists( output.c_str() ) ) @@ -43,73 +71,66 @@ int CopyRescaleDicom(std::string const & filename, //////////////// Step 1: std::cout << " 1..."; - gdcm::Header *originalH = new gdcm::Header( filename ); - gdcm::Header *copyH = new gdcm::Header( ); - - //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 + gdcm::File originalF = gdcm::File( filename ); + gdcm::File copyF = gdcm::File( ); + //First of all copy the file, field by field //////////////// Step 2: std::cout << "2..."; - // Copy of the header content - gdcm::DocEntry* d = originalH->GetFirstEntry(); + // Copy of the file content + gdcm::DocEntry *d = originalF.GetFirstEntry(); while(d) { - if ( gdcm::BinEntry* b = dynamic_cast(d) ) + if ( gdcm::BinEntry *b = dynamic_cast(d) ) { - copyH->ReplaceOrCreate( - b->GetBinArea(), - b->GetLength(), - b->GetGroup(), - b->GetElement(), - b->GetVR() ); + copyF.InsertBinEntry( b->GetBinArea(),b->GetLength(), + b->GetGroup(),b->GetElement(), + b->GetVR() ); } - else if ( gdcm::ValEntry* v = dynamic_cast(d) ) + else if ( gdcm::ValEntry *v = dynamic_cast(d) ) { - copyH->ReplaceOrCreate( - v->GetValue(), - v->GetGroup(), - v->GetElement(), - v->GetVR() ); + copyF.InsertValEntry( v->GetValue(), + v->GetGroup(),v->GetElement(), + v->GetVR() ); } else { // We skip pb of SQ recursive exploration } - d=originalH->GetNextEntry(); + d = originalF.GetNextEntry(); } - gdcm::FileHelper *original = new gdcm::FileHelper( originalH ); - gdcm::FileHelper *copy = new gdcm::FileHelper( copyH ); + gdcm::FileHelper original = gdcm::FileHelper( &originalF ); + gdcm::FileHelper copy = gdcm::FileHelper( ©F ); - size_t dataSize = original->GetImageDataSize(); + size_t dataSize = original.GetImageDataSize(); size_t rescaleSize; uint8_t *rescaleImage; - const std::string & bitsStored = originalH->GetEntry(0x0028,0x0101); + const std::string &bitsStored = originalF.GetEntryValue(0x0028,0x0101); if( bitsStored == "16" ) { std::cout << "Rescale..."; - copyH->ReplaceOrCreate( "8", 0x0028, 0x0100); // BitsAllocated - copyH->ReplaceOrCreate( "8", 0x0028, 0x0101); // BitsStored - copyH->ReplaceOrCreate( "7", 0x0028, 0x0102); // HighBit - copyH->ReplaceOrCreate( "0", 0x0028, 0x0103); //Pixel Representation - + copyF.InsertValEntry( "8", 0x0028, 0x0100); // Bits Allocated + copyF.InsertValEntry( "8", 0x0028, 0x0101); // Bits Stored + copyF.InsertValEntry( "7", 0x0028, 0x0102); // High Bit + copyF.InsertValEntry( "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(); + uint16_t *imageData16 = (uint16_t*)original.GetImageData(); + uint16_t *tmpImage = imageData16; + uint8_t *tmpRescale = rescaleImage; for(unsigned int i=0; i>8 ); + tmpImage++; + tmpRescale++; } } else @@ -117,43 +138,34 @@ int CopyRescaleDicom(std::string const & filename, std::cout << "Same..."; rescaleSize = dataSize; rescaleImage = new uint8_t[dataSize]; - memcpy(rescaleImage,original->GetImageData(),dataSize); + memcpy(rescaleImage,original.GetImageData(),dataSize); } - copy->SetImageData(rescaleImage, rescaleSize); + copy.SetImageData(rescaleImage, rescaleSize); //////////////// Step 3: std::cout << "3..."; - copy->SetWriteModeToRGB(); - if( !copy->WriteDcmExplVR(output) ) + copy.SetWriteModeToRGB(); + if( !copy.WriteDcmExplVR(output) ) { std::cout << " Failed" << std::endl << " " << output << " not written" << std::endl; - delete original; - delete copy; - delete originalH; - delete copyH; delete[] rescaleImage; return 1; } - delete copy; - delete copyH; - //////////////// Step 4: std::cout << "4..."; - copy = new gdcm::FileHelper( output ); + gdcm::FileHelper copy2 = gdcm::FileHelper( output ); //Is the file written still gdcm parsable ? - if ( !copy->GetHeader()->IsReadable() ) + if ( !copy2.GetFile()->IsReadable() ) { std::cout << " Failed" << std::endl << " " << output << " not readable" << std::endl; - delete original; - delete originalH; delete[] rescaleImage; return 1; @@ -161,24 +173,21 @@ int CopyRescaleDicom(std::string const & filename, //////////////// Step 5: std::cout << "5..."; - size_t dataSizeWritten = copy->GetImageDataSize(); - uint8_t* imageDataWritten = copy->GetImageData(); + size_t dataSizeWritten = copy2.GetImageDataSize(); + uint8_t *imageDataWritten = copy2.GetImageData(); - if (originalH->GetXSize() != copy->GetHeader()->GetXSize() || - originalH->GetYSize() != copy->GetHeader()->GetYSize() || - originalH->GetZSize() != copy->GetHeader()->GetZSize()) + if (originalF.GetXSize() != copy2.GetFile()->GetXSize() || + originalF.GetYSize() != copy2.GetFile()->GetYSize() || + originalF.GetZSize() != copy2.GetFile()->GetZSize()) { std::cout << "Failed" << std::endl << " X Size differs: " - << "X: " << originalH->GetXSize() << " # " - << copy->GetHeader()->GetXSize() << " | " - << "Y: " << originalH->GetYSize() << " # " - << copy->GetHeader()->GetYSize() << " | " - << "Z: " << originalH->GetZSize() << " # " - << copy->GetHeader()->GetZSize() << std::endl; - delete original; - delete copy; - delete originalH; + << "X: " << originalF.GetXSize() << " # " + << copy2.GetFile()->GetXSize() << " | " + << "Y: " << originalF.GetYSize() << " # " + << copy2.GetFile()->GetYSize() << " | " + << "Z: " << originalF.GetZSize() << " # " + << copy2.GetFile()->GetZSize() << std::endl; delete[] rescaleImage; return 1; @@ -190,9 +199,6 @@ int CopyRescaleDicom(std::string const & filename, << " Pixel areas lengths differ: " << dataSize << " # " << dataSizeWritten << std::endl; - delete original; - delete copy; - delete originalH; delete[] rescaleImage; return 1; @@ -204,18 +210,12 @@ int CopyRescaleDicom(std::string const & filename, std::cout << " Failed" << std::endl << " Pixel differ (as expanded in memory)." << std::endl; - delete original; - delete copy; - delete originalH; delete[] rescaleImage; return 1; } std::cout << "OK." << std::endl ; - delete original; - delete copy; - delete originalH; delete[] rescaleImage; return 0; @@ -224,7 +224,7 @@ int CopyRescaleDicom(std::string const & filename, // Here we load a gdcmFile and then try to create from scratch a copy of it, // copying field by field the dicom image -int TestCopyRescaleDicom(int argc, char* argv[]) +int TestCopyRescaleDicom(int argc, char *argv[]) { if ( argc == 3 ) { @@ -251,12 +251,12 @@ 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; std::cout << " step 2: create a copy of the readed file and the new" - << " pixel datas are set to the copy" + << " pixel data are set to the copy" << std::endl; std::cout << " step 3: write the copy of the image" << std::endl;