X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirElement.cxx;h=3d5733d505f80d23aa3185be9ba5c08b7b5478bc;hb=df832cf7f90b4ca5aca2f628c1756fb276779fac;hp=d0bc124b95ebd851c98fc5ea881b1f2ffd72de0a;hpb=17d3405e9cd2d1846dd7e6b62b99372cc94e16c2;p=gdcm.git

diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx
index d0bc124b..3d5733d5 100644
--- a/src/gdcmDicomDirElement.cxx
+++ b/src/gdcmDicomDirElement.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirElement.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/04 15:29:59 $
-  Version:   $Revision: 1.42 $
+  Date:      $Date: 2007/05/23 14:18:08 $
+  Version:   $Revision: 1.45 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,7 +24,7 @@
 #include <fstream>
 #include <iostream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 /// \brief auto generate function, to fill up the default elements for 
@@ -50,10 +50,10 @@ DicomDirElement::DicomDirElement()
    else
    {
       char buff[1024];
+      char buff2[1024];
       std::string strType;
       DicomElement elem;
       DicomDirType type;
-
       while (!from.eof())
       {
          from >> std::ws;
@@ -80,14 +80,20 @@ DicomDirElement::DicomDirElement()
 
          if ( type!=DD_UNKNOWN )
          {
-            from >> std::hex >> elem.Group >> elem.Elem;
+            from >> std::hex >> elem.Group >> elem.Elem;//  >> elem.VR;
 
+            from.getline(buff2, 1024, '"');
+            from >> std::ws;
+            from.getline(buff2, 1024, '"');
+            elem.VR[0] = buff2[0];
+            elem.VR[1] = buff2[1];
+ // std::cout << "VR : [" <<  elem.VR[0] << elem.VR[1] << "]" << std::endl;  // JPR
             from >> std::ws;
             from.getline(buff, 1024, '"');
             from >> std::ws;
             from.getline(buff, 1024, '"');
             elem.Value = buff;
-
+    
             AddEntry(type, elem);
          }
          from.getline(buff, 1024, '\n');
@@ -147,13 +153,15 @@ bool DicomDirElement::AddEntry(DicomDirType type, DicomElement const &elem)
  * @param type Element type (DD_PATIENT, DD_STUDY, DD_SERIE, DD_IMAGE) 
  * @param group  Group number of the entry to be added
  * @param elem Element number of the entry to be added
+ * @param vr Value Representation of the entry to be added
  */
 void DicomDirElement::AddDicomDirElement(DicomDirType type,
-                                         uint16_t group, uint16_t elem)
+                                         uint16_t group, uint16_t elem, VRKey vr)
 {
    DicomElement el;
    el.Group = group;
    el.Elem  = elem;
+   el.VR    = vr;
    el.Value = "";
    AddEntry(type, el);
 }
@@ -174,7 +182,6 @@ void DicomDirElement::Print(std::ostream &os,std::string const &)
 {
    std::ostringstream s;
    std::list<DicomElement>::iterator it;
-   //char greltag[10];  //group element tag
    TagKey greltag;
 
    s << "Meta Elements :"<<std::endl;