From 780e1395c5528db42e3470a3a3a0f6c545f88f54 Mon Sep 17 00:00:00 2001 From: jpr Date: Fri, 16 Jan 2004 08:51:03 +0000 Subject: [PATCH] to follow class modifications --- Testing/TestChangeHeader.cxx | 15 ++++++++------- gdcmPython/gdcm.i | 2 -- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx index 23ba3453..a6bbb165 100644 --- a/Testing/TestChangeHeader.cxx +++ b/Testing/TestChangeHeader.cxx @@ -33,21 +33,22 @@ int main(int argc, char* argv[]) { // On suppose que les champs DICOM du 2ieme fichier existent *effectivement* - std::string nbFrames = f2->GetHeader()->GetPubElValByNumber(0x0028, 0x0008); + std::string nbFrames = f2->GetHeader()->GetEntryByNumber(0x0028, 0x0008); if(nbFrames != "gdcm::Unfound") { f1->GetHeader()->ReplaceOrCreateByNumber( nbFrames, 0x0028, 0x0008); } - f1->GetHeader()->ReplaceOrCreateByNumber(f2->GetHeader()->GetPubElValByNumber(0x0028, 0x0010), + f1->GetHeader()->ReplaceOrCreateByNumber(f2->GetHeader()->GetEntryByNumber(0x0028, 0x0010), 0x0028, 0x0010);// nbLig - f1->GetHeader()->ReplaceOrCreateByNumber( f2->GetHeader()->GetPubElValByNumber(0x0028, 0x0011), + f1->GetHeader()->ReplaceOrCreateByNumber( f2->GetHeader()->GetEntryByNumber(0x0028, 0x0011), 0x0028, 0x0011);// nbCol // sans doute d'autres à mettre à jour... // TODO : rajouter une valeur par defaut. - // TODO : une routine qui recoit une liste de couples (gr,el), et qui fasse le boulot. + // TODO : une routine qui recoit une liste de couples (gr,el), + // et qui fasse le boulot. dataSize = f2->GetImageDataSize(); @@ -58,10 +59,10 @@ int main(int argc, char* argv[]) { f1->SetImageData(imageData,dataSize); f1->GetHeader()->SetImageDataSize(dataSize); - f1->GetHeader()->PrintPubElVal(); + f1->GetHeader()->PrintPubEntry(); - std::string s0 =f2->GetHeader()->GetPubElValByNumber(0x7fe0, 0x0000); - std::string s10=f2->GetHeader()->GetPubElValByNumber(0x7fe0, 0x0010); + std::string s0 =f2->GetHeader()->GetPubEntryByNumber(0x7fe0, 0x0000); + std::string s10=f2->GetHeader()->GetPubEntryByNumber(0x7fe0, 0x0010); printf("lgr 7fe0, 0000 %s\n",s0.c_str()); printf("lgr 7fe0, 0010 %s\n",s10.c_str()); diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i index 7e7f40f5..11b81804 100644 --- a/gdcmPython/gdcm.i +++ b/gdcmPython/gdcm.i @@ -5,7 +5,6 @@ #include "gdcmDict.h" #include "gdcmDictSet.h" #include "gdcmHeaderEntry.h" -#include "gdcmHeaderEntrySet.h" #include "gdcmHeader.h" #include "gdcmHeaderHelper.h" #include "gdcmFile.h" @@ -111,7 +110,6 @@ extern gdcmGlobal gdcmGlob; %include "gdcmDict.h" %include "gdcmDictSet.h" %include "gdcmHeaderEntry.h" -%include "gdcmHeaderEntrySet.h" %include "gdcmHeader.h" %include "gdcmHeaderHelper.h" %include "gdcmFile.h" -- 2.48.1