X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestCopyRescaleDicom.cxx;h=3d25e33cdfdfeb0b983b24910ed955a1c908f54e;hb=c4fa2e74a4ce56a0a8db54e4a70d404bec9fc8dd;hp=f93f5e681d8125fc1a56dbba42a733e7c138111a;hpb=3e82e8b67eddf5d4b95b6aa2a2e2615aced4c452;p=gdcm.git diff --git a/Testing/TestCopyRescaleDicom.cxx b/Testing/TestCopyRescaleDicom.cxx index f93f5e68..3d25e33c 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/02/02 10:05:26 $ - Version: $Revision: 1.13 $ + Date: $Date: 2005/07/08 13:39:57 $ + Version: $Revision: 1.20 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,15 +20,47 @@ #include "gdcmValEntry.h" #include "gdcmBinEntry.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; + } +} -int CopyRescaleDicom(std::string const & filename, - std::string const & output ) +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 ) { std::cout << " Testing: " << filename << std::endl; if( FileExists( output.c_str() ) ) @@ -40,65 +72,72 @@ int CopyRescaleDicom(std::string const & filename, return 1; } } - + //////////////// Step 1: std::cout << " 1..."; - gdcm::File *originalF = new gdcm::File( filename ); - gdcm::File *copyF = new gdcm::File( ); + gdcm::File originalF = gdcm::File( ); + originalF.SetFileName( filename ); + originalF.Load(); + + gdcm::File copyF = gdcm::File( ); //First of all copy the file, field by field //////////////// Step 2: std::cout << "2..."; // Copy of the file content - gdcm::DocEntry* d = originalF->GetFirstEntry(); + gdcm::DocEntry *d = originalF.GetFirstEntry(); while(d) { - if ( gdcm::BinEntry* b = dynamic_cast(d) ) + if ( gdcm::BinEntry *b = dynamic_cast(d) ) { - copyF->InsertBinEntry( 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) ) { - copyF->InsertValEntry( 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=originalF->GetNextEntry(); + d = originalF.GetNextEntry(); } - gdcm::FileHelper *original = new gdcm::FileHelper( originalF ); - gdcm::FileHelper *copy = new gdcm::FileHelper( copyF ); + 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 = originalF->GetEntryValue(0x0028,0x0101); + const std::string &bitsStored = originalF.GetEntryValue(0x0028,0x0101); if( bitsStored == "16" ) { std::cout << "Rescale..."; - copyF->InsertValEntry( "8", 0x0028, 0x0100); // BitsAllocated - copyF->InsertValEntry( "8", 0x0028, 0x0101); // BitsStored - copyF->InsertValEntry( "7", 0x0028, 0x0102); // HighBit - copyF->InsertValEntry( "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 @@ -106,43 +145,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 originalF; - delete copyF; delete[] rescaleImage; return 1; } - delete copy; - delete copyF; - //////////////// 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->GetFile()->IsReadable() ) + if ( !copy2.GetFile()->IsReadable() ) { std::cout << " Failed" << std::endl << " " << output << " not readable" << std::endl; - delete original; - delete originalF; delete[] rescaleImage; return 1; @@ -150,24 +180,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 (originalF->GetXSize() != copy->GetFile()->GetXSize() || - originalF->GetYSize() != copy->GetFile()->GetYSize() || - originalF->GetZSize() != copy->GetFile()->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: " << originalF->GetXSize() << " # " - << copy->GetFile()->GetXSize() << " | " - << "Y: " << originalF->GetYSize() << " # " - << copy->GetFile()->GetYSize() << " | " - << "Z: " << originalF->GetZSize() << " # " - << copy->GetFile()->GetZSize() << std::endl; - delete original; - delete copy; - delete originalF; + << "X: " << originalF.GetXSize() << " # " + << copy2.GetFile()->GetXSize() << " | " + << "Y: " << originalF.GetYSize() << " # " + << copy2.GetFile()->GetYSize() << " | " + << "Z: " << originalF.GetZSize() << " # " + << copy2.GetFile()->GetZSize() << std::endl; delete[] rescaleImage; return 1; @@ -179,9 +206,6 @@ int CopyRescaleDicom(std::string const & filename, << " Pixel areas lengths differ: " << dataSize << " # " << dataSizeWritten << std::endl; - delete original; - delete copy; - delete originalF; delete[] rescaleImage; return 1; @@ -193,18 +217,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 originalF; delete[] rescaleImage; return 1; } std::cout << "OK." << std::endl ; - delete original; - delete copy; - delete originalF; delete[] rescaleImage; return 0; @@ -213,7 +231,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 ) { @@ -256,6 +274,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 ) @@ -266,13 +289,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; }