X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Example%2FTestChangeHeader.cxx;h=bbc4d6fae8a5a54857d1457e30275cebe8e5b752;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=565bd046bc9a1786c2cb390edbcb20654444dff9;hpb=b76072d99ce945573936f0d8b21a6da62aaf7a87;p=gdcm.git diff --git a/Example/TestChangeHeader.cxx b/Example/TestChangeHeader.cxx index 565bd046..bbc4d6fa 100644 --- a/Example/TestChangeHeader.cxx +++ b/Example/TestChangeHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestChangeHeader.cxx,v $ Language: C++ - Date: $Date: 2005/01/06 14:31:37 $ - Version: $Revision: 1.5 $ + Date: $Date: 2005/07/08 12:02:02 $ + Version: $Revision: 1.15 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -15,36 +15,43 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#include "gdcmHeader.h" #include "gdcmFile.h" +#include "gdcmFileHelper.h" // This examples read two images (could be the same). Try to modify // Acquisition Matrix and then write the image again -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { if (argc < 3) { std::cerr << "usage :" << std::endl << - argv[0] << " nomFichierPourEntete nomFichierPourDonnées" << + argv[0] << " fileNameForHeader fileNameForData" << std::endl; return 1; } - gdcm::Header *h1 = new gdcm::Header( argv[1] ); - gdcm::File *f1 = new gdcm::File( h1 ); - gdcm::File *f2 = new gdcm::File( argv[2] ); + gdcm::File *h1 = new gdcm::File( ); + h1->SetFileName ( argv[1] ); + h1->Load( ); + gdcm::FileHelper *f1 = new gdcm::FileHelper( h1 ); + + gdcm::File *h2 = new gdcm::File( ); + h2->SetFileName ( argv[2] ); + h2->Load( ); + gdcm::FileHelper *f2 = new gdcm::FileHelper( h2 ); + // 0018 1310 US ACQ Acquisition Matrix gdcm::DictEntry *dictEntry = - f2->GetHeader()->GetPubDict()->GetDictEntryByNumber( 0x0018, 1310 ); + f2->GetFile()->GetPubDict()->GetEntry( 0x0018, 1310 ); std::cerr << std::hex << dictEntry->GetGroup() << "," << dictEntry->GetElement() << std::endl; - std::string matrix = f2->GetHeader()->GetEntryByNumber(0x0018, 0x1310); + std::string matrix = f2->GetFile()->GetEntryValue(0x0018, 0x1310); if(matrix != "gdcm::Unfound") { std::cerr << "Aquisition Matrix:" << matrix << std::endl; - f1->GetHeader()->ReplaceOrCreateByNumber( matrix, 0x0018, 0x1310); + f1->GetFile()->InsertValEntry( matrix, 0x0018, 0x1310); } f1->GetImageData(); @@ -52,8 +59,11 @@ int main(int argc, char* argv[]) h1->Print(); f1->WriteDcmExplVR("output-matrix.dcm"); + + delete f1; + delete f2; + delete h1; + delete h2; return 0; } - -