X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestCopyRescaleDicom.cxx;h=8d50d3b72fd76bfe119cdf768c8a96712fcda07d;hb=d9f8b4b69e332d38e9c883ba60f40dc858883de9;hp=54f7d7b81a3fe8a530aec59afbc08bc2799f4a42;hpb=efd3ea11eb9d6da5f3034f5e46649d250b90c75a;p=gdcm.git diff --git a/Testing/TestCopyRescaleDicom.cxx b/Testing/TestCopyRescaleDicom.cxx index 54f7d7b8..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/02/09 15:31:15 $ - Version: $Revision: 1.16 $ + 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 @@ -17,8 +17,11 @@ =========================================================================*/ #include "gdcmFile.h" #include "gdcmFileHelper.h" -#include "gdcmValEntry.h" -#include "gdcmBinEntry.h" +#include "gdcmDataEntry.h" + +#include +#include +#include // for std::ios::left, ... //Generated file: #include "gdcmDataImages.h" @@ -68,56 +71,53 @@ 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_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..."; // Copy of the file content - gdcm::DocEntry *d = originalF->GetFirstEntry(); + GDCM_NAME_SPACE::DocEntry *d = originalF->GetFirstEntry(); while(d) { - if ( gdcm::BinEntry *b = dynamic_cast(d) ) - { - copyF->InsertBinEntry( b->GetBinArea(),b->GetLength(), - b->GetGroup(),b->GetElement(), - b->GetVR() ); - } - else if ( gdcm::ValEntry *v = dynamic_cast(d) ) - { - copyF->InsertValEntry( 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=originalF->GetNextEntry(); + d = originalF->GetNextEntry(); } - gdcm::FileHelper *original = new gdcm::FileHelper( originalF ); - gdcm::FileHelper *copy = new gdcm::FileHelper( copyF ); + 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 = originalF->GetEntryValue(0x0028,0x0101); + const std::string &bitsStored = originalF->GetEntryString(0x0028,0x0101); if( bitsStored == "16" ) { std::cout << "Rescale..."; - 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 + 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; @@ -128,7 +128,7 @@ int CopyRescaleDicom(std::string const &filename, uint8_t *tmpRescale = rescaleImage; for(unsigned int i=0; i>8; + *tmpRescale = (uint8_t)( (*tmpImage)>>8 ); tmpImage++; tmpRescale++; } @@ -151,30 +151,21 @@ int CopyRescaleDicom(std::string const &filename, 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_NAME_SPACE::FileHelper *copy2 = GDCM_NAME_SPACE::FileHelper::New( 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; @@ -182,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 (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() << " | " + << copy2->GetFile()->GetXSize() << " | " << "Y: " << originalF->GetYSize() << " # " - << copy->GetFile()->GetYSize() << " | " + << copy2->GetFile()->GetYSize() << " | " << "Z: " << originalF->GetZSize() << " # " - << copy->GetFile()->GetZSize() << std::endl; - delete original; - delete copy; - delete originalF; + << copy2->GetFile()->GetZSize() << std::endl; delete[] rescaleImage; return 1; @@ -211,9 +199,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; @@ -225,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 originalF; delete[] rescaleImage; return 1; } std::cout << "OK." << std::endl ; - delete original; - delete copy; - delete originalF; delete[] rescaleImage; return 0; @@ -288,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 ) @@ -298,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; }