X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=12370084c5d39d408fb226c2cc210acb751e21db;hb=75262e67ec39ad2f359c1efbf9ee805819a8e58a;hp=de4f1e1c2d2d46ba33cf484bf1e6c3dd419c195c;hpb=06c1c583239fdf5196260e6ef83a78669c1bd17f;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index de4f1e1c..12370084 100644
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -1,17 +1,20 @@
 // gdcmVR.cxx
-#include <fstream>
 //-----------------------------------------------------------------------------
+#include <fstream>
+
+#include <iostream>
+
 #include "gdcmVR.h"
 #include "gdcmUtil.h"
-
-#ifndef PUB_DICT_PATH
-#  define PUB_DICT_PATH     "../Dicts/"
-#endif
-#define DICT_VR "dicomVR.dic"
+#include "gdcmDictSet.h"
+#include "gdcmDebug.h"
 
 //-----------------------------------------------------------------------------
-// Constructor / Destructor
-gdcmVR::gdcmVR(void) {
+/**
+ * \brief Constructor
+ */
+gdcmVR::gdcmVR(void) 
+{
    std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_VR);
    std::ifstream from(filename.c_str());
    dbg.Error(!from, "gdcmVR::gdcmVR: can't open dictionary",filename.c_str());
@@ -20,7 +23,8 @@ gdcmVR::gdcmVR(void) {
    std::string key;
    std::string name;
 
-   while (!from.eof()) {
+   while (!from.eof()) 
+   {
       eatwhite(from);
       from.getline(buff, 1024, ' ');
       key = buff;
@@ -39,19 +43,90 @@ gdcmVR::gdcmVR(void) {
    from.close();
 }
 
+/**
+ * \brief Destructor
+ */
 gdcmVR::~gdcmVR() {
    vr.clear();
 }
 
 //-----------------------------------------------------------------------------
 // Print
+/**
+ * \brief   Print all 
+ * @param   os The output stream to be written to.
+ */
+void gdcmVR::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
-int gdcmVR::Count(VRKey key) {
+/**
+ * \brief   Get the count for an element
+ * @param   key key to count
+ */
+int gdcmVR::Count(VRKey key) 
+{
    return vr.count(key);
 }
 
+/**
+ * \brief   Simple predicate that checks wether the given argument
+ *          corresponds to the Value Representation of a \ref gdcmBinEntry .
+ *          This predicate is the negation of
+ *          \ref gdcmVR::IsVROfGdcmStringRepresentable .
+ * @param   tested value represenation to check for.
+ */
+bool gdcmVR::IsVROfGdcmBinaryRepresentable(VRKey tested)
+{
+   if ( ! Count(tested) )
+   {
+      dbg.Verbose(0, "gdcmVR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
+      return false;
+   }
+
+   if ( IsVROfGdcmStringRepresentable(tested) )
+   {
+      dbg.Verbose(0, "gdcmVR::IsVROfGdcmBinaryRepresentable: binary VR !");
+      return false;
+   }
+
+   return true;
+}
+
+/**
+ * \brief   Simple predicate that checks wether the given argument
+ *          corresponds to the Value Representation of a \ref gdcmValEntry
+ *          but NOT a \ref gdcmBinEntry.
+ * @param   tested value represenation to check for.
+ */
+bool gdcmVR::IsVROfGdcmStringRepresentable(VRKey tested)
+{
+   if ( ! Count(tested) )
+   {
+      dbg.Verbose(0, "gdcmVR::IsVROfGdcmStringRepresentable: tested not a VR!");
+      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" )
+   {
+      return true;
+   }
+   return false;
+}
+
 //-----------------------------------------------------------------------------
 // Protected