Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2004/10/08 04:43:38 $
- Version: $Revision: 1.18 $
+ Date: $Date: 2004/11/03 18:08:56 $
+ 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
#include <fstream>
#include <iostream>
+namespace gdcm
+{
+void FillDefaultVRDict(VRHT & vr);
//-----------------------------------------------------------------------------
/**
* \brief Constructor
*/
-gdcmVR::gdcmVR()
+VR::VR()
{
- std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_VR);
+ std::string filename = DictSet::BuildDictPath() + DICT_VR;
std::ifstream from(filename.c_str());
- dbg.Error(!from, "gdcmVR::gdcmVR: can't open dictionary",filename.c_str());
-
- char buff[1024];
- std::string key;
- std::string name;
-
- while (!from.eof())
+ if(!from)
{
- from >> std::ws; // used to be eatwhite(from);
- from.getline(buff, 1024, ' ');
- key = buff;
- from >> std::ws; // used to be eatwhite(from);
- from.getline(buff, 1024, ';');
- name = buff;
-
- from >> std::ws; // used to be eatwhite(from);
- from.getline(buff, 1024, '\n');
-
- if(key!="")
+ dbg.Verbose(2, "VR::VR: can't open dictionary", filename.c_str());
+ FillDefaultVRDict(vr);
+ }
+ else
+ {
+ char buff[1024];
+ VRKey key;
+ VRAtr name;
+
+ while (!from.eof())
{
- vr[key]=name;
+ from >> std::ws;
+ from.getline(buff, 1024, ' ');
+ key = buff;
+ from >> std::ws;
+ from.getline(buff, 1024, ';');
+ name = buff;
+
+ from >> std::ws;
+ from.getline(buff, 1024, '\n');
+
+ if(key != "")
+ {
+ vr[key] = name;
+ }
}
+ from.close();
}
- from.close();
}
//-----------------------------------------------------------------------------
/**
* \brief Destructor
*/
-gdcmVR::~gdcmVR()
+VR::~VR()
{
vr.clear();
}
* \brief Print all
* @param os The output stream to be written to.
*/
-void gdcmVR::Print(std::ostream &os)
+void VR::Print(std::ostream &os)
{
std::ostringstream s;
- for (gdcmVRHT::iterator it = vr.begin(); it != vr.end(); ++it)
+ for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
{
- s << "VR : "<<it->first<<" = "<<it->second<<std::endl;
+ s << "VR : " << it->first << " = " << it->second << std::endl;
}
os << s.str();
}
* \brief Get the count for an element
* @param key key to count
*/
-int gdcmVR::Count(gdcmVRKey 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 gdcmBinEntry .
+ * corresponds to the Value Representation of a \ref BinEntry .
* This predicate is the negation of
- * \ref gdcmVR::IsVROfGdcmStringRepresentable .
+ * \ref VR::IsVROfGdcmStringRepresentable .
* @param tested value representation to check for.
*/
-bool gdcmVR::IsVROfGdcmBinaryRepresentable(gdcmVRKey tested)
+bool VR::IsVROfGdcmBinaryRepresentable(VRKey const & tested)
{
- //std::cout << "gdcmVR::IsVROfGdcmBinaryRepresentable===================="
+ //std::cout << "VR::IsVROfGdcmBinaryRepresentable===================="
// << tested << std::endl;
if ( tested == "unkn")
if ( ! Count(tested) )
{
- dbg.Verbose(0, "gdcmVR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
+ dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
return false;
}
if ( IsVROfGdcmStringRepresentable(tested) )
{
- dbg.Verbose(0, "gdcmVR::IsVROfGdcmBinaryRepresentable: binary VR !");
+ dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: binary VR !");
return false;
}
//-----------------------------------------------------------------------------
/**
* \brief Simple predicate that checks wether the given argument
- * corresponds to the Value Representation of a \ref gdcmValEntry
- * but NOT a \ref gdcmBinEntry.
+ * corresponds to the Value Representation of a \ref ValEntry
+ * but NOT a \ref BinEntry.
* @param tested value representation to check for.
*/
-bool gdcmVR::IsVROfGdcmStringRepresentable(gdcmVRKey tested)
+bool VR::IsVROfGdcmStringRepresentable(VRKey const & tested)
{
if ( ! Count(tested) )
{
- dbg.Verbose(0, "gdcmVR::IsVROfGdcmStringRepresentable: tested not a VR!");
+ dbg.Verbose(0, "VR::IsVROfGdcmStringRepresentable: tested not a VR!");
return false;
}
// Private
//-----------------------------------------------------------------------------
+
+} // end namespace gdcm