Program: gdcm
Module: $RCSfile: TestCopyDicom.cxx,v $
Language: C++
- Date: $Date: 2005/07/08 12:02:02 $
- Version: $Revision: 1.25 $
+ Date: $Date: 2005/10/25 14:52:27 $
+ Version: $Revision: 1.32 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmFile.h"
#include "gdcmFileHelper.h"
#include "gdcmDocument.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
+#include "gdcmDataEntry.h"
#ifndef _WIN32
#include <unistd.h> //for access, unlink
}
// don't modify identation in order to let this source xdiffable with ../Test
-
std::string filename = argv[1];
std::string output = argv[2];
if( FileExists( output.c_str() ) )
{
- std::cerr << "Don't try to cheat, I am removing the file anyway" << std::endl;
+ std::cerr << "Don't try to cheat, I am removing the file anyway"
+ << std::endl;
if( !RemoveFile( output.c_str() ) )
{
- std::cerr << "Ouch, the file exist, but I cannot remove it" << std::endl;
+ std::cerr << "Ouch, the file exist, but I cannot remove it"
+ << std::endl;
return 1;
}
}
- gdcm::File *fileOr = new gdcm::File();
+ gdcm::File *fileOr = gdcm::File::New();
fileOr->SetFileName( filename );
fileOr->Load();
- gdcm::FileHelper *original = new gdcm::FileHelper( fileOr );
+ gdcm::FileHelper *original = gdcm::FileHelper::New( fileOr );
std::cout << "--- Original ----------------------" << std::endl;
- //original->GetFile()->Print();
- gdcm::FileHelper *copy = new gdcm::FileHelper( output );
-
- size_t dataSize = original->GetImageDataSize();
- uint8_t *imageData = original->GetImageData();
- (void)imageData;
- (void)dataSize;
+ gdcm::FileHelper *copy = gdcm::FileHelper::New( );
+ copy->SetFileName( output );
+ copy->Load();
+
+ uint8_t *imageData;
+
+ imageData = original->GetImageData(); // VERY important :
+ // brings pixels into memory !
+ std::cout << imageData << std::endl; // to avoid warning ?
+
//First of all copy the header field by field
gdcm::DocEntry *d = original->GetFile()->GetFirstEntry();
while(d)
{
- if ( gdcm::BinEntry *b = dynamic_cast<gdcm::BinEntry*>(d) )
+ if ( gdcm::DataEntry *de = dynamic_cast<gdcm::DataEntry *>(d) )
{
- copy->GetFile()->InsertBinEntry( b->GetBinArea(),b->GetLength(),
- b->GetGroup(),b->GetElement(),
- b->GetVR() );
- }
- else if ( gdcm::ValEntry *v = dynamic_cast<gdcm::ValEntry*>(d) )
- {
- copy->GetFile()->InsertValEntry( v->GetValue(),
- v->GetGroup(),v->GetElement(),
- v->GetVR() );
+ copy->GetFile()->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;
+ // We skip pb of SQ recursive exploration
+ std::cout << "Skipped Sequence "
+ << "------------- " << d->GetVR() << " "<< std::hex
+ << d->GetGroup() << "," << d->GetElement()
+ << std::endl;
}
d=original->GetFile()->GetNextEntry();
}
- //copy->GetImageData();
- //copy->SetImageData(imageData, dataSize);
-
std::cout << "--- Copy ----------------------" << std::endl;
- std::cout <<std::endl << "DO NOT care about Offset" <<std::endl<<std::endl;;
+ std::cout <<std::endl << "DO NOT care about Offset"
+ <<std::endl << std::endl;;
copy->GetFile()->Print();
std::cout << "--- ---- ----------------------" << std::endl;
copy->WriteDcmExplVR( output );
-
+
+ fileOr->Delete(); // File
+ original->Delete(); // FileHelper
+ copy->Delete(); // FileHelper
return 0;
}