Program: gdcm
Module: $RCSfile: TestCopyDicom.cxx,v $
Language: C++
- Date: $Date: 2004/11/24 10:23:46 $
- Version: $Revision: 1.19 $
+ Date: $Date: 2007/10/30 09:13:45 $
+ Version: $Revision: 1.44 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "gdcmHeader.h"
#include "gdcmFile.h"
-#include "gdcmDocument.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
+#include "gdcmFileHelper.h"
+#include "gdcmDataEntry.h"
//Generated file:
#include "gdcmDataImages.h"
-#ifndef _WIN32
-#include <unistd.h> //for access, unlink
-#else
-#include <io.h> //for _access on Win32
-#endif
-
// return true if the file exists
-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;
-}
+bool FileExists(const char *filename);
+bool RemoveFile(const char *source);
-int CopyDicom(std::string const & filename,
- std::string const & output )
+int CopyDicom(std::string const &filename,
+ std::string const &output )
{
std::cout << " Testing: " << filename << std::endl;
if( FileExists( output.c_str() ) )
{
- // std::cerr << "Don't try to cheat, I am removing the file anyway" << std::endl;
if( !RemoveFile( output.c_str() ) )
{
std::cout << "Ouch, the file exist, but I cannot remove it" << std::endl;
//////////////// Step 1:
std::cout << " 1...";
- gdcm::File *original = new gdcm::File( filename );
- gdcm::File *copy = new gdcm::File( output );
+ GDCM_NAME_SPACE::File *originalH = GDCM_NAME_SPACE::File::New();
+ GDCM_NAME_SPACE::File *copyH = GDCM_NAME_SPACE::File::New();
- size_t dataSize = original->GetImageDataSize();
- uint8_t* imageData = original->GetImageData();
- (void)dataSize; // To use the variable and not have warnings at compil.
- (void)imageData; // To use the variable and not have warnings at compil.
-
- //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
+ originalH->SetFileName( filename );
+ originalH->Load( );
+ //First of all copy the file, field by field
//////////////// Step 2:
std::cout << "2...";
- original->GetHeader()->Initialize();
- gdcm::DocEntry* d=original->GetHeader()->GetNextEntry();
-
+ GDCM_NAME_SPACE::DocEntry *d=originalH->GetFirstEntry();
while(d)
{
- if ( gdcm::BinEntry* b = dynamic_cast<gdcm::BinEntry*>(d) )
- {
- copy->GetHeader()->ReplaceOrCreateByNumber(
- b->GetBinArea(),
- b->GetLength(),
- b->GetGroup(),
- b->GetElement(),
- b->GetVR() );
- }
- else if ( gdcm::ValEntry* v = dynamic_cast<gdcm::ValEntry*>(d) )
- {
- copy->GetHeader()->ReplaceOrCreateByNumber(
- v->GetValue(),
- v->GetGroup(),
- v->GetElement(),
- v->GetVR() );
+ if ( GDCM_NAME_SPACE::DataEntry *de = dynamic_cast<GDCM_NAME_SPACE::DataEntry *>(d) )
+ {
+ copyH->InsertEntryBinArea( de->GetBinArea(),de->GetLength(),
+ de->GetGroup(),de->GetElement(),
+ de->GetVR() );
}
else
{
// We skip pb of SQ recursive exploration
- //std::cout << "Skipped Sequence "
- // << "------------- " << d->GetVR() << " "<< std::hex
- // << d->GetGroup() << " " << d->GetElement()
- // << std::endl;
}
- d=original->GetHeader()->GetNextEntry();
+ d=originalH->GetNextEntry();
}
+ GDCM_NAME_SPACE::FileHelper *original = GDCM_NAME_SPACE::FileHelper::New(originalH);
+ GDCM_NAME_SPACE::FileHelper *copy = GDCM_NAME_SPACE::FileHelper::New(copyH);
+ size_t dataSize = original->GetImageDataSize();
+ uint8_t *imageData = original->GetImageData();
- // Useless to set the image datas, because it's already made when
- // copying the corresponding BinEntry that contains the pixel datas
+ // Useless to set the image data, because it's already made when
+ // copying the corresponding DataEntry that contains the pixel data
+
+ // --> FIXME : Why do we let the following line?
+ // to avoid compile time warnings?
copy->SetImageData(imageData, dataSize);
-// copy->GetImageData();
-// original->GetHeader()->SetImageDataSize(dataSize);
//////////////// Step 3:
std::cout << "3...";
- copy->WriteDcmExplVR( output );
+ copy->SetWriteModeToRGB();
+ if( !copy->WriteDcmExplVR(output) )
+ {
+ std::cout << " Failed" << std::endl
+ << " " << output << " not written" << std::endl;
+
+ original->Delete();
+ copy->Delete();
+ originalH->Delete();
+ copyH->Delete();
+
+ return 1;
+ }
- delete copy;
+ copy->Delete();
+ copyH->Delete();
//////////////// Step 4:
std::cout << "4...";
- copy = new gdcm::File( output );
-
+// copy = new GDCM_NAME_SPACE::FileHelper( output );
+ copy = GDCM_NAME_SPACE::FileHelper::New(output); // ???
//Is the file written still gdcm parsable ?
- if ( !copy->GetHeader()->IsReadable() )
+ if ( !copy->GetFile()->IsReadable() )
{
- std::cout << "=> " << output << " Failed" << std::endl;
- delete original;
- return(1);
+ std::cout << " Failed" << std::endl
+ << " " << output << " not readable" << std::endl;
+
+ original->Delete();
+ originalH->Delete();
+
+ return 1;
}
//////////////// Step 5:
std::cout << "5...";
- int dataSizeWritten = copy->GetImageDataSize();
- uint8_t* imageDataWritten = copy->GetImageData();
+ size_t dataSizeWritten = copy->GetImageDataSize();
+ uint8_t *imageDataWritten = copy->GetImageData();
if (dataSize != dataSizeWritten)
{
std::cout << " Failed" << std::endl
- << " Pixel areas lengths differ: "
- << dataSize << " # " << dataSizeWritten << std::endl;
+ << " Pixel areas lengths differ: "
+ << dataSize << " # " << dataSizeWritten << std::endl;
- delete original;
- delete copy;
+ original->Delete();
+ copy->Delete();
+ originalH->Delete();
return 1;
}
{
(void)res;
std::cout << " Failed" << std::endl
- << " Pixel differ (as expanded in memory)." << std::endl;
+ << " Pixel differ (as expanded in memory)." << std::endl;
- delete original;
- delete copy;
+ original->Delete();
+ copy->Delete();
+ originalH->Delete();
return 1;
}
std::cout << "OK." << std::endl ;
- delete original;
- delete copy;
+ original->Delete();
+ copy->Delete();
+ originalH->Delete();
return 0;
}
// Here we load a gdcmFile and then try to create from scratch a copy of it,
// copying field by field the dicom image
-int TestCopyDicom(int argc, char* argv[])
+int TestCopyDicom(int argc, char *argv[])
{
if ( argc == 3 )
{
<< 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;
filename += "/"; //doh!
filename += gdcmDataImages[i];
-// std::string output = "../Testing/Temporary/output.dcm";
std::string output = "output.dcm";
if( CopyDicom( filename, output ) != 0 )
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff