X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestCopyRescaleDicom.cxx;h=8d50d3b72fd76bfe119cdf768c8a96712fcda07d;hb=6278320cc85da00d2d56ffbf07806e84966892c3;hp=aa1ed72cd3f43dfb53fd28f246c42d55b9fc9ca5;hpb=a462ce9f1af0894cd930ab04f2e65cd80dfa7084;p=gdcm.git diff --git a/Testing/TestCopyRescaleDicom.cxx b/Testing/TestCopyRescaleDicom.cxx index aa1ed72c..8d50d3b7 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/08 15:03:58 $ - Version: $Revision: 1.4 $ + Date: $Date: 2007/10/30 09:13:03 $ + Version: $Revision: 1.23 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -15,20 +15,51 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#include "gdcmHeader.h" #include "gdcmFile.h" -#include "gdcmValEntry.h" -#include "gdcmBinEntry.h" +#include "gdcmFileHelper.h" +#include "gdcmDataEntry.h" + +#include +#include +#include // for std::ios::left, ... //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() ) ) @@ -40,78 +71,66 @@ int CopyRescaleDicom(std::string const & filename, return 1; } } - + //////////////// 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_NAME_SPACE::File *originalF = GDCM_NAME_SPACE::File::New( ); + originalF->SetFileName( filename ); + originalF->Load(); + + GDCM_NAME_SPACE::File *copyF = GDCM_NAME_SPACE::File::New( ); + //First of all copy the file, field by field //////////////// Step 2: std::cout << "2..."; - originalH->Initialize(); - gdcm::DocEntry* d = originalH->GetNextEntry(); - - // Copy of the header content + // Copy of the file content + GDCM_NAME_SPACE::DocEntry *d = originalF->GetFirstEntry(); while(d) { - if ( gdcm::BinEntry* b = dynamic_cast(d) ) - { - copyH->ReplaceOrCreate( - b->GetBinArea(), - b->GetLength(), - b->GetGroup(), - b->GetElement(), - b->GetVR() ); - } - else if ( gdcm::ValEntry* v = dynamic_cast(d) ) - { - copyH->ReplaceOrCreate( - v->GetValue(), - v->GetGroup(), - v->GetElement(), - v->GetVR() ); + if ( GDCM_NAME_SPACE::DataEntry *de = dynamic_cast(d) ) + { + copyF->InsertEntryBinArea( de->GetBinArea(),de->GetLength(), + de->GetGroup(),de->GetElement(), + de->GetVR() ); } else { // We skip pb of SQ recursive exploration } - d=originalH->GetNextEntry(); + d = originalF->GetNextEntry(); } - gdcm::File *original = new gdcm::File( originalH ); - gdcm::File *copy = new gdcm::File( copyH ); + GDCM_NAME_SPACE::FileHelper *original = GDCM_NAME_SPACE::FileHelper::New( originalF ); + GDCM_NAME_SPACE::FileHelper *copy = GDCM_NAME_SPACE::FileHelper::New( copyF ); size_t dataSize = original->GetImageDataSize(); size_t rescaleSize; uint8_t *rescaleImage; - const std::string & bitsStored = originalH->GetEntry(0x0028,0x0101); + const std::string &bitsStored = originalF->GetEntryString(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->InsertEntryString( "8", 0x0028, 0x0100, "US"); // Bits Allocated + copyF->InsertEntryString( "8", 0x0028, 0x0101, "US"); // Bits Stored + copyF->InsertEntryString( "7", 0x0028, 0x0102, "US"); // High Bit + copyF->InsertEntryString( "0", 0x0028, 0x0103, "US"); // 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 @@ -132,30 +151,21 @@ int CopyRescaleDicom(std::string const & filename, 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::File( output ); + GDCM_NAME_SPACE::FileHelper *copy2 = GDCM_NAME_SPACE::FileHelper::New( 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; @@ -163,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; @@ -192,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; @@ -206,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; @@ -226,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 ) { @@ -253,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; @@ -269,6 +267,11 @@ int TestCopyRescaleDicom(int argc, char* argv[]) << " match (as expanded by gdcm)." << std::endl; std::cout << std::endl; + + clock_t r1,r2, r3,r4; + struct tms tms1,tms2, tms3,tms4; + + r3 = times(&tms3); int i =0; int retVal = 0; //by default this is an error while( gdcmDataImages[i] != 0 ) @@ -279,13 +282,34 @@ int TestCopyRescaleDicom(int argc, char* argv[]) std::string output = "output.dcm"; + r1 = times(&tms1); if( CopyRescaleDicom( filename, output ) != 0 ) { retVal++; } + r2 = times(&tms2); + + std::cout + << std::setw(150-strlen(gdcmDataImages[i])) + << gdcmDataImages[i] << " user time: " + << (long) ((tms2.tms_utime) - (tms1.tms_utime)) + << " system time: " + << (long) ((tms2.tms_stime) - (tms1.tms_stime)) + << "\t elapsed time: " << r2 - r1 + << std::endl; i++; } + r4 = times(&tms4); + + std::cout + << std::setw(150-strlen("Gross Total")) << " --> " + << "Gross Total" << " user time: " + << (long) ((tms4.tms_utime) - (tms3.tms_utime)) + << " system time: " + << (long) ((tms4.tms_stime) - (tms3.tms_stime)) + << "\t elapsed time: " << (long) (r4 - r3) + << std::endl; return retVal; }