From d9f195b44e7bfee584fb53a10bc6342027ebbab4 Mon Sep 17 00:00:00 2001
From: jpr <jpr>
Date: Tue, 23 Dec 2003 10:03:01 +0000
Subject: [PATCH] some modif to be new gdcmHeader/gdcmFile compliant

---
 Testing/CMakeLists.txt       | 12 ++++++++++++
 Testing/TestChangeHeader.cxx | 19 ++++++++-----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index aff9d67a..9e49ddfc 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -25,6 +25,17 @@ INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src/
 )
 
+<<<<<<< CMakeLists.txt
+SET(dcm2acr_SOURCES
+  dcm2acr.cxx
+)
+ADD_EXECUTABLE(dcm2acr ${dcm2acr_SOURCES})
+
+SET(explDICOMDIR_SOURCES
+  explDICOMDIR.cxx
+)
+ADD_EXECUTABLE(explDICOMDIR ${explDICOMDIR_SOURCES})
+=======
 # Loop over files and create executables
 FOREACH(file ${TEST_SOURCES})
   #Doh ! I need to specify each time the compile flags !
@@ -38,3 +49,4 @@ FOREACH(file ${TEST_SOURCES})
   ADD_EXECUTABLE(${name} ${file})
   TARGET_LINK_LIBRARIES(${name} gdcm)
 ENDFOREACH(file ${TEST_SOURCES})
+>>>>>>> 1.4
diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx
index abaf2f6e..23ba3453 100644
--- a/Testing/TestChangeHeader.cxx
+++ b/Testing/TestChangeHeader.cxx
@@ -33,14 +33,14 @@ int main(int argc, char* argv[]) {
 	
 	// On suppose que les champs DICOM du 2ieme fichier existent *effectivement*
 	
-	std::string nbFrames = f2->GetPubElValByNumber(0x0028, 0x0008);
+	std::string nbFrames = f2->GetHeader()->GetPubElValByNumber(0x0028, 0x0008);
 	if(nbFrames != "gdcm::Unfound") {
-           f1->ReplaceOrCreateByNumber( nbFrames, 0x0028, 0x0008);
+           f1->GetHeader()->ReplaceOrCreateByNumber( nbFrames, 0x0028, 0x0008);
         }
          
-	f1->ReplaceOrCreateByNumber( f2->GetPubElValByNumber(0x0028, 0x0010),
+	f1->GetHeader()->ReplaceOrCreateByNumber(f2->GetHeader()->GetPubElValByNumber(0x0028, 0x0010),
 	  0x0028, 0x0010);// nbLig
-	f1->ReplaceOrCreateByNumber( f2->GetPubElValByNumber(0x0028, 0x0011),
+	f1->GetHeader()->ReplaceOrCreateByNumber( f2->GetHeader()->GetPubElValByNumber(0x0028, 0x0011),
           0x0028, 0x0011);// nbCol
 	
 	
@@ -56,15 +56,12 @@ int main(int argc, char* argv[]) {
 			
 	// TODO : ne devrait-on pas fusionner ces 2 fonctions ?
 	f1->SetImageData(imageData,dataSize);
-	f1->SetImageDataSize(dataSize);
+	f1->GetHeader()->SetImageDataSize(dataSize);
 	
-	f1->PrintPubElVal();
+	f1->GetHeader()->PrintPubElVal();
 	
-	// ou, plus joli:
-	//f1->SetImageData(f2->GetImageData(),f2->GetImageDataSize());
-	
-	std::string s0 =f2->GetPubElValByNumber(0x7fe0, 0x0000);
-	std::string s10=f2->GetPubElValByNumber(0x7fe0, 0x0010);
+	std::string s0 =f2->GetHeader()->GetPubElValByNumber(0x7fe0, 0x0000);
+	std::string s10=f2->GetHeader()->GetPubElValByNumber(0x7fe0, 0x0010);
 	printf("lgr 7fe0, 0000 %s\n",s0.c_str());
 	printf("lgr 7fe0, 0010 %s\n",s10.c_str());	
 
-- 
2.45.1