X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestDataEntry.cxx;h=05755d35b1599d2eff7e97d87e808a574553c890;hb=HEAD;hp=f0dc13f594b48e4c9727e351684bdaff91a08e53;hpb=4f189b7cd8d7aff962887245b7b30ede39b7856c;p=gdcm.git

diff --git a/Testing/TestDataEntry.cxx b/Testing/TestDataEntry.cxx
index f0dc13f5..05755d35 100644
--- a/Testing/TestDataEntry.cxx
+++ b/Testing/TestDataEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestDataEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/24 16:00:46 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2008/09/15 15:49:21 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,17 +37,24 @@ const double GDCM_EPS = 1e-6;
   */  
 int TestDataEntry(int , char *[])
 {
+   /* Most of the tests are out of date! 
+   (we don't use any longer DictEntry to build a DocEntry!
+   
    unsigned int i;
-   gdcm::DictEntry *dict;
-   gdcm::DataEntry *entry;
-
-   //------------------------------------------------------------------
-   dict = gdcm::DictEntry::New(0x0000,0x0000);
-   entry = gdcm::DataEntry::New(dict);
-   dict->SetVR("US");
+   GDCM_NAME_SPACE::DictEntry *dict;
+   GDCM_NAME_SPACE::DataEntry *entry;
+      
+   dict = GDCM_NAME_SPACE::DictEntry::New(0x0003,0x0004);
+   // SetVR *before* making the DataEntry!
+   dict->SetVR("US");   
+   entry = GDCM_NAME_SPACE::DataEntry::New(dict);
 
    std::cout << "Test for VR = " << dict->GetVR() << "..." << std::endl;
 
+   std::cout << "TagKey : [" << entry->GetKey() << "]" << std::endl;
+   std::cout << "Group : [" << entry->GetGroup() << "]" << std::endl; 
+   std::cout << "Element : [" << entry->GetElement() << "]" << std::endl; 
+      
    entry->SetString("1");
    std::cout << "1: ";
    entry->Print(std::cout);
@@ -98,9 +105,10 @@ int TestDataEntry(int , char *[])
    entry->Delete();
 
    //------------------------------------------------------------------
-   dict = gdcm::DictEntry::New(0x0000,0x0000);
-   entry = gdcm::DataEntry::New(dict);
+   dict = GDCM_NAME_SPACE::DictEntry::New(0x0000,0x0000);
+   // SetVR *before* making the DataEntry!   
    dict->SetVR("LT");
+   entry = GDCM_NAME_SPACE::DataEntry::New(dict);
 
    std::cout << "Test for VR = " << dict->GetVR() << "..." << std::endl;
    entry->SetString(data);
@@ -164,9 +172,11 @@ int TestDataEntry(int , char *[])
    entry->Delete();
 
    //------------------------------------------------------------------
-   dict = gdcm::DictEntry::New(0x0000,0x0000);
-   entry = gdcm::DataEntry::New(dict);
+   dict = GDCM_NAME_SPACE::DictEntry::New(0x0000,0x0000);
+   // SetVR *before* making the DataEntry! 
    dict->SetVR("US");
+   entry = GDCM_NAME_SPACE::DataEntry::New(dict);
+
 
    std::cout << "Test for VR = " << dict->GetVR() << "..." << std::endl;
    entry->SetString(data);
@@ -263,9 +273,9 @@ int TestDataEntry(int , char *[])
    entry->Delete();
 
    //------------------------------------------------------------------
-   dict = gdcm::DictEntry::New(0x0000,0x0000);
-   entry = gdcm::DataEntry::New(dict);
+   dict = GDCM_NAME_SPACE::DictEntry::New(0x0000,0x0000);
    dict->SetVR("UL");
+   entry = GDCM_NAME_SPACE::DataEntry::New(dict);
 
    std::cout << "Test for VR = " << dict->GetVR() << "..." << std::endl;
    entry->SetString(data);
@@ -362,9 +372,9 @@ int TestDataEntry(int , char *[])
    entry->Delete();
 
    //------------------------------------------------------------------
-   dict = gdcm::DictEntry::New(0x0000,0x0000);
-   entry = gdcm::DataEntry::New(dict);
+   dict = GDCM_NAME_SPACE::DictEntry::New(0x0000,0x0000);
    dict->SetVR("FL");
+   entry = GDCM_NAME_SPACE::DataEntry::New(dict);
 
    std::cout << "Test for VR = " << dict->GetVR() << "..." << std::endl;
    entry->SetString(fdata);
@@ -461,9 +471,9 @@ int TestDataEntry(int , char *[])
    entry->Delete();
 
    //------------------------------------------------------------------
-   dict = gdcm::DictEntry::New(0x0000,0x0000);
-   entry = gdcm::DataEntry::New(dict);
+   dict = GDCM_NAME_SPACE::DictEntry::New(0x0000,0x0000);
    dict->SetVR("FD");
+   entry = GDCM_NAME_SPACE::DataEntry::New(dict);
 
    std::cout << "Test for VR = " << dict->GetVR() << "..." << std::endl;
    entry->SetString(fdata);
@@ -563,5 +573,6 @@ int TestDataEntry(int , char *[])
 
    //------------------------------------------------------------------
    std::cout<<std::flush;
+   */
    return 0;
 }