Program: gdcm
Module: $RCSfile: TestAllEntryVerify.cxx,v $
Language: C++
- Date: $Date: 2005/02/02 10:05:26 $
- Version: $Revision: 1.24 $
+ Date: $Date: 2005/10/18 08:35:45 $
+ Version: $Revision: 1.29 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <iostream>
#include <sstream>
-//Generated file:
-#include "gdcmDataImages.h"
-
-typedef std::string EntryValueType; // same type as ValEntry::value
+typedef std::string EntryValueType; // same type as DataEntry::value
typedef std::map< gdcm::TagKey, EntryValueType > MapEntryValues;
typedef MapEntryValues *MapEntryValuesPtr;
typedef std::string FileNameType;
ReferenceFileParser();
~ReferenceFileParser();
- bool Open( std::string& referenceFileName );
+ bool Open( std::string &referenceFileName );
void Print();
void SetDataPath(std::string&);
bool Check();
private:
bool AddKeyValuePairToMap( std::string &key, std::string &value );
- std::istream& eatwhite(std::istream &is);
+ std::istream &eatwhite(std::istream &is);
void eatwhite(std::string &toClean);
std::string ExtractFirstString(std::string &toSplit);
void CleanUpLine( std::string &line );
{
for (MapFileValuesType::iterator i = ProducedMap.begin();
i != ProducedMap.end();
- ++i)
+ ++i)
{
delete i->second;
}
}
-/// As gotten from:
+/// As got from:
/// http://community.borland.com/article/0,1410,17203,0.html
uint16_t ReferenceFileParser::axtoi(char *hexStg)
{
m--; // adjust the position to set
n++; // next digit to process
}
- return intValue;
+ return (uint16_t)intValue;
}
void ReferenceFileParser::SetDataPath( std::string &inDataPath )
{
for (MapFileValuesType::iterator i = ProducedMap.begin();
i != ProducedMap.end();
- ++i)
+ ++i)
{
std::cout << Indent << "FileName: " << i->first << std::endl;
MapEntryValuesPtr KeyValues = i->second;
for (MapEntryValues::iterator j = KeyValues->begin();
j != KeyValues->end();
- ++j)
+ ++j)
{
std::cout << Indent
- << " Key: " << j->first
+ << " Key: " << j->first
<< " Value: " << j->second
<< std::endl;
}
bool ret = true;
for (MapFileValuesType::iterator i = ProducedMap.begin();
i != ProducedMap.end();
- ++i)
+ ++i)
{
ret &= Check(i);
}
{
std::string fileName = DataPath + fileIt->first;
std::cout << Indent << "FileName: " << fileName << std::endl;
- gdcm::File* tested = new gdcm::File( fileName.c_str() );
+
+ gdcm::File *tested;
+ tested = new gdcm::File( );
+ tested->SetFileName( fileName.c_str() );
+ tested->Load( );
if( !tested->IsReadable() )
{
std::cerr << Indent << "Failed\n"
MapEntryValuesPtr KeyValues = fileIt->second;
for (MapEntryValues::iterator j = KeyValues->begin();
j != KeyValues->end();
- ++j)
+ ++j)
{
std::string key = j->first;
return is;
}
-void ReferenceFileParser::eatwhite( std::string& toClean )
+void ReferenceFileParser::eatwhite( std::string &toClean )
{
while( toClean.find_first_of( " " ) == 0 )
toClean.erase( 0, toClean.find_first_of( " " ) + 1 );