* Update the testSuite to work perfectly

[gdcm.git] / Testing / TestChangeHeader.cxx

diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx
index 7f1d360b028a8777475c6816284630c34a56db38..23ba34535b56b174fb1eca2b9000891d7d72c7c6 100644 (file)
--- a/Testing/TestChangeHeader.cxx
+++ b/Testing/TestChangeHeader.cxx
@@ -10,7 +10,7 @@
        
        
 int main(int argc, char* argv[]) {  
-       string premier, deuxieme;
+       std::string premier, deuxieme;
        char resultat[200];
        
        gdcmFile  *f1, *f2;
@@ -33,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
        
        
@@ -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());
-       
-       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());      
 
@@ -72,6 +69,8 @@ int main(int argc, char* argv[]) {
        printf ("WriteDCM\n");
        //f1->WriteDcmImplVR(resultat); 
        f1->WriteAcr(resultat); 
+
+  return 0;
 }