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

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 70e96f2b..b5d452c7 100644
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -1,6 +1,21 @@
-// gdcmSeqEntry.cxx
-//-----------------------------------------------------------------------------
-//
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmSeqEntry.cxx,v $
+  Language:  C++
+  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.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmSeqEntry.h"
 #include "gdcmSQItem.h"
 #include "gdcmTS.h"
@@ -9,86 +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;
-   SQDepthLevel = depth; // +1; // ??
+   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;
    }
-   if (!seq_term)
-      delete seq_term;
+   if (!SeqTerm)
+   {
+      delete SeqTerm;
+   }
 }
 
-//-----------------------------------------------------------------------------
-// Print
-/*
- * \ingroup gdcmSeqEntry
+/**
  * \brief   canonical Printer
  */
-void gdcmSeqEntry::Print(std::ostream &os){
-
-   std::ostringstream s,s2;
-   string vr;
-   unsigned short int g, e;
-   long lgth;
-   size_t o;    
-   char greltag[10];  //group element tag
-   char st[20]; 
-
+void SeqEntry::Print( std::ostream &os )
+{
    // First, Print the Dicom Element itself.
    SetPrintLevel(2);   
-   PrintCommonPart(os);
-   s << std::endl;
-   os << s.str();   
- 
-    // Then, Print each SQ Item   
-     for(ListSQItem::iterator cc = items.begin();cc != items.end();++cc)
-   { 
-      //(*cc)->SetPrintLevel(GetPrintLevel()); aurait-ce un sens ?
+   DocEntry::Print(os);
+   os << std::endl;
+
+   if (GetReadLength() == 0)
+      return;
+
+   // 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) {
-      s2 << "   | " ;   
-      os << s2.str();
-      if (seq_term != NULL) {
-         seq_term->Print(os);
-      }	 
+   // at end, print the sequence terminator item, if any
+   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 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) {
-   items.push_back(sqItem);
+/// \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);
 }
 
-
-void gdcmSeqEntry::SetDepthLevel(int depth) {
-   SQDepthLevel = depth;
+/**
+ * \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 ;
+   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
 }
 //-----------------------------------------------------------------------------
 // Protected
@@ -97,25 +184,6 @@ void gdcmSeqEntry::SetDepthLevel(int depth) {
 //-----------------------------------------------------------------------------
 // Private
 
-// end-user intended : the guy *wants* to create his own SeQuence ?!?
-
-gdcmDocEntry *gdcmSeqEntry::NewDocEntryByNumber(guint16 group,
-                                                guint16 element) {
-// TODO				  
-   gdcmDocEntry *a;   
-   return a;				  
-}
-
-gdcmDocEntry *gdcmSeqEntry::NewDocEntryByName  (std::string Name) {
-// TODO	: 			  
-   gdcmDocEntry *a;   
-   return a;   
-}
-
-gdcmDocEntry *gdcmSeqEntry::GetDocEntryByNumber(guint16 group,
-                                                guint16 element) {
-// TODO				  
-   gdcmDocEntry *a;   
-   return a;				  
-}	
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+