X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=41b2b30afe7926141938e472f319ea0ffe047479;hb=40b909789581894e57a0d8f22d6f1f91f55e7f84;hp=fd4d24993c019c7183da9ac5997c1bfa3df3eb66;hpb=0accc3e4b95c96903d4fb6a792d657bf1e509375;p=gdcm.git

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index fd4d2499..41b2b30a 100644
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSeqEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/24 18:03:14 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2004/10/12 04:35:48 $
+  Version:   $Revision: 1.31 $
                                                                                 
   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.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -24,24 +24,47 @@
 
 #include <iostream>
 #include <iomanip>
+
+namespace gdcm 
+{
+
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup gdcmSeqEntry
- * \brief   Constructor from a given gdcmSeqEntry
+ * \ingroup SeqEntry
+ * \brief   Constructor from a given SeqEntry
  */
-gdcmSeqEntry::gdcmSeqEntry(gdcmDictEntry* e, int depth) 
-             : gdcmDocEntry(e)
+SeqEntry::SeqEntry( DictEntry* e ) 
+             : DocEntry(e)
 {
+   UsableLength = 0;
+   ReadLength = 0xffffffff;
+   SQDepthLevel = -1;
+
    delimitor_mode = false;
    seq_term  = NULL;
+}
+
+/**
+ * \brief   Constructor from a given SeqEntry
+ * @param   e Pointer to existing Doc entry
+ * @param   depth depth level of the current Seq entry
+  */
+SeqEntry::SeqEntry( DocEntry* e, int depth )
+             : DocEntry( e->GetDictEntry() )
+{
+   this->UsableLength = 0;
+   this->ReadLength   = 0xffffffff;
    SQDepthLevel = depth;
+
+   this->ImplicitVR   = e->IsImplicitVR();
+   this->Offset       = e->GetOffset();
 }
 
 /**
  * \brief   Canonical destructor.
  */
-gdcmSeqEntry::~gdcmSeqEntry() {
+SeqEntry::~SeqEntry() {
    for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
    {
       delete *cc;
@@ -50,14 +73,14 @@ gdcmSeqEntry::~gdcmSeqEntry() {
       delete seq_term;
 }
 
-/*
+/**
  * \brief   canonical Printer
  */
-void gdcmSeqEntry::Print(std::ostream &os){
-
+void SeqEntry::Print( std::ostream &os )
+{
    // First, Print the Dicom Element itself.
    SetPrintLevel(2);   
-   gdcmDocEntry::Print(os);
+   DocEntry::Print(os);
    os << std::endl;
 
    if (GetReadLength() == 0)
@@ -71,43 +94,45 @@ void gdcmSeqEntry::Print(std::ostream &os){
 
    // at end, print the sequence terminator item, if any
    if (delimitor_mode) {
-      for (int i=0;i<SQDepthLevel+1;i++)
+      for ( int i = 0; i < SQDepthLevel; i++ )
+      {
          os << "   | " ;
-      if (seq_term != NULL) {
+      }
+      if (seq_term != NULL)
+      {
          seq_term->Print(os);
          os << std::endl;
       } 
       else 
-         // fusible
+      {
+         // fuse
          os << "      -------------- should have a sequence terminator item";
+      }
    }                    
 }
 
 /*
  * \brief   canonical Writer
  */
-void gdcmSeqEntry::Write(FILE *fp, FileType filetype)
+void SeqEntry::Write(FILE* fp, FileType filetype)
 {
-   guint16 seq_term_gr = 0xfffe;
-   guint16 seq_term_el = 0xe0dd;
-   guint32 seq_term_lg = 0x00000000;
-
-   guint16 item_term_gr = 0xfffe;
-   guint16 item_term_el = 0xe00d;
-
-   gdcmDocEntry::Write(fp, filetype);
+   uint16_t seq_term_gr = 0xfffe;
+   uint16_t seq_term_el = 0xe0dd;
+   uint32_t seq_term_lg = 0xffffffff;
+
+   //uint16_t item_term_gr = 0xfffe;
+   //uint16_t item_term_el = 0xe00d;
+   
+   DocEntry::Write(fp, filetype);
    for(ListSQItem::iterator cc  = GetSQItems().begin();
                             cc != GetSQItems().end();
                           ++cc)
-   {
+   {        
       (*cc)->Write(fp, filetype);
-
-   fwrite ( &item_term_gr,(size_t)2 ,(size_t)1 ,fp);
-   fwrite ( &item_term_el,(size_t)2 ,(size_t)1 ,fp);   
-   fwrite ( &seq_term_lg,(size_t)4 ,(size_t)1 ,fp); 
    }
-    //we force the writting of a Sequence Delimitaion item
-    // because we wrote the Sequence as a 'no Length' sequence
+   
+   // we force the writting of a Sequence Delimitation item
+   // because we wrote the Sequence as a 'no Length' sequence
    fwrite ( &seq_term_gr,(size_t)2 ,(size_t)1 ,fp);
    fwrite ( &seq_term_el,(size_t)2 ,(size_t)1 ,fp);
    fwrite ( &seq_term_lg,(size_t)4 ,(size_t)1 ,fp); 
@@ -116,22 +141,21 @@ void gdcmSeqEntry::Write(FILE *fp, FileType filetype)
 //-----------------------------------------------------------------------------
 // Public
 
- /// \brief   adds the passed ITEM to the ITEM chained List for this SeQuence.      
-void gdcmSeqEntry::AddEntry(gdcmSQItem *sqItem, int itemNumber) {
+/// \brief   adds the passed ITEM to the ITEM chained List for this SeQuence.
+void SeqEntry::AddEntry(SQItem *sqItem, int itemNumber)
+{
    sqItem->SetSQItemNumber(itemNumber);
    items.push_back(sqItem);
 }
 
-/// \brief Sets the depth level of a Sequence Entry embedded in a SeQuence 
-void gdcmSeqEntry::SetDepthLevel(int depth) {
-   SQDepthLevel = depth;
-}
-
-/// \brief return a pointer to the SQItem referenced by its ordinal number
-/// (returns the first one if ordinal number is <0
-///  returns the last  one if ordinal number is > item number
-
-gdcmSQItem *gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb) {
+/**
+ * \brief return a pointer to the SQItem referenced by its ordinal number.
+ *        Returns the first item when argument is negative.
+ *        Returns the last item when argument is bigget than the total
+ *        item number.
+ */
+SQItem* SeqEntry::GetSQItemByOrdinalNumber(int nb)
+{
    if (nb<0)
       return (*(items.begin()));
    int count = 0 ;
@@ -151,3 +175,5 @@ gdcmSQItem *gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb) {
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+