X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestChangeHeader.cxx;h=23ba34535b56b174fb1eca2b9000891d7d72c7c6;hb=028c1cf98c1af5130c2b23198a50f5c351a00295;hp=7642604812e3d3ae49ea9548dc30b49606daad15;hpb=fe180328806c1528b6d7a8518780569c866dff40;p=gdcm.git

diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx
index 76426048..23ba3453 100644
--- a/Testing/TestChangeHeader.cxx
+++ b/Testing/TestChangeHeader.cxx
@@ -9,9 +9,8 @@
 	// et des pixels d'une autre image
 	
 	
-int main(int argc, char* argv[])
-{  
-	string premier, deuxieme;
+int main(int argc, char* argv[]) {  
+	std::string premier, deuxieme;
 	char resultat[200];
 	
 	gdcmFile  *f1, *f2;
@@ -34,14 +33,14 @@ int main(int argc, char* argv[])
 	
 	// On suppose que les champs DICOM du 2ieme fichier existent *effectivement*
 	
-	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
 	
 	
@@ -55,25 +54,23 @@ int main(int argc, char* argv[])
 	printf ("dataSize %d\n",dataSize);
 	imageData= f2->GetImageData();
 			
+	// TODO : ne devrait-on pas fusionner ces 2 fonctions ?
 	f1->SetImageData(imageData,dataSize);
+	f1->GetHeader()->SetImageDataSize(dataSize);
 	
-	// ou, plus joli:
-	//f1->SetImageData(f2->GetImageData(),f2->GetImageDataSize());
+	f1->GetHeader()->PrintPubElVal();
 	
-	string s0 =f2->GetPubElValByNumber(0x7fe0, 0x0000);
-	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());	
-	
-	f1->ReplaceOrCreateByNumber( f2->GetPubElValByNumber(0x7fe0, 0x0000),
-	  0x7fe0, 0x0000);
-	//f1->ReplaceOrCreateByNumber( f2->GetPubElValByNumber(0x7fe0, 0x0010),
-	//  0x7fe0, 0x0010);
 
 	sprintf(resultat, "%s.vol", deuxieme.c_str());
 	printf ("WriteDCM\n");
 	//f1->WriteDcmImplVR(resultat);	
 	f1->WriteAcr(resultat);	
+
+  return 0;
 }