#include "gdcmFile.h"
#include "gdcmDocument.h"
#include "gdcmValEntry.h"
+#include "gdcmBinEntry.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
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;
}
}
- gdcmFile *original = new gdcmFile( filename );
- gdcmFile *copy = new gdcmFile( output );
+ gdcm::File *original = new gdcm::File( filename );
+ gdcm::File *copy = new gdcm::File( output );
+
+ const gdcm::TagDocEntryHT & Ht = original->GetHeader()->GetTagHT();
+
+ size_t dataSize = original->GetImageDataSize();
+ uint8_t* imageData = original->GetImageData();
//First of all copy the header field by field
- TagNameHT & nameHt = original->GetHeader()->GetPubDict()->GetEntriesByName();
- for (TagNameHT::iterator tag = nameHt.begin(); tag != nameHt.end(); ++tag)
+
+ // 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)
{
- if (tag->second->GetVR() == "SQ") //to skip pb of SQ recursive exploration
- continue;
-
- //According to JPR I should also skip those:
-// if (tag->second->GetVR() == "unkn") //to skip pb of SQ recursive exploration
-// continue;
-
- //no clue what to do with this one
- //std::cerr << "Reading: " << tag->second->GetVR() << std::endl;
- std::string value = ((gdcmValEntry*)(tag->second))->GetValue();
-// if( value.find( "gdcm::NotLoaded" ) == 0 )
-// continue;
-
- //no clue what to do with this one
- if( value.find( "gdcm::Loaded" ) == 0 )
- continue;
-
- copy->GetHeader()->ReplaceOrCreateByNumber(
- value,
- tag->second->GetGroup(),
- tag->second->GetElement() );
+ d = tag->second;
+ 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() );
+ }
+ else
+ {
+ // We skip pb of SQ recursive exploration
+ //std::cout << "Skipped Sequence "
+ // << "------------- " << d->GetVR() << " "<< std::hex
+ // << d->GetGroup() << " " << d->GetElement()
+ // << std::endl;
+ }
}
- size_t dataSize = original->GetImageDataSize();
- void *imageData = original->GetImageData();
-
copy->SetImageData(imageData, dataSize);
- //original->GetHeader()->SetImageDataSize(dataSize);
+ original->GetHeader()->SetImageDataSize(dataSize);
+
+ copy->WriteDcmExplVR( output );
+
+ delete original;
+ delete copy;
- //copy->GetHeader()->PrintEntry();
+ copy = new gdcm::File( output );
- //copy->WriteDcmExplVR( output );
-
//Is the file written still gdcm parsable ?
- gdcmFile check( output );
- retVal += !check.GetHeader()->IsReadable();
+ if ( !copy->GetHeader()->IsReadable() )
+ {
+ retVal +=1;
+ std::cout << output << " Failed" << std::endl;
+ }
+ i++;
}
-
return retVal;
}
-
-