X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestAllEntryVerify.cxx;h=adcf230699a5c32217b448900d6e6902b022af38;hb=5544a1627fc9bb02b2d4c20b4ffa3ba8fa81c0ae;hp=995dcf26ac838a5a76fc2bbca008d716c200476d;hpb=2837a6b7c035eca52b4d6883de23f90b5633a0e6;p=gdcm.git diff --git a/Testing/TestAllEntryVerify.cxx b/Testing/TestAllEntryVerify.cxx index 995dcf26..adcf2306 100644 --- a/Testing/TestAllEntryVerify.cxx +++ b/Testing/TestAllEntryVerify.cxx @@ -1,9 +1,27 @@ -#include "gdcmHeader.h" +/*========================================================================= + + Program: gdcm + Module: $RCSfile: TestAllEntryVerify.cxx,v $ + Language: C++ + Date: $Date: 2005/01/27 10:47:29 $ + Version: $Revision: 1.23 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ +#include "gdcmFile.h" #include #include #include #include +#include //Generated file: #include "gdcmDataImages.h" @@ -32,6 +50,17 @@ std::string ParserException::Indent = " "; class ReferenceFileParser { +public: + ReferenceFileParser(); + ~ReferenceFileParser(); + + bool Open( std::string& referenceFileName ); + void Print(); + void SetDataPath(std::string&); + bool Check(); + bool Check( std::string fileName ); + +private: bool AddKeyValuePairToMap( std::string& key, std::string& value ); std::istream& eatwhite(std::istream& is); @@ -39,20 +68,16 @@ class ReferenceFileParser std::string ExtractFirstString(std::string& toSplit); void CleanUpLine( std::string& line ); + bool Check( MapFileValuesType::iterator &fileIt ); std::string ExtractValue(std::string& toSplit) throw ( ParserException ); - void ParseRegularLine( std::string& line ) throw ( ParserException ); - void FirstPassReferenceFile() throw ( ParserException ); - bool SecondPassReferenceFile() throw ( ParserException ); - void HandleFileName( std::string& line ) throw ( ParserException ); - void HandleKey( std::string& line ) throw ( ParserException ); - bool HandleValue( std::string& line ) throw ( ParserException ); + void ParseRegularLine( std::string& line ) throw ( ParserException ); + void FirstPassReferenceFile() throw ( ParserException ); + bool SecondPassReferenceFile() throw ( ParserException ); + void HandleFileName( std::string& line ) throw ( ParserException ); + void HandleKey( std::string& line ) throw ( ParserException ); + bool HandleValue( std::string& line ) throw ( ParserException ); static uint16_t axtoi( char* ); -public: - ReferenceFileParser(); - bool Open( std::string& referenceFileName ); - void Print(); - void SetDataPath(std::string&); - bool Check(); + private: /// The directory containing the images to check: std::string DataPath; @@ -82,38 +107,57 @@ private: MapEntryValues* CurrentMapEntryValuesPtr; }; +ReferenceFileParser::ReferenceFileParser() +{ + lineNumber = 1; + Indent = " "; +} + +ReferenceFileParser::~ReferenceFileParser() +{ + for (MapFileValuesType::iterator i = ProducedMap.begin(); + i != ProducedMap.end(); + ++i) + { + delete i->second; + } +} + /// As gotten from: /// http://community.borland.com/article/0,1410,17203,0.html -uint16_t ReferenceFileParser::axtoi(char *hexStg) { - int n = 0; // position in string - int m = 0; // position in digit[] to shift - int count; // loop index - int intValue = 0; // integer value of hex string - int digit[5]; // hold values to convert - while (n < 4) { - if (hexStg[n]=='\0') - break; - if (hexStg[n] > 0x29 && hexStg[n] < 0x40 ) //if 0 to 9 - digit[n] = hexStg[n] & 0x0f; //convert to int - else if (hexStg[n] >='a' && hexStg[n] <= 'f') //if a to f - digit[n] = (hexStg[n] & 0x0f) + 9; //convert to int - else if (hexStg[n] >='A' && hexStg[n] <= 'F') //if A to F - digit[n] = (hexStg[n] & 0x0f) + 9; //convert to int - else break; - n++; - } - count = n; - m = n - 1; - n = 0; - while(n < count) { - // digit[n] is value of hex digit at position n - // (m << 2) is the number of positions to shift - // OR the bits into return value - intValue = intValue | (digit[n] << (m << 2)); - m--; // adjust the position to set - n++; // next digit to process - } - return intValue; +uint16_t ReferenceFileParser::axtoi(char *hexStg) +{ + int n = 0; // position in string + int m = 0; // position in digit[] to shift + int count; // loop index + int intValue = 0; // integer value of hex string + int digit[5]; // hold values to convert + while (n < 4) + { + if (hexStg[n]=='\0') + break; + if (hexStg[n] > 0x29 && hexStg[n] < 0x40 ) //if 0 to 9 + digit[n] = hexStg[n] & 0x0f; //convert to int + else if (hexStg[n] >='a' && hexStg[n] <= 'f') //if a to f + digit[n] = (hexStg[n] & 0x0f) + 9; //convert to int + else if (hexStg[n] >='A' && hexStg[n] <= 'F') //if A to F + digit[n] = (hexStg[n] & 0x0f) + 9; //convert to int + else break; + n++; + } + count = n; + m = n - 1; + n = 0; + while(n < count) + { + // digit[n] is value of hex digit at position n + // (m << 2) is the number of positions to shift + // OR the bits into return value + intValue = intValue | (digit[n] << (m << 2)); + m--; // adjust the position to set + n++; // next digit to process + } + return intValue; } void ReferenceFileParser::SetDataPath( std::string& inDataPath ) @@ -121,7 +165,8 @@ void ReferenceFileParser::SetDataPath( std::string& inDataPath ) DataPath = inDataPath; } -bool ReferenceFileParser::AddKeyValuePairToMap( std::string& key, std::string& value ) +bool ReferenceFileParser::AddKeyValuePairToMap( std::string& key, + std::string& value ) { if ( !CurrentMapEntryValuesPtr ) return false; @@ -156,55 +201,79 @@ void ReferenceFileParser::Print() bool ReferenceFileParser::Check() { + bool ret = true; for (MapFileValuesType::iterator i = ProducedMap.begin(); i != ProducedMap.end(); ++i) { - std::string fileName = DataPath + i->first; - std::cout << Indent << "FileName: " << fileName << std::endl; - gdcm::Header* tested = new gdcm::Header( fileName.c_str() ); - if( !tested->IsReadable() ) - { - std::cerr << Indent << "Image not gdcm compatible:" + ret &= Check(i); + } + std::cout << Indent << std::endl; + return ret; +} + +bool ReferenceFileParser::Check( std::string fileName ) +{ + MapFileValuesType::iterator it = ProducedMap.find(fileName); + if( it != ProducedMap.end() ) + { + return Check(it); + } + std::cerr << Indent << "Failed\n" + << Indent << "Image not found :" << fileName << std::endl; - delete tested; - return false; - } + return false; +} - MapEntryValuesPtr KeyValues = i->second; - for (MapEntryValues::iterator j = KeyValues->begin(); - j != KeyValues->end(); - ++j) - { - std::string key = j->first; +bool ReferenceFileParser::Check( MapFileValuesType::iterator &fileIt ) +{ + std::string fileName = DataPath + fileIt->first; + std::cout << Indent << "FileName: " << fileName << std::endl; + gdcm::File* tested = new gdcm::File( fileName.c_str() ); + if( !tested->IsReadable() ) + { + std::cerr << Indent << "Failed\n" + << Indent << "Image not gdcm compatible:" + << fileName << std::endl; + delete tested; + return false; + } - std::string groupString = key.substr( 0, 4 ); - char* groupCharPtr; - groupCharPtr = new char(groupString.length() + 1); - strcpy( groupCharPtr, groupString.c_str() ); + MapEntryValuesPtr KeyValues = fileIt->second; + for (MapEntryValues::iterator j = KeyValues->begin(); + j != KeyValues->end(); + ++j) + { + std::string key = j->first; - std::string groupElement = key.substr( key.find_first_of( "|" ) + 1, 4 ); - char* groupElementPtr; - groupElementPtr = new char(groupElement.length() + 1); - strcpy( groupElementPtr, groupElement.c_str() ); + std::string groupString = key.substr( 0, 4 ); + std::string groupElement = key.substr( key.find_first_of( "|" ) + 1, 4 ); - uint16_t group = axtoi( groupCharPtr ); - uint16_t element = axtoi( groupElementPtr ); + uint16_t group = axtoi( &(groupString[0]) ); + uint16_t element = axtoi( &(groupElement[0]) ); - std::string testedValue = tested->GetEntryByNumber(group, element); - if ( testedValue != j->second ) + std::string testedValue = tested->GetEntryValue(group, element); + if ( testedValue != j->second ) + { + // Oops make sure this is only the \0 that differ + if( testedValue[j->second.size()] != '\0' || + strncmp(testedValue.c_str(), + j->second.c_str(), j->second.size()) != 0) { - std::cout << Indent << "Uncorrect value for key " << key << std::endl - << Indent << " read value [" << testedValue << "]" << std::endl - << Indent << " reference value [" << j->second << "]" - << std::endl; + std::cout << Indent << "Failed\n" + << Indent << "Uncorrect value for key " + << key << std::endl + << Indent << " read value [" + << testedValue << "]" << std::endl + << Indent << " reference value [" + << j->second << "]" << std::endl; return false; } } - delete tested; - std::cout << Indent << " OK" << std::endl; } - std::cout << Indent << std::endl; + delete tested; + std::cout << Indent << " OK" << std::endl; + return true; } @@ -249,8 +318,10 @@ std::string ReferenceFileParser::ExtractValue( std::string& toSplit ) std::string::size_type endPos = toSplit.find_last_of( '"' ); // Make sure we have at most two " in toSplit: - std::string noQuotes = toSplit.substr( beginPos + 1, endPos - beginPos - 1); - if ( noQuotes.find_first_of( '"' ) != std::string::npos ) + //std::string noQuotes = toSplit.substr( beginPos + 1, endPos - beginPos - 1); + //if ( noQuotes.find_first_of( '"' ) != std::string::npos ) + // throw ParserException( "more than two quote character" ); + if ( toSplit.find_first_of( '"',beginPos+1 ) != endPos ) throw ParserException( "more than two quote character" ); // No leading quote means this is not a value: @@ -406,12 +477,6 @@ void ReferenceFileParser::FirstPassReferenceFile() throw ( ParserException ) from.seekg( 0, std::ios::beg ); } -ReferenceFileParser::ReferenceFileParser() -{ - lineNumber = 1; - Indent = " "; -} - bool ReferenceFileParser::Open( std::string& referenceFileName ) { from.open( referenceFileName.c_str(), std::ios::in ); @@ -585,10 +650,10 @@ bool ReferenceFileParser::SecondPassReferenceFile() int TestAllEntryVerify(int argc, char* argv[]) { - if ( argc > 1 ) + if ( argc > 2 ) { std::cerr << " Usage: " << argv[0] - << " (no arguments needed)." << std::endl; + << " fileName" << std::endl; return 1; } @@ -604,7 +669,8 @@ int TestAllEntryVerify(int argc, char* argv[]) std::cout << " apply the following tests : "<< std::endl; std::cout << " step 1: parse the image and call IsReadable(). " << std::endl; std::cout << " step 2: look for the entry corresponding to the image" << std::endl; - std::cout << " in the reference file: " << referenceFilename << std::endl; + std::cout << " in the reference file: \n" + << " " << referenceFilename << std::endl; std::cout << " step 3: check that each reference tag value listed for this" << std::endl; std::cout << " entry matches the tag encountered at parsing step 1." @@ -613,13 +679,24 @@ int TestAllEntryVerify(int argc, char* argv[]) ReferenceFileParser Parser; if ( !Parser.Open(referenceFilename) ) { - std::cout << " Corrupted reference file name: " - << referenceFilename << std::endl; + std::cout << " failed" + << " Corrupted reference file name: " + << referenceFilename << std::endl; return 1; } Parser.SetDataPath(referenceDir); // Parser.Print(); - if ( Parser.Check() ) - return 0; - return 1; + std::cout << "Reference file loaded -->\n" + << "Check files : \n"; + + int ret; + if ( argc >= 2 ) + { + ret = Parser.Check( argv[1] ); + } + else + { + ret = Parser.Check(); + } + return !ret; }