Fix mistypings

[gdcm.git] / src / gdcmDocEntry.cxx

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 1e7555f33c69b91937aabd067119881fccf22928..747a1479b3370de7ca792caef152d77de03e98bf 100644 (file)
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/07/06 16:57:06 $
-  Version:   $Revision: 1.86 $
+  Date:      $Date: 2007/10/30 09:14:42 $
+  Version:   $Revision: 1.96 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,13 +27,13 @@
 #include <iomanip> // for std::ios::left, ...
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 
 // Constructor / Destructor
 /**
- * \brief   Constructor from a given DictEntry
+ * \brief   Constructor from a given DocEntry
  * @param   group Group number
  * @param   elem Element number
  * @param   vr VR 
@@ -42,7 +42,7 @@ DocEntry::DocEntry(uint16_t group, uint16_t elem, VRKey const &vr)
 {
    ImplicitVR = false;
    DicomDict  = 0;   
-   Offset     = 0 ; // To avoid further missprinting
+   Offset     = 0 ; // To avoid further misprinting
 
    // init some variables
    ReadLength = 0;
@@ -53,7 +53,7 @@ DocEntry::DocEntry(uint16_t group, uint16_t elem, VRKey const &vr)
 }
 
 /**
- * \brief   Destructor from a given DictEntry
+ * \brief   Destructor from a given DocEntry
  */
 DocEntry::~DocEntry()
 {
@@ -69,9 +69,9 @@ DocEntry::~DocEntry()
 /**
  * \brief   Writes the common part of any DataEntry, SeqEntry
  * @param fp already open ofstream pointer
- * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, JPEG, JPEG2000...)
  */
-void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
+void DocEntry::WriteContent(std::ofstream *fp, FileType filetype, bool insideMetaElements, bool insideSequence)
 {
    uint32_t ffff  = 0xffffffff;
    uint16_t group = GetGroup();
@@ -103,7 +103,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    binary_write( *fp, elem);  //element number
 
    // Dicom V3 group 0x0002 is *always* Explicit VR !
-   if ( filetype == ExplicitVR || filetype == JPEG || filetype == JPEG2000 || group == 0x0002 )
+   if ( filetype == ExplicitVR || filetype == JPEG || filetype == JPEG2000 || (group == 0x0002 && insideMetaElements) )
    {
 // ----------- Writes the common part : the VR + the length 
   
@@ -125,23 +125,24 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
       uint16_t zero = 0;
       uint16_t shortLgr = (uint16_t)lgth;
 
-      if( IsVRUnknown() )
-      {
-         // GDCM_VRUNKNOWN was stored in the Entry VR;
-         // deal with Entry as if TS were Implicit VR
-         binary_write(*fp, lgth);
-      }
-      else
+      if( IsVRUnknown() )  
       {
+      // if VR was not set by user, we set it to "UN"
+         SetVR("UN");
+         vr=GetVR();
+      }      
+     
+      //{
          binary_write(*fp, vr.str());
          // See PS 3.5-2004 page 33, 36                  
-         if ( (vr == "SQ") || (vr == "OB") || (vr == "OW") || (vr == "OF") 
+         if ( (vr == "SQ") || (vr == "OB") || (vr == "OW") || (vr == "OL") || (vr == "OF") 
           ||  (vr == "UN") || (vr == "UT") )
          {
             binary_write(*fp, zero);
-           if ( (filetype == JPEG || filetype == JPEG2000) && group == 0x7fe0 && elem == 0x0010)
-            {
-               gdcmAssertMacro( GetVR() == "OW" );
+
+           if ( (filetype == JPEG || filetype == JPEG2000) && group == 0x7fe0 && elem == 0x0010 && !insideSequence)
+            { 
+              // Only the 'true' Pixel Element may be compressed (hope so!)
                binary_write(*fp, ffff);
             }  
             else if (vr == "SQ")
@@ -160,7 +161,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
          {
             binary_write(*fp, shortLgr);
          }
-      }
+      //}
    } 
    else // IMPLICIT VR 
    { 
@@ -222,7 +223,7 @@ uint32_t DocEntry::GetFullLength()
    }
    else
    {
-      if ( GetVR()=="OB" || GetVR()=="OW" || GetVR()=="SQ" )
+      if ( GetVR()=="OB" || GetVR()=="OW" || GetVR()=="OL" || GetVR()=="SQ" )
       {
          l = l + 12; // 2 (gr) + 2 (el) + 2 (vr) + 2 (unused) + 4 (lgth)
       }
@@ -255,7 +256,7 @@ void DocEntry::Copy(DocEntry *doc)
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \brief   Prints the common part of DataEntry, SeqEntry
+ * \brief   Prints the common part (vr [length offset] name) of DataEntry, SeqEntry
  * @param   os ostream we want to print in
  * @param indent Indentation string to be prepended during printing
  */
@@ -304,17 +305,31 @@ void DocEntry::Print(std::ostream &os, std::string const & )
       s << st << " ";
       s << std::setw(8) << o; 
    }
-   if (PrintLevel >= 1)
+   //if (PrintLevel >= 1)
       s << " ";
 
    s << "[" << vr  << "] ";
 
    std::string name;
-   if ( GetElement() == 0x0000 )
+   uint16_t e = GetElement();
+   if ( e == 0x0000 )
       name = "Group Length";
+   else if ( GetGroup()%2 == 1 )
+   {
+      if ( e >= 0x0010 && e <= 0x00ff )
+         name = "Private Creator";
+      else if (e == 0x0001)
+         name = "Private Group Length To End";
+   }
    else
+   {
       name = GetName();
-
+      // prevent Print from any CR at end of name (hope it's enought!)
+      if (name[name.length()-1] == 0x0d || name[name.length()-1] == 0x0a)
+      {  
+         name.replace(name.length()-1, 1, 1, ' ');
+      }
+   }
    if (PrintLevel >= 1)
    {
       s.setf(std::ios::left);