X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=8d5f308b2ce1875733c6ec9c91942d20e9d8ebc7;hb=8e7d7cb974953d9bc78b905451de7ca72887dc58;hp=1760277ab7fb3d789c8633dfdbe8da32d93df929;hpb=17ebda2271dd65565f512e835546b22c22ebbbb0;p=gdcm.git

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 1760277a..8d5f308b 100644
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/04/11 16:03:26 $
-  Version:   $Revision: 1.83 $
+  Date:      $Date: 2007/08/29 15:30:49 $
+  Version:   $Revision: 1.93 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,7 +27,7 @@
 #include <iomanip> // for std::ios::left, ...
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 
@@ -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 || group == 0x0002 )
+   if ( filetype == ExplicitVR || filetype == JPEG || filetype == JPEG2000 || (group == 0x0002 && insideMetaElements) )
    {
 // ----------- Writes the common part : the VR + the length 
   
@@ -125,21 +125,27 @@ 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") 
           ||  (vr == "UN") || (vr == "UT") )
          {
             binary_write(*fp, zero);
-            if (vr == "SQ")
+
+           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")
             {
                // we set SQ length to ffffffff
                // and  we shall write a Sequence Delimitor Item 
@@ -155,7 +161,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
          {
             binary_write(*fp, shortLgr);
          }
-      }
+      //}
    } 
    else // IMPLICIT VR 
    { 
@@ -229,33 +235,6 @@ uint32_t DocEntry::GetFullLength()
    return l;
 }
 
-/**
- * \brief   tells us if entry is the last one of a 'no length' SequenceItem 
- *          (fffe,e00d) 
- */
-bool DocEntry::IsItemDelimitor()
-{
-   return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
-}
-
-/**
- * \brief   tells us if entry is the first one of an Item 
- *          (fffe,e000) 
- */
-bool DocEntry::IsItemStarter()
-{
-   return (GetGroup() == 0xfffe && GetElement() == 0xe000);
-}
-
-/**
- * \brief   tells us if entry is the last one of a 'no length' Sequence 
- *          (fffe,e0dd) 
- */
-bool DocEntry::IsSequenceDelimitor()
-{
-   return (GetGroup() == 0xfffe && GetElement() == 0xe0dd);
-}
-
 /**
  * \brief Copies all the attributes from an other DocEntry 
  * @param doc entry to copy from
@@ -332,11 +311,25 @@ void DocEntry::Print(std::ostream &os, std::string const & )
    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);