Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2005/10/26 08:04:16 $
- Version: $Revision: 1.47 $
+ Date: $Date: 2007/09/25 15:21:57 $
+ Version: $Revision: 1.62 $
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 <string.h>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/// \brief auto generated function, to fill up the 'Value Representation'
/**
* \brief Simple predicate that checks whether the given argument
- * corresponds to the Value Representation of a \ref DataEntry .
+ * corresponds to the Value Representation of a DataEntry .
* @param tested value representation to check for.
*/
bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
*/
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" || tested == "OL")
+ return 4;
return 1;
}
bool VR::IsValidVR(VRKey const &key)
{
return vr.find(key) != vr.end();
+#ifdef USECOMPLETELYUNTESTEDCODE
+ // to avoid to search in a std::map of std::string,
+ // since each std::string is 2 characters longs, we check the array
+ // (29 char comparisons in the worst case!)
+
+ // "RT" is an undocumented VR, found in some Siemens images.
+ // We added it here to be able to read these images.
+ // Dict/gdcmVR.dic, Document has to be updated, too.
+ static const char VRvalues[] =
+ "AEASATCSDADSDTFLFDISLOLTOBOWOLOFPNSHSLSQSSSTTMUIULUNUSUTRT";
+
+ //int nbVal = strlen(VRvalues)/2; // save CPU time.
+ int nbVal = 29;
+
+ const char *pt = VRvalues;
+ for (int i=0;i<nbVal;i++)
+ {
+ if(key[0] == *pt++) {
+ if(key[1] == *pt++) {
+ return true;
+ }
+ }
+ else {
+ pt++;
+ }
+ }
+ return false;
+#endif
+
}
#endif