Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2005/01/06 13:35:38 $
- Version: $Revision: 1.25 $
+ Date: $Date: 2008/02/13 11:42:13 $
+ Version: $Revision: 1.63 $
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
+namespace GDCM_NAME_SPACE
{
-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, ' ');
+ 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();
}
}
-//-----------------------------------------------------------------------------
/**
* \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
- * corresponds to the Value Representation of a \ref BinEntry .
- * This predicate is the negation of
- * \ref VR::IsVROfGdcmStringRepresentable .
+ * \brief Simple predicate that checks whether the given argument
+ * corresponds to the Value Representation of a DataEntry .
* @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 ( ! IsValidVR(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.
+ * \brief Simple predicate that checks whether the given argument
+ * corresponds to the Value Representation of a
+ * 'std::string representable' value.
+ * @param tested value representation to be checked.
*/
-bool VR::IsVROfGdcmStringRepresentable(VRKey const & tested)
+bool VR::IsVROfStringRepresentable(VRKey const &tested)
{
-
- if ( ! IsValidVR(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 == "DT" ||
+ tested == "FL" ||
+ tested == "FD" ||
+ 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
+ // --> will *never* work : any rotten value would be considered as OK !
+/*
+ return tested != "OB" &&
+ tested != "OW" &&
+ tested != "OF" &&
+ tested != "AT" && // Attribute Tag ?!? contain no printable character
+ tested != "UN" && // UN is an actual VR !
+ tested != "SQ" ;
+*/
+}
+/// \brief returns the length of a elementary elem whose VR is passed
+unsigned short VR::GetAtomicElementLength(VRKey const &tested)
+{
+ // 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;
+ // Float string
+ if( tested == "OF" || tested == "OL")
+ return 4;
+ return 1;
}
-bool VR::IsValidVR(VRKey const & key)
+// 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();
+#ifdef USECOMPLETELYUNTESTEDCODE
+ // to avoid to search in a std::map of std::string,
+ // since each std::string is 2 characters longs, we check the array
+ // (29 char comparisons in the worst case!)
+
+ // "RT" is an undocumented VR, found in some Siemens images.
+ // We added it here to be able to read these images.
+ // Dict/gdcmVR.dic, Document has to be updated, too.
+ static const char VRvalues[] =
+ "AEASATCSDADSDTFLFDISLOLTOBOWOLOFPNSHSLSQSSSTTMUIULUNUSUTRT";
+
+ //int nbVal = strlen(VRvalues)/2; // save CPU time.
+ int nbVal = 29;
+
+ const char *pt = VRvalues;
+ for (int i=0;i<nbVal;i++)
+ {
+ if(key[0] == *pt++) {
+ if(key[1] == *pt++) {
+ return true;
+ }
+ }
+ else {
+ pt++;
+ }
+ }
+ return false;
+#endif
+
}
+#endif
//-----------------------------------------------------------------------------
// Protected
// Private
//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief Print all
+ * @param os The output stream to be written to.
+ */
+void VR::Print(std::ostream &os,std::string const &)
+{
+ for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
+ {
+ os << "VR : " << it->first << " = " << it->second << std::endl;
+ }
+}
+//-----------------------------------------------------------------------------
} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff