removal of meaningless gdcmDicomDirImage::NewImage function

[gdcm.git] / src / gdcmVR.cxx

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 3d2ea9c2deb7fd3a4002446e611f27c286f42805..3732f2bd60cc31a24a23d4ea7baaa52c9ad700a4 100644 (file)
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -1,6 +1,6 @@
 // gdcmVR.cxx
 #include <fstream>
-
+//-----------------------------------------------------------------------------
 #include "gdcmVR.h"
 #include "gdcmUtil.h"
 
@@ -9,7 +9,18 @@
 #endif
 #define DICT_VR "dicomVR.dic"
 
-gdcmVR::gdcmVR(void) {
+#include <iostream>
+#ifdef GDCM_NO_ANSI_STRING_STREAM
+#  include <strstream>
+#  define  ostringstream ostrstream
+# else
+#  include <sstream>
+#endif
+
+//-----------------------------------------------------------------------------
+// Constructor / Destructor
+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());
@@ -18,7 +29,8 @@ gdcmVR::gdcmVR(void) {
    std::string key;
    std::string name;
 
-   while (!from.eof()) {
+   while (!from.eof()) 
+   {
       eatwhite(from);
       from.getline(buff, 1024, ' ');
       key = buff;
@@ -41,6 +53,40 @@ gdcmVR::~gdcmVR() {
    vr.clear();
 }
 
-int gdcmVR::Count(VRKey key) {
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \ingroup gdcmVR
+ * \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
+/**
+ * \ingroup gdcmVR
+ * \brief   Get the count for an element
+ * @param   key key to count
+ */
+int gdcmVR::Count(VRKey key) 
+{
    return vr.count(key);
 }
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------