Program: gdcm
Module: $RCSfile: TestCopyDicom.cxx,v $
Language: C++
- Date: $Date: 2005/01/14 11:28:28 $
- Version: $Revision: 1.16 $
+ 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
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "gdcmHeader.h"
#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
#endif
// return true if the file exists
-bool FileExists(const char* filename)
+bool FileExists(const char *filename)
{
#ifdef _MSC_VER
# define access _access
}
}
-bool RemoveFile(const char* source)
+bool RemoveFile(const char *source)
{
#ifdef _MSC_VER
#define _unlink unlink
// Here we load a gdcmFile and then try to create from scratch a copy of it,
// copying field by field the dicom image
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
{
if (argc < 3)
{
}
// 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 *original = new gdcm::File( filename );
+ gdcm::File *fileOr = gdcm::File::New();
+ fileOr->SetFileName( filename );
+ fileOr->Load();
+ gdcm::FileHelper *original = gdcm::FileHelper::New( fileOr );
std::cout << "--- Original ----------------------" << std::endl;
- //original->GetHeader()->Print();
- gdcm::File *copy = new gdcm::File( 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
-
- // 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
- original->GetHeader()->InitTraversal();
- gdcm::DocEntry* d=original->GetHeader()->GetNextEntry();
+ 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->GetHeader()->ReplaceOrCreate(
- b->GetBinArea(),
- b->GetLength(),
- b->GetGroup(),
- b->GetElement(),
- b->GetVR() );
- }
- else if ( gdcm::ValEntry* v = dynamic_cast<gdcm::ValEntry*>(d) )
- {
- copy->GetHeader()->ReplaceOrCreate(
- 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->GetHeader()->GetNextEntry();
+ 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;;
- copy->GetHeader()->Print();
+ 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;
}