X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestDataEntry.cxx;h=05755d35b1599d2eff7e97d87e808a574553c890;hb=HEAD;hp=ebd4892feac192eb7ec2ac27fd3142b57c801c91;hpb=692c278613503559a7e64e475374f3e06f6da257;p=gdcm.git diff --git a/Testing/TestDataEntry.cxx b/Testing/TestDataEntry.cxx index ebd4892f..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/23 19:46:17 $ - Version: $Revision: 1.6 $ + 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 @@ -27,32 +27,34 @@ const char fdata[] = "1.1\\2.2\\3.3\\4.4\\5.5"; const int16_t svalue[]={1,2,3,4,5}; const int32_t lvalue[]={1,2,3,4,5}; const float fvalue[]={1.1f,2.2f,3.3f,4.4f,5.5f}; -// Temporary hack, assume that long and double are correlated -#if GDCM_SIZEOF_LONG == 4 const double dvalue[]={1.1,2.2,3.3,4.4,5.5}; -#else -const float dvalue[]={1.1,2.2,3.3,4.4,5.5}; -#endif const unsigned long nbvalue = 5; -const float GDCM_EPS = 1e-6; +const double GDCM_EPS = 1e-6; /** * \brief Test the DataEntry object */ 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 = new gdcm::DataEntry(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); @@ -64,7 +66,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValueCount() << " - Must be: 1" << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } @@ -79,7 +81,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValueCount() << " - Must be: 2" << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } @@ -94,18 +96,19 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValueCount() << " - Must be: 0" << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } std::cout << std::endl; dict->Delete(); - delete entry; + entry->Delete(); //------------------------------------------------------------------ - dict = gdcm::DictEntry::New(0x0000,0x0000); - entry = new gdcm::DataEntry(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); @@ -119,7 +122,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetLength() << " - Must be: " << strlen(data) + strlen(data)%2 << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( entry->GetValueCount() != nbvalue ) @@ -129,7 +132,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValueCount() << " - Must be: " << nbvalue << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( memcmp(entry->GetBinArea(),data,entry->GetLength()) != 0 ) @@ -137,7 +140,7 @@ int TestDataEntry(int , char *[]) std::cout << " Failed" << std::endl << " Content of bin area is incorrect" << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( memcmp(entry->GetString().c_str(),data,entry->GetLength()) != 0 ) @@ -147,7 +150,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetString().c_str() << " - Must be: " << data << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } for(i=0;iGetValueCount();i++) @@ -159,19 +162,21 @@ int TestDataEntry(int , char *[]) << " Found " << entry->GetValue(i) << " - Must be " << svalue[i] << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } } std::cout << std::endl; dict->Delete(); - delete entry; + entry->Delete(); //------------------------------------------------------------------ - dict = gdcm::DictEntry::New(0x0000,0x0000); - entry = new gdcm::DataEntry(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); @@ -186,7 +191,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetLength() << " - Must be: " << nbvalue*sizeof(uint16_t) << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( memcmp(entry->GetString().c_str(),data,strlen(data)) != 0 ) @@ -196,7 +201,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetString().c_str() << " - Must be: " << data << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( entry->GetValueCount() != nbvalue ) @@ -206,7 +211,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValueCount() << " - Must be: " << nbvalue << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } for(i=0;iGetValueCount();i++) @@ -218,7 +223,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValue(i) << " - Must be: " << svalue[i] << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } } @@ -236,7 +241,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetString().c_str() << " - Must be: " << data << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( entry->GetValueCount() != nbvalue ) @@ -246,7 +251,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValueCount() << " - Must be: " << nbvalue << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } for(i=0;iGetValueCount();i++) @@ -258,19 +263,19 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValue(i) << " - Must be: " << svalue[i] << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } } std::cout << std::endl; dict->Delete(); - delete entry; + entry->Delete(); //------------------------------------------------------------------ - dict = gdcm::DictEntry::New(0x0000,0x0000); - entry = new gdcm::DataEntry(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); @@ -285,7 +290,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetLength() << " - Must be: " << nbvalue*sizeof(uint32_t) << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( memcmp(entry->GetString().c_str(),data,strlen(data)) != 0 ) @@ -295,7 +300,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetString().c_str() << " - Must be: " << data << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( entry->GetValueCount() != nbvalue ) @@ -305,7 +310,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValueCount() << " - Must be: " << nbvalue << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } for(i=0;iGetValueCount();i++) @@ -317,7 +322,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValue(i) << " - Must be: " << lvalue[i] << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } } @@ -335,7 +340,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetString().c_str() << " - Must be: " << data << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( entry->GetValueCount() != nbvalue ) @@ -345,7 +350,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValueCount() << " - Must be: " << nbvalue << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } for(i=0;iGetValueCount();i++) @@ -357,19 +362,19 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValue(i) << " - Must be: " << lvalue[i] << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } } std::cout << std::endl; dict->Delete(); - delete entry; + entry->Delete(); //------------------------------------------------------------------ - dict = gdcm::DictEntry::New(0x0000,0x0000); - entry = new gdcm::DataEntry(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); @@ -384,7 +389,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetLength() << " - Must be: " << nbvalue*sizeof(float) << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( memcmp(entry->GetString().c_str(),fdata,strlen(fdata)) != 0 ) @@ -394,7 +399,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetString().c_str() << " - Must be: " << fdata << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( entry->GetValueCount() != nbvalue ) @@ -404,7 +409,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValueCount() << " - Must be: " << nbvalue << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } for(i=0;iGetValueCount();i++) @@ -416,7 +421,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValue(i) << " - Must be: " << fvalue[i] << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } } @@ -434,7 +439,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetString().c_str() << " - Must be: " << fdata << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( entry->GetValueCount() != nbvalue ) @@ -444,7 +449,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValueCount() << " - Must be: " << nbvalue << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } for(i=0;iGetValueCount();i++) @@ -456,19 +461,19 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValue(i) << " - Must be: " << fvalue[i] << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } } std::cout << std::endl; dict->Delete(); - delete entry; + entry->Delete(); //------------------------------------------------------------------ - dict = gdcm::DictEntry::New(0x0000,0x0000); - entry = new gdcm::DataEntry(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); @@ -483,7 +488,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetLength() << " - Must be: " << nbvalue*sizeof(double) << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( memcmp(entry->GetString().c_str(),fdata,strlen(fdata)) != 0 ) @@ -493,7 +498,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetString().c_str() << " - Must be: " << fdata << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( entry->GetValueCount() != nbvalue ) @@ -503,7 +508,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValueCount() << " - Must be: " << nbvalue << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } for(i=0;iGetValueCount();i++) @@ -517,7 +522,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValue(i) << " - Must be: " << dvalue[i] << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } } @@ -535,7 +540,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetString().c_str() << " - Must be: " << fdata << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } if( entry->GetValueCount() != nbvalue ) @@ -545,7 +550,7 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValueCount() << " - Must be: " << nbvalue << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } for(i=0;iGetValueCount();i++) @@ -557,16 +562,17 @@ int TestDataEntry(int , char *[]) << " Found: " << entry->GetValue(i) << " - Must be: " << dvalue[i] << std::endl; dict->Delete(); - delete entry; + entry->Delete(); return 1; } } std::cout << std::endl; dict->Delete(); - delete entry; + entry->Delete(); //------------------------------------------------------------------ std::cout<