X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=8f543f34ca57c4e5cbd08851ac8929de64cb4a0c;hb=c1e76b5446c340a4b2df46cabedeab2d71bd45f8;hp=7f9613dccc45a16711a54f466f6ba96e56a80c54;hpb=6b91390e1086959c40c0ae9a37912877a6f14c36;p=gdcm.git

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 7f9613dc..8f543f34 100644
--- 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/21 04:43:02 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2004/06/22 13:47:33 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,20 +27,20 @@
 //-----------------------------------------------------------------------------
 // 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 ?
 }
 
 /**
- * \ingroup gdcmValEntry
  * \brief   Constructor from a given gdcmDocEntry
  * @param   e Pointer to existing Doc entry
  */
-gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry()){
+gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry())
+{
    this->UsableLength = e->GetLength();
    this->ReadLength   = e->GetReadLength();
    this->ImplicitVR   = e->IsImplicitVR();
@@ -55,7 +55,8 @@ gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry()){
 /**
  * \brief   Canonical destructor.
  */
-gdcmValEntry::~gdcmValEntry (void) {
+gdcmValEntry::~gdcmValEntry (void)
+{
    if (!voidArea)  // will be in BinEntry
       free(voidArea);
 }
@@ -64,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;  //not used
    unsigned short int g, e;
    char st[20];
    TSKey v;
@@ -90,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)  
@@ -116,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 
@@ -128,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;
    }
@@ -137,7 +132,48 @@ void gdcmValEntry::Print(std::ostream & os) {
    s << std::endl;
    os << s.str();   
 }
- 
+
+
+/*
+ * \brief   canonical Writer
+ */
+void gdcmValEntry::Write(FILE *fp, FileType filetype) {
+      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