Program: gdcm
Module: $RCSfile: TestCopyDicom.cxx,v $
Language: C++
- Date: $Date: 2004/11/17 10:20:06 $
- Version: $Revision: 1.13 $
+ Date: $Date: 2005/10/17 10:41:59 $
+ Version: $Revision: 1.30 $
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"
#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)
{
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 = new gdcm::File();
+ fileOr->SetFileName( filename );
+ fileOr->Load();
+ gdcm::FileHelper *original = new gdcm::FileHelper( fileOr );
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();
-
- size_t dataSize = original->GetImageDataSize();
- uint8_t* imageData = original->GetImageData();
+ gdcm::FileHelper *copy = new gdcm::FileHelper( );
+ copy->SetFileName( output );
+ copy->Load();
+
+ //size_t dataSize;
+ uint8_t *imageData;
+ //dataSize = original->GetImageDataSize();// just an accesor :useless here
+
+ imageData = original->GetImageData(); // VERY important :
+ // brings pixels into memory !
+ //(void)imageData; // not enough to avoid warning with icc compiler
+ //(void)dataSize; // not enough to avoid warning on 'Golgot'
- //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
+ std::cout << imageData << std::endl; // to avoid warning ?
- gdcm::DocEntry* d;
+ //First of all copy the header field by field
- 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
{
// We skip pb of SQ recursive exploration
- //std::cout << "Skipped Sequence "
- // << "------------- " << d->GetVR() << " "<< std::hex
- // << d->GetGroup() << " " << d->GetElement()
- // << std::endl;
+ 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;;
- 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 );
+
+ delete fileOr; // File
+ delete original; // FileHelper
+ delete copy; // FileHelper
return 0;
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff