Program: gdcm
Module: $RCSfile: TestFromScratch.cxx,v $
Language: C++
- Date: $Date: 2004/12/10 17:10:22 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2005/02/02 10:06:32 $
+ Version: $Revision: 1.17 $
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 "gdcmDictEntry.h"
#include "gdcmDocEntry.h"
#include "gdcmBinEntry.h"
return 1;
}
- // Doesn't seems to do anything:
- dbg.SetDebug(-1);
+
+ // Doesn't seem to do anything:
+ gdcm::Debug::DebugOn();
+
// Doesn't link properly:
//gdcm::Debug::GetReference().SetDebug(1);
std::string filename = argv[1];
- //gdcm::File *f1 = new gdcm::File( "/home/malaterre/Creatis/gdcmData/012345.002.050.dcm" );
- gdcm::File *f1 = new gdcm::File( filename );
- gdcm::Header *h1 = f1->GetHeader();
+ gdcm::FileHelper *f1 = new gdcm::FileHelper( filename );
+ gdcm::File *h1 = f1->GetFile();
int dataSize = f1->GetImageDataSize();
std::cout << "DataSize: " << dataSize << std::endl;
// Since we know the image is 16bits:
- uint8_t* imageData = f1->GetImageData();
+ uint8_t *imageData = f1->GetImageData();
// Hopefully default to something
- gdcm::Header *h2 = new gdcm::Header();
-
- h1->Initialize();
- gdcm::DocEntry* d = h1->GetNextEntry();
+ gdcm::File *h2 = new gdcm::File();
// Copy of the header content
+ gdcm::DocEntry *d = h1->GetFirstEntry();
while(d)
{
- if ( gdcm::ValEntry* v = dynamic_cast<gdcm::ValEntry*>(d) )
+ if ( gdcm::ValEntry *v = dynamic_cast<gdcm::ValEntry*>(d) )
{
// Do not bother with field from private dict
- if( v->GetName() != "unkn" )
+ if( v->GetName() != "gdcm::Unknown" )
{
- h2->ReplaceOrCreateByNumber(
- v->GetValue(),
- v->GetGroup(),
- v->GetElement(),
- v->GetVR() );
+ h2->InsertValEntry( v->GetValue(),
+ v->GetGroup(),v->GetElement(),
+ v->GetVR() );
}
}
//else
}
h2->Print( std::cout );
- gdcm::File *f2 = new gdcm::File( h2 );
+ gdcm::FileHelper *f2 = new gdcm::FileHelper( h2 );
f2->SetImageData(imageData, dataSize);
f2->SetWriteTypeToDcmExplVR();