-#include "gdcmHeader.h"
+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: TestCopyDicom.cxx,v $
+ Language: C++
+ Date: $Date: 2005/02/02 10:06:31 $
+ 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
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
#include "gdcmFile.h"
+#include "gdcmFileHelper.h"
#include "gdcmDocument.h"
#include "gdcmValEntry.h"
#include "gdcmBinEntry.h"
#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
return 1;
}
}
- gdcm::File *original = new gdcm::File( filename );
+ gdcm::FileHelper *original = new gdcm::FileHelper( filename );
std::cout << "--- Original ----------------------" << std::endl;
- //original->GetHeader()->Print();
+ //original->GetFile()->Print();
- gdcm::File *copy = new gdcm::File( output );
-
- const gdcm::TagDocEntryHT & Ht = original->GetHeader()->GetTagHT();
+ gdcm::FileHelper *copy = new gdcm::FileHelper( output );
size_t dataSize = original->GetImageDataSize();
- uint8_t* imageData = original->GetImageData();
+ uint8_t *imageData = original->GetImageData();
+ (void)imageData;
+ (void)dataSize;
//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
- gdcm::DocEntry* d;
-
- for (gdcm::TagDocEntryHT::const_iterator tag = Ht.begin(); tag != Ht.end(); ++tag)
+ gdcm::DocEntry *d = original->GetFile()->GetFirstEntry();
+ while(d)
{
- d = tag->second;
- d->Print(); std::cout << std::endl;
- if ( gdcm::BinEntry* b = dynamic_cast<gdcm::BinEntry*>(d) )
+ if ( gdcm::BinEntry *b = dynamic_cast<gdcm::BinEntry*>(d) )
{
- copy->GetHeader()->ReplaceOrCreateByNumber(
- b->GetBinArea(),
- b->GetLength(),
- b->GetGroup(),
- b->GetElement(),
- b->GetVR() );
+ copy->GetFile()->InsertBinEntry( b->GetBinArea(),b->GetLength(),
+ b->GetGroup(),b->GetElement(),
+ b->GetVR() );
}
- else if ( gdcm::ValEntry* v = dynamic_cast<gdcm::ValEntry*>(d) )
+ else if ( gdcm::ValEntry *v = dynamic_cast<gdcm::ValEntry*>(d) )
{
- copy->GetHeader()->ReplaceOrCreateByNumber(
- v->GetValue(),
- v->GetGroup(),
- v->GetElement(),
- v->GetVR() );
+ copy->GetFile()->InsertValEntry( v->GetValue(),
+ v->GetGroup(),v->GetElement(),
+ v->GetVR() );
}
else
{
// << d->GetGroup() << " " << d->GetElement()
// << std::endl;
}
- }
-
-
-
+ d=original->GetFile()->GetNextEntry();
+ }
//copy->GetImageData();
- copy->SetImageData(imageData, dataSize);
+ //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();
+ copy->GetFile()->Print();
std::cout << "--- ---- ----------------------" << std::endl;
copy->WriteDcmExplVR( output );