X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=536aea3695acd93c8094f62f478bc1e74642b408;hb=67103c260bf25e83fcd847e995783614e41cde5d;hp=802557d1f25b4e2d10bb9056722773c08487b48a;hpb=541ed5b2824ff14630565a474b1406e58b677662;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 802557d1..536aea36 100644
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -1,47 +1,100 @@
 // gdcmVR.cxx
+//-----------------------------------------------------------------------------
+#include <fstream>
+
+#include <iostream>
+#ifdef GDCM_NO_ANSI_STRING_STREAM
+#  include <strstream>
+#  define  ostringstream ostrstream
+# else
+#  include <sstream>
+#endif
 
 #include "gdcmVR.h"
 #include "gdcmUtil.h"
+#include "gdcmDictSet.h"
+#include "gdcmDebug.h"
+
+#ifndef PUB_DICT_PATH
+#  define PUB_DICT_PATH     "../Dicts/"
+#endif
+#define DICT_VR "dicomVR.dic"
+
+//-----------------------------------------------------------------------------
+/**
+ * \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());
+
+   char buff[1024];
+   std::string key;
+   std::string name;
+
+   while (!from.eof()) 
+   {
+      eatwhite(from);
+      from.getline(buff, 1024, ' ');
+      key = buff;
+      eatwhite(from);
+      from.getline(buff, 1024, ';');
+      name = buff;
+
+      eatwhite(from);
+      from.getline(buff, 1024, '\n');
 
-gdcmVR::gdcmVR () {
-   // NOTE: making the affectation directely to dicom_vr instead of passing
-   //       through an apparently unncessary local variable vr, crashes with
-   //       gcc... Beware.
-   VRHT *vr = new VRHT;
-   (*vr)["AE"] = "Application Entity";    // At most 16 bytes
-   (*vr)["AS"] = "Age String";            // Exactly 4 bytes
-   (*vr)["AT"] = "Attribute Tag";         // 2 16-bit unsigned short integers
-   (*vr)["CS"] = "Code String";           // At most 16 bytes
-   (*vr)["DA"] = "Date";                  // Exactly 8 bytes
-   (*vr)["DS"] = "Decimal String";        // At most 16 bytes
-   (*vr)["DT"] = "Date Time";             // At most 26 bytes
-   (*vr)["FL"] = "Floating Point Single"; // 32-bit IEEE 754:1985 float
-   (*vr)["FD"] = "Floating Point Double"; // 64-bit IEEE 754:1985 double
-   (*vr)["IS"] = "Integer String";        // At most 12 bytes
-   (*vr)["LO"] = "Long String";           // At most 64 chars
-   (*vr)["LT"] = "Long Text";             // At most 10240 chars
-   (*vr)["OB"] = "Other Byte String";     // String of bytes (vr independant)
-   (*vr)["OW"] = "Other Word String";     // String of 16-bit words (vr dep)
-   (*vr)["PN"] = "Person Name";           // At most 64 chars
-   (*vr)["SH"] = "Short String";          // At most 16 chars
-   (*vr)["SL"] = "Signed Long";           // Exactly 4 bytes
-   (*vr)["SQ"] = "Sequence of Items";     // Not Applicable
-   (*vr)["SS"] = "Signed Short";          // Exactly 2 bytes
-   (*vr)["ST"] = "Short Text";            // At most 1024 chars
-   (*vr)["TM"] = "Time";                  // At most 16 bytes
-   (*vr)["UI"] = "Unique Identifier";     // At most 64 bytes
-   (*vr)["UL"] = "Unsigned Long ";        // Exactly 4 bytes
-   (*vr)["UN"] = "Unknown";               // Any length of bytes
-   (*vr)["US"] = "Unsigned Short ";       // Exactly 2 bytes
-   (*vr)["UT"] = "Unlimited Text";        // At most 2^32 -1 chars
-   dicom_vr = vr;
+      if(key!="")
+      {
+         vr[key]=name;
+      }
+   }
+   from.close();
 }
 
+/**
+ * \brief Destructor
+ */
 gdcmVR::~gdcmVR() {
-   dicom_vr->clear();
-   delete dicom_vr;
+   vr.clear();
 }
 
-int gdcmVR::Count(VRKey key) {
-   return dicom_vr->count(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
+
+//-----------------------------------------------------------------------------