X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestDataEntry.cxx;h=05755d35b1599d2eff7e97d87e808a574553c890;hb=HEAD;hp=ccfe73a5dcb997d4756cb0300cec2fb53fa54e4e;hpb=647c1b734961a8741a1c8f13f1080fc2966a0075;p=gdcm.git diff --git a/Testing/TestDataEntry.cxx b/Testing/TestDataEntry.cxx index ccfe73a5..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: 2006/03/22 13:20:36 $ - Version: $Revision: 1.10 $ + 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,15 +37,17 @@ 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(0x0003,0x0004); + 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::DataEntry::New(dict); + entry = GDCM_NAME_SPACE::DataEntry::New(dict); std::cout << "Test for VR = " << dict->GetVR() << "..." << std::endl; @@ -103,10 +105,10 @@ int TestDataEntry(int , char *[]) entry->Delete(); //------------------------------------------------------------------ - dict = gdcm::DictEntry::New(0x0000,0x0000); + dict = GDCM_NAME_SPACE::DictEntry::New(0x0000,0x0000); // SetVR *before* making the DataEntry! dict->SetVR("LT"); - entry = gdcm::DataEntry::New(dict); + entry = GDCM_NAME_SPACE::DataEntry::New(dict); std::cout << "Test for VR = " << dict->GetVR() << "..." << std::endl; entry->SetString(data); @@ -170,10 +172,10 @@ int TestDataEntry(int , char *[]) entry->Delete(); //------------------------------------------------------------------ - dict = gdcm::DictEntry::New(0x0000,0x0000); + dict = GDCM_NAME_SPACE::DictEntry::New(0x0000,0x0000); // SetVR *before* making the DataEntry! dict->SetVR("US"); - entry = gdcm::DataEntry::New(dict); + entry = GDCM_NAME_SPACE::DataEntry::New(dict); std::cout << "Test for VR = " << dict->GetVR() << "..." << std::endl; @@ -271,9 +273,9 @@ int TestDataEntry(int , char *[]) entry->Delete(); //------------------------------------------------------------------ - dict = gdcm::DictEntry::New(0x0000,0x0000); + dict = GDCM_NAME_SPACE::DictEntry::New(0x0000,0x0000); dict->SetVR("UL"); - entry = gdcm::DataEntry::New(dict); + entry = GDCM_NAME_SPACE::DataEntry::New(dict); std::cout << "Test for VR = " << dict->GetVR() << "..." << std::endl; entry->SetString(data); @@ -370,9 +372,9 @@ int TestDataEntry(int , char *[]) entry->Delete(); //------------------------------------------------------------------ - dict = gdcm::DictEntry::New(0x0000,0x0000); + dict = GDCM_NAME_SPACE::DictEntry::New(0x0000,0x0000); dict->SetVR("FL"); - entry = gdcm::DataEntry::New(dict); + entry = GDCM_NAME_SPACE::DataEntry::New(dict); std::cout << "Test for VR = " << dict->GetVR() << "..." << std::endl; entry->SetString(fdata); @@ -469,9 +471,9 @@ int TestDataEntry(int , char *[]) entry->Delete(); //------------------------------------------------------------------ - dict = gdcm::DictEntry::New(0x0000,0x0000); + dict = GDCM_NAME_SPACE::DictEntry::New(0x0000,0x0000); dict->SetVR("FD"); - entry = gdcm::DataEntry::New(dict); + entry = GDCM_NAME_SPACE::DataEntry::New(dict); std::cout << "Test for VR = " << dict->GetVR() << "..." << std::endl; entry->SetString(fdata); @@ -571,5 +573,6 @@ int TestDataEntry(int , char *[]) //------------------------------------------------------------------ std::cout<