Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2005/01/05 15:38:28 $
- Version: $Revision: 1.24 $
+ Date: $Date: 2005/09/07 14:12:23 $
+ 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
namespace gdcm
{
-void FillDefaultVRDict(VRHT & vr);
//-----------------------------------------------------------------------------
+/// \brief auto generated function, to fill up the 'Value Representation'
+/// Dictionnary, if relevant file is not found on user's disk
+void FillDefaultVRDict(VRHT &vr);
+
+//-----------------------------------------------------------------------------
+// Constructor / Destructor
/**
* \brief Constructor
*/
{
std::string filename = DictSet::BuildDictPath() + DICT_VR;
std::ifstream from(filename.c_str());
- if(!from)
+ if ( !from )
{
- dbg.Verbose(2, "VR::VR: can't open dictionary", filename.c_str());
+ gdcmWarningMacro("Can't open dictionary" << filename.c_str());
FillDefaultVRDict(vr);
}
else
from >> std::ws;
from.getline(buff, 1024, '\n');
- if(key != "")
+ if ( key != "" )
{
vr[key] = name;
}
}
}
-//-----------------------------------------------------------------------------
/**
* \brief Destructor
*/
vr.clear();
}
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \brief Print all
- * @param os The output stream to be written to.
- */
-void VR::Print(std::ostream &os)
-{
- std::ostringstream s;
-
- for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
- {
- s << "VR : " << it->first << " = " << it->second << std::endl;
- }
- os << s.str();
-}
-
//-----------------------------------------------------------------------------
// Public
-/**
- * \brief Get the count for an element
- * @param key key to count
- */
-int VR::Count(VRKey const & key)
-{
- return vr.count(key);
-}
-//-----------------------------------------------------------------------------
/**
- * \brief Simple predicate that checks wether the given argument
+ * \brief Simple predicate that checks whether 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 == GDCM_UNKNOWN)
- return true;
-
- if ( ! Count(tested) )
- {
- dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
+ //if ( tested == GDCM_UNKNOWN)
+ //{
+ //std::cout << "---------- never used --------------" << tested
+ // << std::endl;
+ // return true;
+ //}
+
+ 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
+ * \brief Simple predicate that checks whether the given argument
* corresponds to the Value Representation of a \ref ValEntry
* but NOT a \ref BinEntry.
- * @param tested value representation to check for.
+ * @param tested value representation to be checked.
*/
-bool VR::IsVROfGdcmStringRepresentable(VRKey const & tested)
+bool VR::IsVROfStringRepresentable(VRKey const &tested)
{
- if ( ! Count(tested) )
- {
- dbg.Verbose(0, "VR::IsVROfGdcmStringRepresentable: tested not a VR!");
- return false;
- }
- if ( 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" )
- {
- return true;
- }
- return false;
+ 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 == "US" ||
+ tested == "UT";
+
+ // Should be quicker --> But it doesn't work : revert to old code
+/*
+ return tested != "FL" &&
+ tested != "FD" &&
+ tested != "OB" &&
+ tested != "OW" &&
+ tested != "AT" && // Attribute Tag ?!?
+ tested != "SQ" ;
+*/
}
//-----------------------------------------------------------------------------
// Private
//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief Print all
+ * @param os The output stream to be written to.
+ */
+void VR::Print(std::ostream &os)
+{
+ std::ostringstream s;
+ for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
+ {
+ s << "VR : " << it->first << " = " << it->second << std::endl;
+ }
+ os << s.str();
+}
+
+//-----------------------------------------------------------------------------
} // end namespace gdcm