DICOMDIR skeleton modifs, for future version

[gdcm.git] / src / gdcmValEntry.cxx

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index c0082d832bb279989dfb8cdf9822fb1630f99fad..36bdca4f6fa6926b9acd2a6a57bb2d6442c50ee9 100644 (file)
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/23 13:02:36 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2004/07/20 08:29:13 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -69,8 +69,8 @@ gdcmValEntry::~gdcmValEntry (void)
  */
 void gdcmValEntry::Print(std::ostream & os)
 {
-   guint16 g = GetGroup();
-   guint16 e = GetElement();
+   uint16_t g = GetGroup();
+   uint16_t e = GetElement();
    std::string vr = GetVR();
    std::ostringstream s; 
    char st[20];
@@ -99,18 +99,31 @@ void gdcmValEntry::Print(std::ostream & os)
       s << " [gdcm::too long for print (" << GetLength() << ") ]";
    }
    
-   // Display the UID value (instead of displaying only the rough code)  
+   // Display the UID value (instead of displaying only the rough code)
+   // First 'clean' trailing character (space or zero) 
    if (g == 0x0002) {  // Any more to be displayed ?
-      if ( (e == 0x0010) || (e == 0x0002) )
+      if ( (e == 0x0010) || (e == 0x0002) ) {
+         if ( v.length() != 0 )  // for brain damaged headers
+            if ( ! isdigit(v[v.length()-1]) )
+               v.erase(v.length()-1, 1);
          s << "  ==>\t[" << ts->GetValue(v) << "]";
+      }
    } else {
       if (g == 0x0008) {
-         if ( (e == 0x0016) || (e == 0x1150)  )
+         if ( (e == 0x0016) || (e == 0x1150)  ) {
+            if ( v.length() != 0 )  // for brain damaged headers
+               if ( ! isdigit(v[v.length()-1]) )
+                  v.erase(v.length()-1, 1);
             s << "  ==>\t[" << ts->GetValue(v) << "]";
+         }
       } else {
          if (g == 0x0004) {
-           if ( (e == 0x1510) || (e == 0x1512)  )
+           if ( (e == 0x1510) || (e == 0x1512)  ) {
+              if ( v.length() != 0 )  // for brain damaged headers  
+                 if ( ! isdigit(v[v.length()-1]) )
+                    v.erase(v.length()-1, 1);  
               s << "  ==>\t[" << ts->GetValue(v) << "]";
+            }
          }     
       }
    }
@@ -137,7 +150,7 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
 {
    gdcmDocEntry::Write(fp, filetype);
    std::string vr=GetVR();
-   int lgr=GetLength();
+   int lgr=GetReadLength();
    if (vr == "US" || vr == "SS")
    {
       // some 'Short integer' fields may be mulivaluated
@@ -147,7 +160,7 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
       tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
       Tokenize (GetValue(), tokens, "\\");
       for (unsigned int i=0; i<tokens.size();i++) {
-         guint16 val_uint16 = atoi(tokens[i].c_str());
+         uint16_t val_uint16 = atoi(tokens[i].c_str());
          void *ptr = &val_uint16;
          fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
       }
@@ -164,13 +177,14 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
       tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
       Tokenize (GetValue(), tokens, "\\");
       for (unsigned int i=0; i<tokens.size();i++){
-         guint32 val_uint32 = atoi(tokens[i].c_str());
+         uint32_t val_uint32 = atoi(tokens[i].c_str());
          void *ptr = &val_uint32;
          fwrite ( ptr,(size_t)4 ,(size_t)1 ,fp);
       }
       tokens.clear();
       return;
-   }           
+   } 
+          
    fwrite (GetValue().c_str(), (size_t)lgr ,(size_t)1, fp); // Elem value
 }