Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2005/02/11 15:22:19 $
- Version: $Revision: 1.36 $
+ Date: $Date: 2005/10/23 14:56:27 $
+ Version: $Revision: 1.46 $
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>
+#include <string.h>
namespace gdcm
{
{
std::string filename = DictSet::BuildDictPath() + DICT_VR;
std::ifstream from(filename.c_str());
- if(!from)
+ if ( !from )
{
- gdcmWarningMacro("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, ' ');
+ if( strcmp(buff,"") == 0)
+ continue;
+
key = buff;
from >> std::ws;
from.getline(buff, 1024, ';');
from >> std::ws;
from.getline(buff, 1024, '\n');
- if(key != "")
- {
- vr[key] = name;
- }
+ vr[key] = name;
}
from.close();
}
//-----------------------------------------------------------------------------
// 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 whether the given argument
- * corresponds to the Value Representation of a \ref BinEntry .
+ * corresponds to the Value Representation of a \ref DataEntry .
* @param tested value representation to check for.
*/
bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
{
- if ( tested == GDCM_UNKNOWN)
- return true;
-
if ( IsVROfStringRepresentable(tested) )
return false;
/**
* \brief Simple predicate that checks whether the given argument
- * corresponds to the Value Representation of a \ref ValEntry
- * but NOT a \ref BinEntry.
+ * corresponds to the Value Representation of a
+ * 'std::string representable' value.
* @param tested value representation to be checked.
*/
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 == "TM" ||
tested == "UI" ||
tested == "UL" ||
- tested == "UN" ||
- tested == "US";
+ 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 != "UN" && // UN is an actual VR !
+ tested != "SQ" ;
+*/
}
-
-/**
- * \brief Simple predicate that checks whether 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)
+/// \brief returns the length of a elementary elem whose VR is passed
+unsigned short VR::GetAtomicElementLength(VRKey const &tested)
{
- return tested == "SQ";
+ // Unsigned & signed short
+ if( tested == "US" || tested == "SS" )
+ return 2;
+ // Unsigned & signed long
+ if( tested == "UL" || tested == "SL" )
+ return 4;
+ // Float
+ if( tested == "FL" )
+ return 4;
+ // Double
+ if( tested == "FD" )
+ return 8;
+ // Word string
+ if( tested == "OW" )
+ return 2;
+ return 1;
}
+// VS6 need a single implementation in the dll
+#if defined(_MSC_VER) && (_MSC_VER == 1200)
+/// \brief checks is a supposed-to-be VR is a 'legal' one.
bool VR::IsValidVR(VRKey const &key)
{
- return vr.find(key) != vr.end();
+ return vr.find(key) != vr.end();
}
+#endif
//-----------------------------------------------------------------------------
// Protected
*/
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 << "VR : " << it->first << " = " << it->second << std::endl;
}
- os << s.str();
}
//-----------------------------------------------------------------------------