X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=3c58e70158dfddc08983a1af6b9a2439abf941e8;hb=0d8ca63a1a2c1a61c2e2b92526ba81c9885702ba;hp=e48acc0c9b05f4f6d088337ffecb17ea6854d0e5;hpb=0d33ba5ffb1c6beac21f33bd3e3aad67b7608c9d;p=gdcm.git

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index e48acc0c..3c58e701 100644
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -1,6 +1,21 @@
-// gdcmValEntry.cxx
-//-----------------------------------------------------------------------------
-//
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmValEntry.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/06/24 18:03:14 $
+  Version:   $Revision: 1.14 $
+                                                                                
+  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.htm 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 "gdcmValEntry.h"
 #include "gdcmTS.h"
 #include "gdcmGlobal.h"
@@ -12,18 +27,36 @@
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup gdcmValEntry
  * \brief   Constructor from a given gdcmDictEntry
  * @param   e Pointer to existing dictionary entry
  */
-gdcmValEntry::gdcmValEntry(gdcmDictEntry* e) : gdcmDocEntry(e) {
-   voidArea = NULL;
+gdcmValEntry::gdcmValEntry(gdcmDictEntry* e) : gdcmDocEntry(e)
+{
+   voidArea = NULL; // will be in BinEntry ?
+}
+
+/**
+ * \brief   Constructor from a given gdcmDocEntry
+ * @param   e Pointer to existing Doc entry
+ */
+gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry())
+{
+   this->UsableLength = e->GetLength();
+   this->ReadLength   = e->GetReadLength();
+   this->ImplicitVR   = e->IsImplicitVR();
+   this->Offset       = e->GetOffset();
+   this->printLevel   = e->GetPrintLevel();
+   this->SQDepthLevel = e->GetDepthLevel();
+
+   this->voidArea = NULL; // will be in BinEntry ?
 }
 
+
 /**
  * \brief   Canonical destructor.
  */
-gdcmValEntry::~gdcmValEntry (void) {
+gdcmValEntry::~gdcmValEntry (void)
+{
    if (!voidArea)  // will be in BinEntry
       free(voidArea);
 }
@@ -31,49 +64,39 @@ gdcmValEntry::~gdcmValEntry (void) {
 
 //-----------------------------------------------------------------------------
 // Print
-/*
-
 /**
- * \ingroup gdcmValEntry
  * \brief   canonical Printer
  */
-void gdcmValEntry::Print(std::ostream & os) { 
-
+void gdcmValEntry::Print(std::ostream & os)
+{
+   guint16 g = GetGroup();
+   guint16 e = GetElement();
+   std::string vr = GetVR();
    std::ostringstream s; 
-   size_t o;
-   unsigned short int g, e;
    char st[20];
    TSKey v;
-   std::string d2, vr;
+   std::string d2;
      
-   PrintCommonPart(os); 
+   gdcmDocEntry::Print(os); 
 
-   g  = GetGroup();
-   
-   if (g == 0xfffe) {
-      s << std::endl;
-      os << s.str(); 
-      return;  // just to avoid identing all the remaining code     
+   if (g == 0xfffe)
+   {
+      // just to avoid identing all the remaining code     
+      return;
    }
    
-   e  = GetElement();
-   vr = GetVR();
    gdcmTS * ts = gdcmGlobal::GetTS();
     
-   if (voidArea != NULL) { // should be moved in gdcmBinEntry Printer (when any)
-       s << " [gdcm::Non String Data Loaded in Unsecure Area (" 
-         << GetLength() << ") ]";
-   } 
-   
-   else {
-      v  = GetValue();  // not applicable for SQ ...     
-      d2 = CreateCleanString(v);  // replace non printable characters by '.'            
-      if( (GetLength()<=MAX_SIZE_PRINT_ELEMENT_VALUE) || 
-          (printLevel>=3)  || 
-          (d2.find("gdcm::NotLoaded.") < d2.length()) )
-         s << " [" << d2 << "]";
-      else 
-         s << " [gdcm::too long for print (" << GetLength() << ") ]";
+   v  = GetValue();  // not applicable for SQ ...     
+   d2 = CreateCleanString(v);  // replace non printable characters by '.'            
+   if( (GetLength()<=MAX_SIZE_PRINT_ELEMENT_VALUE) || 
+       (printLevel>=3)  || (d2.find("gdcm::NotLoaded.") < d2.length()) )
+   {
+      s << " [" << d2 << "]";
+   }
+   else
+   {
+      s << " [gdcm::too long for print (" << GetLength() << ") ]";
    }
    
    // Display the UID value (instead of displaying only the rough code)  
@@ -86,28 +109,70 @@ void gdcmValEntry::Print(std::ostream & os) {
             s << "  ==>\t[" << ts->GetValue(v) << "]";
       } else {
          if (g == 0x0004) {
-	    if ( (e == 0x1510) || (e == 0x1512)  )
-	       s << "  ==>\t[" << ts->GetValue(v) << "]";
-	 }     
+           if ( (e == 0x1510) || (e == 0x1512)  )
+              s << "  ==>\t[" << ts->GetValue(v) << "]";
+         }     
       }
    }
    //if (e == 0x0000) {        // elem 0x0000 --> group length 
-   if ( (vr == "UL") || (vr == "US") || (vr == "SL") || (vr == "SS") ) {
+   if ( (vr == "UL") || (vr == "US") || (vr == "SL") || (vr == "SS") )
+   {
       if (v == "4294967295") // to avoid troubles in convertion 
          sprintf (st," x(ffffffff)");
       else {
          if ( GetLength() !=0 )        
             sprintf(st," x(%x)", atoi(v.c_str()));//FIXME
-	 else
-	  sprintf(st," "); 
+        else
+            sprintf(st," "); 
       }
       s << st;
    }
-        
-   s << std::endl;
-   os << s.str();   
+   os << s.str();
 }
- 
+
+/*
+ * \brief   canonical Writer
+ */
+void gdcmValEntry::Write(FILE *fp, FileType filetype)
+{
+   gdcmDocEntry::Write(fp, filetype);
+   std::string vr=GetVR();
+   int lgr=GetReadLength();
+   if (vr == "US" || vr == "SS")
+   {
+      // some 'Short integer' fields may be mulivaluated
+      // each single value is separated from the next one by '\'
+      // we split the string and write each value as a short int
+      std::vector<std::string> tokens;
+      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());
+         void *ptr = &val_uint16;
+         fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
+      }
+      tokens.clear();
+      return;
+   }
+   if (vr == "UL" || vr == "SL")
+   {
+      // Some 'Integer' fields may be multivaluated (multiple instances 
+      // of integers). But each single integer value is separated from the
+      // next one by '\' (backslash character). Hence we split the string
+      // along the '\' and write each value as an int:
+      std::vector<std::string> tokens;
+      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());
+         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
+} 
 
 //-----------------------------------------------------------------------------
 // Public