Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2004/11/03 18:08:56 $
- Version: $Revision: 1.22 $
+ Date: $Date: 2005/01/07 19:20:39 $
+ 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
namespace gdcm
{
-void FillDefaultVRDict(VRHT & vr);
+void FillDefaultVRDict(VRHT &vr);
//-----------------------------------------------------------------------------
/**
* \brief Constructor
std::ifstream from(filename.c_str());
if(!from)
{
- dbg.Verbose(2, "VR::VR: can't open dictionary", filename.c_str());
+ gdcmVerboseMacro("VR::VR: can't open dictionary" << filename.c_str());
FillDefaultVRDict(vr);
}
else
* \brief Get the count for an element
* @param key key to count
*/
-int VR::Count(VRKey const & key)
+int VR::Count(VRKey const &key)
{
return vr.count(key);
}
/**
* \brief Simple predicate that checks wether the given argument
* corresponds to the Value Representation of a \ref BinEntry .
- * This predicate is the negation of
- * \ref VR::IsVROfGdcmStringRepresentable .
* @param tested value representation to check for.
*/
-bool VR::IsVROfGdcmBinaryRepresentable(VRKey const & tested)
+bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
{
//std::cout << "VR::IsVROfGdcmBinaryRepresentable===================="
// << tested << std::endl;
- if ( tested == "unkn")
+ if ( tested == GDCM_UNKNOWN)
return true;
- if ( ! Count(tested) )
- {
- dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
+ if ( IsVROfStringRepresentable(tested) )
return false;
- }
- if ( IsVROfGdcmStringRepresentable(tested) )
- {
- dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: binary VR !");
+ if ( IsVROfSequence(tested) )
return false;
- }
return true;
}
-//-----------------------------------------------------------------------------
/**
* \brief Simple predicate that checks wether the given argument
* corresponds to the Value Representation of a \ref ValEntry
* but NOT a \ref BinEntry.
* @param tested value representation to check for.
*/
-bool VR::IsVROfGdcmStringRepresentable(VRKey const & tested)
+bool VR::IsVROfStringRepresentable(VRKey const &tested)
{
+ return tested == "AE" ||
+ tested == "AS" ||
+ tested == "CS" ||
+ tested == "DA" ||
+ tested == "DS" ||
+ tested == "IS" ||
+ tested == "LO" ||
+ tested == "LT" ||
+ tested == "PN" ||
+ tested == "SH" ||
+ tested == "SL" ||
+ tested == "SS" ||
+ tested == "ST" ||
+ tested == "TM" ||
+ tested == "UI" ||
+ tested == "UL" ||
+ tested == "UN" ||
+ tested == "US";
+}
- if ( ! Count(tested) )
- {
- dbg.Verbose(0, "VR::IsVROfGdcmStringRepresentable: tested not a VR!");
- return false;
- }
+/**
+ * \brief Simple predicate that checks wether the given argument
+ * corresponds to the Value Representation of a \ref SeqEntry
+ * @param tested value representation to check for.
+ */
+bool VR::IsVROfSequence(VRKey const &tested)
+{
+ return tested == "SQ";
+}
- if (tested == "AE" || tested == "AS" || tested == "DA" || tested == "PN" ||
- tested == "UI" || tested == "TM" || tested == "SH" || tested == "LO" ||
- tested == "CS" || tested == "IS" || tested == "LO" || tested == "LT" ||
- tested == "SH" || tested == "ST" || tested == "DS" || tested == "SL" ||
- tested == "SS" || tested == "UL" || tested == "US" || tested == "UN")
- {
- return true;
- }
- return false;
+bool VR::IsValidVR(VRKey const &key)
+{
+ return(vr.find(key)!=vr.end());
}
//-----------------------------------------------------------------------------