X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=b5d452c773c86bdd6801e15fd8a91c90bcd9cc83;hb=5e64f1feb4d82a4da9893dca043212ac90807fe4;hp=94b3f9bcc670fc61e93fc1ab26b1ce6a01f54179;hpb=19f72d139faa0f6a03f4e4a33be4c6b3e70b18b7;p=gdcm.git

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 94b3f9bc..b5d452c7 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/23 03:36:24 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2004/11/03 20:52:13 $
+  Version:   $Revision: 1.34 $
                                                                                 
   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,114 +24,158 @@
 
 #include <iostream>
 #include <iomanip>
+#include <fstream>
+
+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)
 {
-   delimitor_mode = false;
-   seq_term  = NULL;
+   UsableLength = 0;
+   ReadLength = 0xffffffff;
+   SQDepthLevel = -1;
+
+   DelimitorMode = false;
+   SeqTerm  = 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();
 }
 
 /**
- * \ingroup gdcmSeqEntry
  * \brief   Canonical destructor.
  */
-gdcmSeqEntry::~gdcmSeqEntry() {
-   for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
+SeqEntry::~SeqEntry()
+{
+   for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
    {
       delete *cc;
-     std::cout << "delete SQItem" <<std:: endl;
    }
-   if (!seq_term)
-      delete seq_term;
+   if (!SeqTerm)
+   {
+      delete SeqTerm;
+   }
 }
 
-//-----------------------------------------------------------------------------
-// Print
-/*
+/**
  * \brief   canonical Printer
  */
-void gdcmSeqEntry::Print(std::ostream &os){
-
-   std::ostringstream s,s2;
-   std::string vr;
+void SeqEntry::Print( std::ostream &os )
+{
    // First, Print the Dicom Element itself.
    SetPrintLevel(2);   
-   PrintCommonPart(os);
-   s << std::endl;
-   os << s.str();   
+   DocEntry::Print(os);
+   os << std::endl;
 
-    if (GetReadLength() == 0)
-       return;
+   if (GetReadLength() == 0)
+      return;
 
-    // Then, Print each SQ Item   
-     for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
+   // Then, Print each SQ Item   
+   for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); ++cc)
    {
       (*cc)->Print(os);   
    }
 
    // at end, print the sequence terminator item, if any
-   if (delimitor_mode) {
-      for (int i=0;i<SQDepthLevel+1;i++)
-         s2 << "   | " ;
-      os << s2.str();
-      if (seq_term != NULL) {
-         seq_term->Print(os);
+   if (DelimitorMode)
+   {
+      for ( int i = 0; i < SQDepthLevel; i++ )
+      {
+         os << "   | " ;
+      }
+      if (SeqTerm != NULL)
+      {
+         SeqTerm->Print(os);
+         os << std::endl;
       } 
       else 
-         std::cout
-             << "      -------------- should have a sequence terminator item"
-             << std::endl;      
+      {
+         // fuse
+         os << "      -------------- should have a sequence terminator item";
+      }
    }                    
- }
-
+}
 
 /*
  * \brief   canonical Writer
  */
-void gdcmSeqEntry::Write(FILE *fp, FileType filetype) {
-  for(ListSQItem::iterator cc  = GetSQItems().begin();
-                           cc != GetSQItems().end();
-                         ++cc) {
-      std::cout << "Et un SQItem !" << std::endl;
-      (*cc)->Write(fp, filetype);  // Don't remove param filetype !
-   }  
+void SeqEntry::Write(std::ofstream* fp, FileType 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  = Items.begin();
+                            cc != Items.end();
+                          ++cc)
+   {        
+      (*cc)->Write(fp, filetype);
+   }
+   
+   // we force the writting of a Sequence Delimitation item
+   // because we wrote the Sequence as a 'no Length' sequence
+   binary_write(*fp, seq_term_gr);
+   binary_write(*fp, seq_term_el);
+   binary_write(*fp, seq_term_lg);
 }
+
 //-----------------------------------------------------------------------------
 // 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;
+   Items.push_back(sqItem);
 }
 
-/// \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()));
+   {
+      return *(Items.begin());
+   }
    int count = 0 ;
-   for(ListSQItem::iterator cc = items.begin();
-       cc != items.end();
-       count ++, ++cc){
-      if (count==nb)
+   for(ListSQItem::iterator cc = Items.begin();
+                           cc != Items.end();
+                           count ++, ++cc)
+   {
+      if (count == nb)
+      {
          return *cc;
+      }
    }
-   return (*(items.end())); // Euhhhhh ?!? Is this the last one . FIXME
+   return *(Items.end()); // Euhhhhh ?!? Is this the last one . FIXME
 }
 //-----------------------------------------------------------------------------
 // Protected
@@ -141,3 +185,5 @@ gdcmSQItem *gdcmSeqEntry::GetSQItemByOrdinalNumber(int nb) {
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+