+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: TestAllEntryVerify.cxx,v $
+ Language: C++
+ Date: $Date: 2005/01/08 15:03:58 $
+ Version: $Revision: 1.18 $
+
+ 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 "gdcmHeader.h"
+
#include <map>
#include <list>
#include <fstream>
#include <iostream>
-#include "gdcmHeader.h"
//Generated file:
#include "gdcmDataImages.h"
-using namespace std;
-
-typedef string EntryValueType; // same type as gdcmValEntry::value
-typedef map< gdcmTagKey, EntryValueType > MapEntryValues;
+typedef std::string EntryValueType; // same type as ValEntry::value
+typedef std::map< gdcm::TagKey, EntryValueType > MapEntryValues;
typedef MapEntryValues* MapEntryValuesPtr;
-typedef string FileNameType;
-typedef map< FileNameType, MapEntryValuesPtr > MapFileValuesType;
+typedef std::string FileNameType;
+typedef std::map< FileNameType, MapEntryValuesPtr > MapFileValuesType;
struct ParserException
{
- string error;
- static string Indent;
+ std::string error;
+ static std::string Indent;
- static string GetIndent() { return ParserException::Indent; }
- ParserException( string ErrorMessage )
+ static std::string GetIndent() { return ParserException::Indent; }
+ ParserException( std::string ErrorMessage )
{
error = ErrorMessage;
Indent = " ";
}
- void Print() { cerr << Indent << error << endl; }
+ void Print() { std::cerr << Indent << error << std::endl; }
};
-string ParserException::Indent = " ";
+std::string ParserException::Indent = " ";
class ReferenceFileParser
{
- bool AddKeyValuePairToMap( string& key, string& value );
+public:
+ 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 );
- istream& eatwhite(istream& is);
- void eatwhite(string& toClean);
- string ExtractFirstString(string& toSplit);
- void CleanUpLine( string& line );
+ std::istream& eatwhite(std::istream& is);
+ void eatwhite(std::string& toClean);
+ std::string ExtractFirstString(std::string& toSplit);
+ void CleanUpLine( std::string& line );
- string ExtractValue(string& toSplit) throw ( ParserException );
- void ParseRegularLine( string& line ) throw ( ParserException );
+ 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( string& line ) throw ( ParserException );
- void HandleKey( string& line ) throw ( ParserException );
- bool HandleValue( string& line ) 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( string& referenceFileName );
- void Print();
- void SetDataPath(string&);
- bool Check();
private:
/// The directory containing the images to check:
- string DataPath;
+ std::string DataPath;
/// The product of the parser:
MapFileValuesType ProducedMap;
/// The ifstream attached to the file we parse:
- ifstream from;
+ std::ifstream from;
/// String prefixing every output
- string Indent;
+ std::string Indent;
/// The current line position within the stream:
int lineNumber;
/// The currently parsed filename:
- string CurrentFileName;
+ std::string CurrentFileName;
/// The currently parsed key:
- string CurrentKey;
+ std::string CurrentKey;
/// The currently parsed value:
- string CurrentValue;
+ std::string CurrentValue;
/// The current MapEntryValues pointer:
MapEntryValues* CurrentMapEntryValuesPtr;
m--; // adjust the position to set
n++; // next digit to process
}
- return (intValue);
+ return intValue;
}
-void ReferenceFileParser::SetDataPath( string& inDataPath )
+void ReferenceFileParser::SetDataPath( std::string& inDataPath )
{
DataPath = inDataPath;
}
-bool ReferenceFileParser::AddKeyValuePairToMap( string& key, string& value )
+bool ReferenceFileParser::AddKeyValuePairToMap( std::string& key,
+ std::string& value )
{
if ( !CurrentMapEntryValuesPtr )
return false;
if ( CurrentMapEntryValuesPtr->count(key) != 0 )
return false;
(*CurrentMapEntryValuesPtr)[key] = value;
+
+ return true; //??
}
void ReferenceFileParser::Print()
i != ProducedMap.end();
++i)
{
- cout << Indent << "FileName: " << i->first << endl;
+ std::cout << Indent << "FileName: " << i->first << std::endl;
MapEntryValuesPtr KeyValues = i->second;
for (MapEntryValues::iterator j = KeyValues->begin();
j != KeyValues->end();
++j)
{
- cout << Indent
+ std::cout << Indent
<< " Key: " << j->first
<< " Value: " << j->second
- << endl;
+ << std::endl;
}
- cout << Indent << endl;
+ std::cout << Indent << std::endl;
}
- cout << Indent << endl;
+ std::cout << Indent << std::endl;
}
bool ReferenceFileParser::Check()
{
+ bool ret = true;
for (MapFileValuesType::iterator i = ProducedMap.begin();
i != ProducedMap.end();
++i)
{
- string fileName = DataPath + i->first;
- cout << Indent << "FileName: " << fileName << endl;
- gdcmHeader* tested = new gdcmHeader( fileName.c_str(), false, true );
- if( !tested->IsReadable() )
- {
- cerr << Indent << "Image not gdcm compatible:"
- << fileName << endl;
- delete tested;
- return false;
- }
+ ret &= Check(i);
+ }
+ std::cout << Indent << std::endl;
+ return ret;
+}
- MapEntryValuesPtr KeyValues = i->second;
- for (MapEntryValues::iterator j = KeyValues->begin();
- j != KeyValues->end();
- ++j)
- {
- string key = j->first;
+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;
+ return false;
+}
- string groupString = key.substr( 0, 4 );
- char* groupCharPtr;
- groupCharPtr = new char(groupString.length() + 1);
- strcpy( groupCharPtr, groupString.c_str() );
+bool ReferenceFileParser::Check( MapFileValuesType::iterator &fileIt )
+{
+ std::string fileName = DataPath + fileIt->first;
+ std::cout << Indent << "FileName: " << fileName << std::endl;
+ gdcm::Header* tested = new gdcm::Header( fileName.c_str() );
+ if( !tested->IsReadable() )
+ {
+ std::cerr << Indent << "Failed\n"
+ << Indent << "Image not gdcm compatible:"
+ << fileName << std::endl;
+ delete tested;
+ return false;
+ }
- string groupElement = key.substr( key.find_first_of( "|" ) + 1, 4 );
- char* groupElementPtr;
- groupElementPtr = new char(groupElement.length() + 1);
- strcpy( groupElementPtr, groupElement.c_str() );
+ MapEntryValuesPtr KeyValues = fileIt->second;
+ for (MapEntryValues::iterator j = KeyValues->begin();
+ j != KeyValues->end();
+ ++j)
+ {
+ std::string key = j->first;
+
+ 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]) );
- string testedValue = tested->GetEntryByNumber(group, element);
- if ( testedValue != j->second )
+ std::string testedValue = tested->GetEntry(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)
{
- cout << Indent << "Uncorrect value for key " << key << endl
- << Indent << " read value " << testedValue << endl
- << Indent << " reference value " << j->second << 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;
- cout << Indent << endl;
}
- cout << Indent << endl;
+ delete tested;
+ std::cout << Indent << " OK" << std::endl;
+
+ return true;
}
-istream& ReferenceFileParser::eatwhite( istream& is )
+std::istream& ReferenceFileParser::eatwhite( std::istream& is )
{
char c;
while (is.get(c)) {
return is;
}
-void ReferenceFileParser::eatwhite( string& toClean )
+void ReferenceFileParser::eatwhite( std::string& toClean )
{
while( toClean.find_first_of( " " ) == 0 )
toClean.erase( 0, toClean.find_first_of( " " ) + 1 );
}
-string ReferenceFileParser::ExtractFirstString( string& toSplit )
+std::string ReferenceFileParser::ExtractFirstString( std::string& toSplit )
{
std::string firstString;
eatwhite( toSplit );
- if ( toSplit.find( " " ) == string::npos ) {
+ if ( toSplit.find( " " ) == std::string::npos ) {
firstString = toSplit;
toSplit.erase();
return firstString;
return firstString;
}
-string ReferenceFileParser::ExtractValue( string& toSplit )
+std::string ReferenceFileParser::ExtractValue( std::string& toSplit )
throw ( ParserException )
{
eatwhite( toSplit );
- string::size_type beginPos = toSplit.find_first_of( '"' );
- string::size_type endPos = toSplit.find_last_of( '"' );
-
- // Make sure we have at most to " in toSplit:
- string noQuotes = toSplit.substr( beginPos + 1, endPos - beginPos - 1);
- if ( noQuotes.find_first_of( '"' ) != string::npos )
+ std::string::size_type beginPos = toSplit.find_first_of( '"' );
+ 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 )
+ // 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:
- if ( beginPos == string::npos )
+ if ( beginPos == std::string::npos )
{
- return string();
+ return std::string();
}
- if ( ( endPos == string::npos ) || ( beginPos == endPos ) )
+ if ( ( endPos == std::string::npos ) || ( beginPos == endPos ) )
throw ParserException( "unmatched \" (quote character)" );
if ( beginPos != 0 )
{
- ostringstream error;
+ std::ostringstream error;
error << "leading character ["
<< toSplit.substr(beginPos -1, 1)
<< "] before opening \" ";
if ( ( endPos != toSplit.length() - 1 )
&& ( toSplit.substr(endPos + 1, 1) != " " ) )
{
- ostringstream error;
+ std::ostringstream error;
error << "trailing character ["
<< toSplit.substr(endPos + 1, 1)
<< "] after value closing \" ";
throw ParserException( error.str() );
}
- string value = toSplit.substr( beginPos + 1, endPos - beginPos - 1 );
+ std::string value = toSplit.substr( beginPos + 1, endPos - beginPos - 1 );
toSplit.erase( beginPos, endPos - beginPos + 1);
eatwhite( toSplit );
return value;
/// \warning The underlying file pointer is not preseved.
void ReferenceFileParser::FirstPassReferenceFile() throw ( ParserException )
{
- string line;
+ std::string line;
lineNumber = 1;
bool inBlock = false;
- from.seekg( 0, ios::beg );
+ from.seekg( 0, std::ios::beg );
while ( ! from.eof() )
{
- getline( from, line );
+ std::getline( from, line );
/// This is how we usually end the parsing because we hit EOF:
if ( ! from.good() )
}
// Don't try to parse comments (weed out anything after first "#"):
- if ( line.find_first_of( "#" ) != string::npos )
+ if ( line.find_first_of( "#" ) != std::string::npos )
{
line.erase( line.find_first_of( "#" ) );
}
// blocks which is illegal:
if ( line.find_first_of( "[" ) != line.find_last_of( "[" ) )
{
- ostringstream error;
+ std::ostringstream error;
error << "Syntax error: nested block (open) in reference file"
- << endl
+ << std::endl
<< ParserException::GetIndent()
- << " at line " << lineNumber << endl;
+ << " at line " << lineNumber << std::endl;
throw ParserException( error.str() );
}
// blocks which is illegal:
if ( line.find_first_of( "]" ) != line.find_last_of( "]" ) )
{
- ostringstream error;
+ std::ostringstream error;
error << "Syntax error: nested block (close) in reference file"
- << endl
+ << std::endl
<< ParserException::GetIndent()
- << " at line " << lineNumber << endl;
+ << " at line " << lineNumber << std::endl;
throw ParserException( error.str() );
}
- bool beginBlock ( line.find_first_of("[") != string::npos );
- bool endBlock ( line.find_last_of("]") != string::npos );
+ bool beginBlock ( line.find_first_of("[") != std::string::npos );
+ bool endBlock ( line.find_last_of("]") != std::string::npos );
// Opening and closing of block on same line:
if ( beginBlock && endBlock )
{
- ostringstream error;
+ std::ostringstream error;
error << "Syntax error: opening and closing on block on same line "
- << lineNumber++ << endl;
+ << lineNumber++ << std::endl;
throw ParserException( error.str() );
}
// Illegal closing block when block not open:
if ( !inBlock && endBlock )
{
- ostringstream error;
+ std::ostringstream error;
error << "Syntax error: unexpected end of block at line "
- << lineNumber++ << endl;
+ << lineNumber++ << std::endl;
throw ParserException( error.str() );
}
// Uncommented line outside of block is not clean:
if ( !inBlock && !beginBlock )
{
- cerr << Indent
- << "Syntax warning: outside of block [] data at line "
- << lineNumber++ << " not considered." << endl;
continue;
}
if ( inBlock && beginBlock )
{
- ostringstream error;
+ std::ostringstream error;
error << " Syntax error: illegal opening of nested block at line "
- << lineNumber++ << endl;
+ << lineNumber++ << std::endl;
throw ParserException( error.str() );
}
// We need rewinding:
from.clear();
- from.seekg( 0, ios::beg );
+ from.seekg( 0, std::ios::beg );
}
ReferenceFileParser::ReferenceFileParser()
Indent = " ";
}
-bool ReferenceFileParser::Open( string& referenceFileName )
+bool ReferenceFileParser::Open( std::string& referenceFileName )
{
- from.open( referenceFileName.c_str(), ios::in );
+ from.open( referenceFileName.c_str(), std::ios::in );
if ( !from.is_open() )
{
- cerr << Indent << "Can't open reference file." << endl;
+ std::cerr << Indent << "Can't open reference file." << std::endl;
}
try
}
from.close();
+ return true; //??
}
-void ReferenceFileParser::CleanUpLine( string& line )
+void ReferenceFileParser::CleanUpLine( std::string& line )
{
// Cleanup from comments:
- if ( line.find_first_of( "#" ) != string::npos )
+ if ( line.find_first_of( "#" ) != std::string::npos )
line.erase( line.find_first_of( "#" ) );
// Cleanup everything after end block delimiter:
- if ( line.find_last_of( "]" ) != string::npos )
+ if ( line.find_last_of( "]" ) != std::string::npos )
line.erase( line.find_last_of( "]" ) + 1 );
- // Cleanup leanding whites and skip empty lines:
+ // Cleanup leading whites and skip empty lines:
eatwhite( line );
}
-void ReferenceFileParser::HandleFileName( string& line )
+void ReferenceFileParser::HandleFileName( std::string& line )
throw ( ParserException )
{
if ( line.length() == 0 )
CurrentFileName = ExtractFirstString(line);
}
-void ReferenceFileParser::HandleKey( string& line )
+void ReferenceFileParser::HandleKey( std::string& line )
throw ( ParserException )
{
if ( CurrentKey.length() != 0 )
return;
CurrentKey = ExtractFirstString(line);
- if ( CurrentKey.find_first_of( "|" ) == string::npos )
+ if ( CurrentKey.find_first_of( "|" ) == std::string::npos )
{
- ostringstream error;
+ std::ostringstream error;
error << "uncorrect key:" << CurrentKey;
throw ParserException( error.str() );
}
}
-bool ReferenceFileParser::HandleValue( string& line )
+bool ReferenceFileParser::HandleValue( std::string& line )
throw ( ParserException )
{
if ( line.length() == 0 )
if ( CurrentKey.length() == 0 )
{
- cout << Indent << "No key present:" << CurrentKey << endl;
+ std::cout << Indent << "No key present:" << CurrentKey << std::endl;
return false;
}
- string newCurrentValue = ExtractValue(line);
+ std::string newCurrentValue = ExtractValue(line);
if ( newCurrentValue.length() == 0 )
{
- ostringstream error;
- error << "missing value for key:" << CurrentKey;
- throw ParserException( error.str() );
+ std::cout << Indent << "Warning: empty value for key:"
+ << CurrentKey << std::endl;
}
CurrentValue += newCurrentValue;
return true;
}
-void ReferenceFileParser::ParseRegularLine(string& line)
+void ReferenceFileParser::ParseRegularLine( std::string& line)
throw ( ParserException )
{
if ( line.length() == 0 )
bool ReferenceFileParser::SecondPassReferenceFile()
throw ( ParserException )
{
- gdcmTagKey key;
+ gdcm::TagKey key;
EntryValueType value;
- string line;
+ std::string line;
bool inBlock = false;
lineNumber = 0;
while ( !from.eof() )
{
- getline( from, line );
+ std::getline( from, line );
lineNumber++;
CleanUpLine( line );
if ( line.length() == 0 )
continue;
- bool beginBlock ( line.find_first_of("[") != string::npos );
- bool endBlock ( line.find_last_of("]") != string::npos );
+ bool beginBlock ( line.find_first_of("[") != std::string::npos );
+ bool endBlock ( line.find_last_of("]") != std::string::npos );
// Waiting for a block to be opened. Meanwhile, drop everything:
if ( !inBlock && !beginBlock )
ParseRegularLine( line );
}
+ return true; //??
}
int TestAllEntryVerify(int argc, char* argv[])
{
- if ( argc > 1 )
+ if ( argc > 2 )
{
- cerr << " Usage: " << argv[0]
- << " (no arguments needed)." << endl;
+ std::cerr << " Usage: " << argv[0]
+ << " fileName" << std::endl;
return 1;
}
-
- cout << " Description (Test::TestAllEntryVerify): "
- << endl;
- cout << " For all images in gdcmData (and not blacklisted in "
- "Test/CMakeLists.txt)"
- << endl;
- cout << " apply the following to each filename.xxx: "
- << endl;
- cout << " step 1: parse the image (as gdcmHeader) and call"
- << " IsReadable(). "
- << endl;
-
- string referenceDir = GDCM_DATA_ROOT;
+
+ std::string referenceDir = GDCM_DATA_ROOT;
referenceDir += "/";
- string referenceFilename = referenceDir + "TestAllEntryVerifyReference.txt";
+ std::string referenceFilename = referenceDir + "TestAllEntryVerifyReference.txt";
+
+ std::cout << " Description (Test::TestAllEntryVerify): "
+ << std::endl;
+ std::cout << " For all images (not blacklisted in gdcm/Test/CMakeLists.txt)"
+ << std::endl;
+ std::cout << " encountered in directory: " << GDCM_DATA_ROOT << std::endl;
+ 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: \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."
+ << std::endl << std::endl;
ReferenceFileParser Parser;
- Parser.Open(referenceFilename);
+ if ( !Parser.Open(referenceFilename) )
+ {
+ std::cout << " failed"
+ << " Corrupted reference file name: "
+ << referenceFilename << std::endl;
+ return 1;
+ }
Parser.SetDataPath(referenceDir);
// Parser.Print();
- Parser.Check();
-/*
- int i = 0;
- while( gdcmDataImages[i] != 0 )
- {
- string filename = GDCM_DATA_ROOT;
- filename += "/"; //doh!
- filename += gdcmDataImages[i++];
-
- cout << " Testing: " << filename << endl;
+ std::cout << "Reference file loaded -->\n"
+ << "Check files : \n";
- gdcmHeader* tested = new gdcmHeader( filename.c_str(), false, true );
- if( !tested->GetHeader()->IsReadable() )
- {
- cout << " Image not gdcm compatible:"
- << filename << endl;
- delete tested;
- return 1;
- }
-
- //////////////// Clean up:
- delete tested;
+ int ret;
+ if ( argc >= 2 )
+ {
+ ret = Parser.Check( argv[1] );
}
-*/
-
- return 0;
+ else
+ {
+ ret = Parser.Check();
+ }
+ return !ret;
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff