Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2004/10/27 22:31:12 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ Version: $Revision: 1.24 $
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 Constructor
{
std::string filename = DictSet::BuildDictPath() + DICT_VR;
std::ifstream from(filename.c_str());
- dbg.Error(!from, "VR::VR: can't open dictionary", filename.c_str());
-
- char buff[1024];
- VRKey key;
- VRAtr name;
-
- while (!from.eof())
+ if(!from)
{
- 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 != "")
+ 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();
}
//-----------------------------------------------------------------------------
//std::cout << "VR::IsVROfGdcmBinaryRepresentable===================="
// << tested << std::endl;
- if ( tested == "unkn")
+ if ( tested == GDCM_UNKNOWN)
return true;
if ( ! Count(tested) )
return false;
}
- 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")
+ 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;
}