X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=b5575cfe24c2e2cad30f81a57971f064b9a8d590;hb=19f72d139faa0f6a03f4e4a33be4c6b3e70b18b7;hp=a329b54ce035fdf711f7393eab12532b5c655aba;hpb=98ab91206c2a0e603d6d9b11951860e5c78e315a;p=gdcm.git

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index a329b54c..b5575cfe 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/22 14:37:04 $
+  Version:   $Revision: 1.12 $
+                                                                                
+  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) {
+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);
 }
@@ -32,13 +65,11 @@ gdcmValEntry::~gdcmValEntry (void) {
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmValEntry
  * \brief   canonical Printer
  */
-void gdcmValEntry::Print(std::ostream & os) { 
-
+void gdcmValEntry::Print(std::ostream & os)
+{
    std::ostringstream s; 
-   size_t o;
    unsigned short int g, e;
    char st[20];
    TSKey v;
@@ -58,20 +89,16 @@ void gdcmValEntry::Print(std::ostream & os) {
    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)  
@@ -84,9 +111,9 @@ 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 
@@ -96,8 +123,8 @@ void gdcmValEntry::Print(std::ostream & os) {
       else {
          if ( GetLength() !=0 )        
             sprintf(st," x(%x)", atoi(v.c_str()));//FIXME
-	 else
-	  sprintf(st," "); 
+        else
+            sprintf(st," "); 
       }
       s << st;
    }
@@ -105,7 +132,48 @@ void gdcmValEntry::Print(std::ostream & os) {
    s << std::endl;
    os << s.str();   
 }
- 
+
+
+/*
+ * \brief   canonical Writer
+ */
+void gdcmValEntry::Write(FILE *fp) {
+      std::string vr=GetVR();
+      int lgr=GetLength();
+      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