* Amelioration of Test's output
-- BeNours
Program: gdcm
Module: $RCSfile: TestDataEntry.cxx,v $
Language: C++
Program: gdcm
Module: $RCSfile: TestDataEntry.cxx,v $
Language: C++
- Date: $Date: 2005/10/19 15:43:58 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2005/10/20 08:58:15 $
+ Version: $Revision: 1.4 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
if( entry->GetValueCount() != 1 )
{
std::cout << " Failed" << std::endl
if( entry->GetValueCount() != 1 )
{
std::cout << " Failed" << std::endl
- << " Number of content values is incorrect" << std::endl;
+ << " Number of content values is incorrect" << std::endl
+ << " Found: " << entry->GetValueCount()
+ << " - Must be: 1" << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValueCount() != 2 )
{
std::cout << " Failed" << std::endl
if( entry->GetValueCount() != 2 )
{
std::cout << " Failed" << std::endl
- << " Number of content values is incorrect" << std::endl;
+ << " Number of content values is incorrect" << std::endl
+ << " Found: " << entry->GetValueCount()
+ << " - Must be: 2" << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValueCount() != 0 )
{
std::cout << " Failed" << std::endl
if( entry->GetValueCount() != 0 )
{
std::cout << " Failed" << std::endl
- << " Number of content values is incorrect" << std::endl;
+ << " Number of content values is incorrect" << std::endl
+ << " Found: " << entry->GetValueCount()
+ << " - Must be: 0" << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetLength() != strlen(data) + strlen(data)%2 )
{
std::cout << " Failed" << std::endl
if( entry->GetLength() != strlen(data) + strlen(data)%2 )
{
std::cout << " Failed" << std::endl
- << " Size of string is incorrect" << std::endl;
+ << " Size of string is incorrect" << std::endl
+ << " Found: " << entry->GetLength()
+ << " - Must be: " << strlen(data) + strlen(data)%2 << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
- << " Number of content values is incorrect" << std::endl;
+ << " Number of content values is incorrect" << std::endl
+ << " Found: " << entry->GetValueCount()
+ << " - Must be: " << nbvalue << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( memcmp(entry->GetString().c_str(),data,entry->GetLength()) != 0 )
{
std::cout << " Failed" << std::endl
if( memcmp(entry->GetString().c_str(),data,entry->GetLength()) != 0 )
{
std::cout << " Failed" << std::endl
- << " Content of string is incorrect" << std::endl;
+ << " Content of string is incorrect" << std::endl
+ << " Found: " << entry->GetString().c_str()
+ << " - Must be: " << data << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
{
std::cout << " Failed" << std::endl
<< " Content of entry's values is incorrect : id " << i << std::endl
{
std::cout << " Failed" << std::endl
<< " Content of entry's values is incorrect : id " << i << std::endl
- << " Found " << entry->GetValue(i) << " - Must be " << svalue[i] << std::endl;
+ << " Found " << entry->GetValue(i)
+ << " - Must be " << svalue[i] << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetLength() != nbvalue*sizeof(uint16_t) )
{
std::cout << " Failed" << std::endl
if( entry->GetLength() != nbvalue*sizeof(uint16_t) )
{
std::cout << " Failed" << std::endl
- << " BinArea length is incorrect" << std::endl;
+ << " BinArea length is incorrect" << std::endl
+ << " Found: " << entry->GetLength()
+ << " - Must be: " << nbvalue*sizeof(uint16_t) << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( memcmp(entry->GetString().c_str(),data,strlen(data)) != 0 )
{
std::cout << " Failed" << std::endl
if( memcmp(entry->GetString().c_str(),data,strlen(data)) != 0 )
{
std::cout << " Failed" << std::endl
- << " Content of string is incorrect" << std::endl;
+ << " Content of string is incorrect" << std::endl
+ << " Found: " << entry->GetString().c_str()
+ << " - Must be: " << data << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
- << " Number of content values is incorrect" << std::endl;
+ << " Number of content values is incorrect" << std::endl
+ << " Found: " << entry->GetValueCount()
+ << " - Must be: " << nbvalue << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValue(i) != svalue[i] )
{
std::cout << " Failed" << std::endl
if( entry->GetValue(i) != svalue[i] )
{
std::cout << " Failed" << std::endl
- << " Content of entry's values is incorrect : id " << i << std::endl;
+ << " Content of entry's values is incorrect : id " << i << std::endl
+ << " Found: " << entry->GetValue(i)
+ << " - Must be: " << svalue[i] << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( memcmp(entry->GetString().c_str(),data,strlen(data)) != 0 )
{
std::cout << " Failed" << std::endl
if( memcmp(entry->GetString().c_str(),data,strlen(data)) != 0 )
{
std::cout << " Failed" << std::endl
- << " Content of string is incorrect" << std::endl;
+ << " Content of string is incorrect" << std::endl
+ << " Found: " << entry->GetString().c_str()
+ << " - Must be: " << data << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
- << " Number of content values is incorrect" << std::endl;
+ << " Number of content values is incorrect" << std::endl
+ << " Found: " << entry->GetValueCount()
+ << " - Must be: " << nbvalue << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValue(i) != svalue[i] )
{
std::cout << " Failed" << std::endl
if( entry->GetValue(i) != svalue[i] )
{
std::cout << " Failed" << std::endl
- << " Content of entry's values is incorrect : id " << i << std::endl;
+ << " Content of entry's values is incorrect : id " << i << std::endl
+ << " Found: " << entry->GetValue(i)
+ << " - Must be: " << svalue[i] << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetLength() != nbvalue*sizeof(uint32_t) )
{
std::cout << " Failed" << std::endl
if( entry->GetLength() != nbvalue*sizeof(uint32_t) )
{
std::cout << " Failed" << std::endl
- << " BinArea length is incorrect" << std::endl;
+ << " BinArea length is incorrect" << std::endl
+ << " Found: " << entry->GetLength()
+ << " - Must be: " << nbvalue*sizeof(uint32_t) << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( memcmp(entry->GetString().c_str(),data,strlen(data)) != 0 )
{
std::cout << " Failed" << std::endl
if( memcmp(entry->GetString().c_str(),data,strlen(data)) != 0 )
{
std::cout << " Failed" << std::endl
- << " Content of string is incorrect" << std::endl;
- std::cout<<"#"<<entry->GetString()<<"#"<<" / "<<"#"<<data<<"#"<<std::endl;
+ << " Content of string is incorrect" << std::endl
+ << " Found: " << entry->GetString().c_str()
+ << " - Must be: " << data << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
- << " Number of content values is incorrect" << std::endl;
+ << " Number of content values is incorrect" << std::endl
+ << " Found: " << entry->GetValueCount()
+ << " - Must be: " << nbvalue << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValue(i) != lvalue[i] )
{
std::cout << " Failed" << std::endl
if( entry->GetValue(i) != lvalue[i] )
{
std::cout << " Failed" << std::endl
- << " Content of entry's values is incorrect : id " << i << std::endl;
+ << " Content of entry's values is incorrect : id " << i << std::endl
+ << " Found: " << entry->GetValue(i)
+ << " - Must be: " << lvalue[i] << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( memcmp(entry->GetString().c_str(),data,strlen(data)) != 0 )
{
std::cout << " Failed" << std::endl
if( memcmp(entry->GetString().c_str(),data,strlen(data)) != 0 )
{
std::cout << " Failed" << std::endl
- << " Content of string is incorrect" << std::endl;
+ << " Content of string is incorrect" << std::endl
+ << " Found: " << entry->GetString().c_str()
+ << " - Must be: " << data << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
- << " Number of content values is incorrect" << std::endl;
+ << " Number of content values is incorrect" << std::endl
+ << " Found: " << entry->GetValueCount()
+ << " - Must be: " << nbvalue << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValue(i) != lvalue[i] )
{
std::cout << " Failed" << std::endl
if( entry->GetValue(i) != lvalue[i] )
{
std::cout << " Failed" << std::endl
- << " Content of entry's values is incorrect : id " << i << std::endl;
+ << " Content of entry's values is incorrect : id " << i << std::endl
+ << " Found: " << entry->GetValue(i)
+ << " - Must be: " << lvalue[i] << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetLength() != nbvalue*sizeof(float) )
{
std::cout << " Failed" << std::endl
if( entry->GetLength() != nbvalue*sizeof(float) )
{
std::cout << " Failed" << std::endl
- << " BinArea length is incorrect" << std::endl;
+ << " BinArea length is incorrect" << std::endl
+ << " Found: " << entry->GetLength()
+ << " - Must be: " << nbvalue*sizeof(float) << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( memcmp(entry->GetString().c_str(),fdata,strlen(fdata)) != 0 )
{
std::cout << " Failed" << std::endl
if( memcmp(entry->GetString().c_str(),fdata,strlen(fdata)) != 0 )
{
std::cout << " Failed" << std::endl
- << " Content of string is incorrect" << std::endl;
+ << " Content of string is incorrect" << std::endl
+ << " Found: " << entry->GetString().c_str()
+ << " - Must be: " << fdata << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
- << " Number of content values is incorrect" << std::endl;
+ << " Number of content values is incorrect" << std::endl
+ << " Found: " << entry->GetValueCount()
+ << " - Must be: " << nbvalue << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValue(i) != fvalue[i] )
{
std::cout << " Failed" << std::endl
if( entry->GetValue(i) != fvalue[i] )
{
std::cout << " Failed" << std::endl
- << " Content of entry's values is incorrect : id " << i << std::endl;
+ << " Content of entry's values is incorrect : id " << i << std::endl
+ << " Found: " << entry->GetValue(i)
+ << " - Must be: " << fvalue[i] << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( memcmp(entry->GetString().c_str(),fdata,strlen(fdata)) != 0 )
{
std::cout << " Failed" << std::endl
if( memcmp(entry->GetString().c_str(),fdata,strlen(fdata)) != 0 )
{
std::cout << " Failed" << std::endl
- << " Content of string is incorrect" << std::endl;
+ << " Content of string is incorrect" << std::endl
+ << " Found: " << entry->GetString().c_str()
+ << " - Must be: " << fdata << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
- << " Number of content values is incorrect" << std::endl;
+ << " Number of content values is incorrect" << std::endl
+ << " Found: " << entry->GetValueCount()
+ << " - Must be: " << nbvalue << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValue(i) != fvalue[i] )
{
std::cout << " Failed" << std::endl
if( entry->GetValue(i) != fvalue[i] )
{
std::cout << " Failed" << std::endl
- << " Content of entry's values is incorrect : id " << i << std::endl;
+ << " Content of entry's values is incorrect : id " << i << std::endl
+ << " Found: " << entry->GetValue(i)
+ << " - Must be: " << fvalue[i] << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetLength() != nbvalue*sizeof(double) )
{
std::cout << " Failed" << std::endl
if( entry->GetLength() != nbvalue*sizeof(double) )
{
std::cout << " Failed" << std::endl
- << " BinArea length is incorrect" << std::endl;
+ << " BinArea length is incorrect" << std::endl
+ << " Found: " << entry->GetLength()
+ << " - Must be: " << nbvalue*sizeof(double) << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( memcmp(entry->GetString().c_str(),fdata,strlen(fdata)) != 0 )
{
std::cout << " Failed" << std::endl
if( memcmp(entry->GetString().c_str(),fdata,strlen(fdata)) != 0 )
{
std::cout << " Failed" << std::endl
- << " Content of string is incorrect" << std::endl;
+ << " Content of string is incorrect" << std::endl
+ << " Found: " << entry->GetString().c_str()
+ << " - Must be: " << fdata << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
- << " Number of content values is incorrect" << std::endl;
+ << " Number of content values is incorrect" << std::endl
+ << " Found: " << entry->GetValueCount()
+ << " - Must be: " << nbvalue << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValue(i) != dvalue[i] )
{
std::cout << " Failed" << std::endl
if( entry->GetValue(i) != dvalue[i] )
{
std::cout << " Failed" << std::endl
- << " Content of entry's values is incorrect : id " << i << std::endl;
+ << " Content of entry's values is incorrect : id " << i << std::endl
+ << " Found: " << entry->GetValue(i)
+ << " - Must be: " << dvalue[i] << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( memcmp(entry->GetString().c_str(),fdata,strlen(fdata)) != 0 )
{
std::cout << " Failed" << std::endl
if( memcmp(entry->GetString().c_str(),fdata,strlen(fdata)) != 0 )
{
std::cout << " Failed" << std::endl
- << " Content of string is incorrect" << std::endl;
+ << " Content of string is incorrect" << std::endl
+ << " Found: " << entry->GetString().c_str()
+ << " - Must be: " << fdata << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
if( entry->GetValueCount() != nbvalue )
{
std::cout << " Failed" << std::endl
- << " Number of content values is incorrect" << std::endl;
+ << " Number of content values is incorrect" << std::endl
+ << " Found: " << entry->GetValueCount()
+ << " - Must be: " << nbvalue << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
if( entry->GetValue(i) != dvalue[i] )
{
std::cout << " Failed" << std::endl
if( entry->GetValue(i) != dvalue[i] )
{
std::cout << " Failed" << std::endl
- << " Content of entry's values is incorrect : id " << i << std::endl;
+ << " Content of entry's values is incorrect : id " << i << std::endl
+ << " Found: " << entry->GetValue(i)
+ << " - Must be: " << dvalue[i] << std::endl;
delete dict;
delete entry;
return(1);
delete dict;
delete entry;
return(1);
Program: gdcm
Module: $RCSfile: TestFileAccessors.cxx,v $
Language: C++
Program: gdcm
Module: $RCSfile: TestFileAccessors.cxx,v $
Language: C++
- Date: $Date: 2005/10/18 08:35:46 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2005/10/20 08:58:15 $
+ Version: $Revision: 1.4 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
TestMethodMacro(std::dec,f,GetFileName)
f->GetImageOrientationPatient( iop );
TestMethodMacro(std::dec,f,GetFileName)
f->GetImageOrientationPatient( iop );
+ std::cout << " Orientation:" << std::endl;
- std::cout << "iop[" << j << "] = " << iop[j] << std::endl;
+ std::cout << " iop[" << j << "] = " << iop[j] << std::endl;
- std::cout <<filename << " is Readable"
- << std::endl << std::endl;
+ std::cout << " " << filename << " is Readable" << std::endl;
gdcm::FileHelper *fh= new gdcm::FileHelper( f );
gdcm::FileHelper *fh= new gdcm::FileHelper( f );
Program: gdcm
Module: $RCSfile: TestWriteSimple.cxx,v $
Language: C++
Program: gdcm
Module: $RCSfile: TestWriteSimple.cxx,v $
Language: C++
- Date: $Date: 2005/10/18 08:35:46 $
- Version: $Revision: 1.39 $
+ Date: $Date: 2005/10/20 08:58:15 $
+ Version: $Revision: 1.40 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
std::cout << " list of the first " << MAX_NUMBER_OF_DIFFERENCE
<< " pixels differing (pos : test - ref) :"
<< std::endl;
std::cout << " list of the first " << MAX_NUMBER_OF_DIFFERENCE
<< " pixels differing (pos : test - ref) :"
<< std::endl;
unsigned int j;
for(i=0, j=0;i<dataSizeWritten && j<MAX_NUMBER_OF_DIFFERENCE;i++)
{
unsigned int j;
for(i=0, j=0;i<dataSizeWritten && j<MAX_NUMBER_OF_DIFFERENCE;i++)
{
#include "gdcmCommon.h"
#include "gdcmBase.h"
#include "gdcmCommon.h"
#include "gdcmBase.h"
+#include "gdcmTagKey.h"
+#include "gdcmVRKey.h"
+#include "gdcmDicomEntry.h"
#include "gdcmDictEntry.h"
#include "gdcmDictSet.h"
#include "gdcmDicomDir.h"
#include "gdcmDictEntry.h"
#include "gdcmDictSet.h"
#include "gdcmDicomDir.h"
%ignore gdcm::binary_write(std::ostream &,uint32_t const &);
%ignore gdcm::binary_write(std::ostream &,uint16_t const &);
%ignore gdcm::binary_write(std::ostream &,uint32_t const &);
%ignore gdcm::binary_write(std::ostream &,uint16_t const &);
+%ignore gdcm::VRKey::operator=(const VRKey &_val);
+%ignore gdcm::VRKey::operator=(const std::string &_val);
+%ignore gdcm::VRKey::operator=(const char *_val);
+%ignore gdcm::VRKey::operator[](const unsigned int &_id) const;
+%ignore gdcm::VRKey::operator[](const unsigned int &_id);
+
+%ignore gdcm::TagKey::operator=(const TagKey &_val);
+%ignore gdcm::TagKey::operator[](const unsigned int &_id) const;
+%ignore gdcm::TagKey::operator[](const unsigned int &_id);
+
%ignore gdcm::DicomDir::SetStartMethod(DicomDir::Method *method,void *arg = NULL);
%ignore gdcm::DicomDir::SetProgressMethod(DicomDir::Method *method,void *arg = NULL);
%ignore gdcm::DicomDir::SetEndMethod(DicomDir::Method *method,void *arg = NULL);
%ignore gdcm::DicomDir::SetStartMethod(DicomDir::Method *method,void *arg = NULL);
%ignore gdcm::DicomDir::SetProgressMethod(DicomDir::Method *method,void *arg = NULL);
%ignore gdcm::DicomDir::SetEndMethod(DicomDir::Method *method,void *arg = NULL);
// Warning: Order matters !
%include "gdcmCommon.h"
%include "gdcmBase.h"
// Warning: Order matters !
%include "gdcmCommon.h"
%include "gdcmBase.h"
+%include "gdcmTagKey.h"
+%include "gdcmVRKey.h"
+%include "gdcmDicomEntry.h"
%include "gdcmDictEntry.h"
%include "gdcmDict.h"
%include "gdcmDictSet.h"
%include "gdcmDictEntry.h"
%include "gdcmDict.h"
%include "gdcmDictSet.h"
Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2005/10/19 13:15:38 $
- Version: $Revision: 1.161 $
+ Date: $Date: 2005/10/20 08:58:17 $
+ Version: $Revision: 1.162 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
bool DicomDir::Load(std::string const &fileName )
{
*/
bool DicomDir::Load(std::string const &fileName )
{
- // We should clean out anything that already exists.
- Initialize(); // sets all private fields to NULL
Program: gdcm
Module: $RCSfile: gdcmDicomEntry.cxx,v $
Language: C++
Program: gdcm
Module: $RCSfile: gdcmDicomEntry.cxx,v $
Language: C++
- Date: $Date: 2005/10/19 13:17:05 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2005/10/20 08:58:17 $
+ Version: $Revision: 1.2 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
void DicomEntry::Print(std::ostream &os, std::string const & )
{
*/
void DicomEntry::Print(std::ostream &os, std::string const & )
{
- std::ostringstream s;
-
- s << GetKey();
- s << " [" << VR << "] ";
+ os << GetKey();
+ os << " [" << VR << "] ";
}
//-----------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmDict.h,v $
Language: C++
Program: gdcm
Module: $RCSfile: gdcmDict.h,v $
Language: C++
- Date: $Date: 2005/09/03 18:24:10 $
- Version: $Revision: 1.41 $
+ Date: $Date: 2005/10/20 08:58:18 $
+ Version: $Revision: 1.42 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//-----------------------------------------------------------------------------
typedef std::string DictKey;
typedef std::map<TagKey, DictEntry> TagKeyHT;
//-----------------------------------------------------------------------------
typedef std::string DictKey;
typedef std::map<TagKey, DictEntry> TagKeyHT;
//-----------------------------------------------------------------------------
/**
* \brief Dict acts a memory representation of a dicom dictionary i.e.
//-----------------------------------------------------------------------------
/**
* \brief Dict acts a memory representation of a dicom dictionary i.e.
Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2005/10/18 08:35:51 $
- Version: $Revision: 1.41 $
+ Date: $Date: 2005/10/20 08:58:18 $
+ Version: $Revision: 1.42 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
-unsigned short VR::GetAtomicElementLength(VRKey const &vr)
+unsigned short VR::GetAtomicElementLength(VRKey const &tested)
{
// Unsigned & signed short
{
// Unsigned & signed short
- if( vr == "US" || vr == "SS" )
+ if( tested == "US" || tested == "SS" )
return 2;
// Unsigned & signed long
return 2;
// Unsigned & signed long
- if( vr == "UL" || vr == "SL" )
+ if( tested == "UL" || tested == "SL" )
Program: gdcm
Module: $RCSfile: gdcmVR.h,v $
Language: C++
Program: gdcm
Module: $RCSfile: gdcmVR.h,v $
Language: C++
- Date: $Date: 2005/10/18 12:58:29 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2005/10/20 08:58:18 $
+ Version: $Revision: 1.22 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
bool IsValidVR(VRKey const &key) { return vr.find(key) != vr.end(); }
bool IsValidVR(VRKey const &key) { return vr.find(key) != vr.end(); }
- unsigned short GetAtomicElementLength(VRKey const &vr);
+ unsigned short GetAtomicElementLength(VRKey const &tested);