Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2005/10/20 14:25:47 $
- Version: $Revision: 1.43 $
+ Date: $Date: 2007/06/22 10:02:48 $
+ Version: $Revision: 1.56 $
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
{
//-----------------------------------------------------------------------------
/// \brief auto generated function, to fill up the 'Value Representation'
std::ifstream from(filename.c_str());
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();
}
*/
bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
{
- //if ( tested == GDCM_UNKNOWN)
- //{
- //std::cout << "---------- never used --------------" << tested
- // << std::endl;
- // return true;
- //}
-
if ( IsVROfStringRepresentable(tested) )
return false;
/**
* \brief Simple predicate that checks whether the given argument
- * corresponds to the Value Representation of a representable
- * string.
+ * corresponds to the Value Representation of a
+ * 'std::string representable' value.
* @param tested value representation to be checked.
*/
bool VR::IsVROfStringRepresentable(VRKey const &tested)
tested == "CS" ||
tested == "DA" ||
tested == "DS" ||
+ tested == "FL" ||
+ tested == "FD" ||
tested == "IS" ||
tested == "LO" ||
tested == "LT" ||
tested == "US" ||
tested == "UT";
- // Should be quicker --> But it doesn't work : revert to old code
+ // Should be quicker
+ // --> will *never* work : any rotten value would be considered as OK !
/*
- return tested != "FL" &&
- tested != "FD" &&
- tested != "OB" &&
+ return tested != "OB" &&
tested != "OW" &&
- tested != "AT" && // Attribute Tag ?!?
+ 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
// Word string
if( tested == "OW" )
return 2;
+ // Float string
+ if( tested == "OF" )
+ return 4;
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 &tested)
+{
+// return vr.find(key) != vr.end();
+ static const char VRvalues[] =
+ "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQ";
+
+ int nbVal = 26;
+ const char *pt = VRvalues;
+ for (int i=0;i<nbVal;i++)
+ {
+ if(tested[0] == *pt++) {
+ if(tested[1] == *pt++)
+ return true;
+ }
+ else {
+ pt++;
+ }
+ }
+ return false;
+
+}
+#endif
+
//-----------------------------------------------------------------------------
// Protected
* \brief Print all
* @param os The output stream to be written to.
*/
-void VR::Print(std::ostream &os)
+void VR::Print(std::ostream &os,std::string const &)
{
for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
{