ENH: Adding 'gdcm' namespace. Be nice with me this was a ~13000 lines patch. Also...

[gdcm.git] / src / gdcmVR.cxx

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 3d2ea9c2deb7fd3a4002446e611f27c286f42805..b45fbbb667d92a5066785bf53ad748a3d5360a50 100644 (file)
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -1,32 +1,56 @@
-// gdcmVR.cxx
-#include <fstream>
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmVR.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/10/12 04:35:48 $
+  Version:   $Revision: 1.19 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 
 #include "gdcmVR.h"
 #include "gdcmUtil.h"
+#include "gdcmDictSet.h"
+#include "gdcmDebug.h"
+
+#include <fstream>
+#include <iostream>
 
-#ifndef PUB_DICT_PATH
-#  define PUB_DICT_PATH     "../Dicts/"
-#endif
-#define DICT_VR "dicomVR.dic"
+namespace gdcm 
+{
 
-gdcmVR::gdcmVR(void) {
-   std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_VR);
+//-----------------------------------------------------------------------------
+/**
+ * \brief Constructor
+ */
+VR::VR() 
+{
+   std::string filename=DictSet::BuildDictPath() + std::string(DICT_VR);
    std::ifstream from(filename.c_str());
-   dbg.Error(!from, "gdcmVR::gdcmVR: can't open dictionary",filename.c_str());
+   dbg.Error(!from, "VR::VR: can't open dictionary",filename.c_str());
 
    char buff[1024];
    std::string key;
    std::string name;
 
-   while (!from.eof()) {
-      eatwhite(from);
+   while (!from.eof()) 
+   {
+      from >> std::ws; // used to be eatwhite(from);
       from.getline(buff, 1024, ' ');
       key = buff;
-      eatwhite(from);
+      from >> std::ws; // used to be eatwhite(from);
       from.getline(buff, 1024, ';');
       name = buff;
 
-      eatwhite(from);
+      from >> std::ws; // used to be eatwhite(from);
       from.getline(buff, 1024, '\n');
 
       if(key!="")
@@ -37,10 +61,107 @@ gdcmVR::gdcmVR(void) {
    from.close();
 }
 
-gdcmVR::~gdcmVR() {
+//-----------------------------------------------------------------------------
+/**
+ * \brief Destructor
+ */
+VR::~VR()
+{
    vr.clear();
 }
 
-int gdcmVR::Count(VRKey key) {
+//-----------------------------------------------------------------------------
+// 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 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 .
+ * @param   tested value representation to check for.
+ */
+bool VR::IsVROfGdcmBinaryRepresentable(VRKey tested)
+{
+   //std::cout << "VR::IsVROfGdcmBinaryRepresentable===================="
+   //   << tested << std::endl;
+
+   if ( tested == "unkn")
+      return true;
+
+   if ( ! Count(tested) )
+   {
+      dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
+      return false;
+   }
+
+   if ( IsVROfGdcmStringRepresentable(tested) )
+   {
+      dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: binary VR !");
+      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.
+ */
+bool VR::IsVROfGdcmStringRepresentable(VRKey tested)
+{
+
+   if ( ! Count(tested) )
+   {
+      dbg.Verbose(0, "VR::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" || tested == "UN")
+   {
+      return true;
+   }
+   return false;
+}
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+
+} // end namespace gdcm