Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2005/10/23 14:56:27 $
- Version: $Revision: 1.46 $
+ Date: $Date: 2005/11/22 12:09:27 $
+ Version: $Revision: 1.49 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
bool VR::IsVROfStringRepresentable(VRKey const &tested)
{
- //FIXME : either you consider than US, UL, SS, SL *are* string representable
- // and you have to add FD and FL
- // or you consider they are not, and you have to remove them
- // (I cannot guess your point, reading gdcmDataEntry code :-( ) JPR
-
+
return tested == "AE" ||
tested == "AS" ||
tested == "CS" ||
tested == "DA" ||
tested == "DS" ||
+ tested == "FL" ||
+ tested == "FD" ||
tested == "IS" ||
tested == "LO" ||
tested == "LT" ||
tested == "US" ||
tested == "UT";
- // Should be quicker --> But it doesn't work : revert to old code
+ // Should be quicker
+ // --> will *never* work : any rotten value would be considered as OK !
/*
- return tested != "FL" &&
- tested != "FD" &&
- tested != "OB" &&
+ return tested != "OB" &&
tested != "OW" &&
- tested != "AT" && // Attribute Tag ?!?
+ tested != "OF" &&
+ tested != "AT" && // Attribute Tag ?!? contain no printable character
tested != "UN" && // UN is an actual VR !
tested != "SQ" ;
*/
// Word string
if( tested == "OW" )
return 2;
+ // Float string
+ if( tested == "OF" )
+ return 4;
return 1;
}
* \brief Print all
* @param os The output stream to be written to.
*/
-void VR::Print(std::ostream &os)
+void VR::Print(std::ostream &os,std::string const &)
{
for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
{