X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=62e506771508224ce7ddb841603af16380b2a3f4;hb=aa0fc6ed66dc186bae363418702f402dc3f0ea21;hp=d7d0b19fe58f527802a47f232aa02610df650e1f;hpb=c42a0d560374ca98eb7f1531de835fd4cd1c59b0;p=gdcm.git

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index d7d0b19f..62e50677 100644
--- a/src/gdcmSQItem.cxx
+++ b/src/gdcmSQItem.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/27 22:31:12 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2004/12/03 17:13:18 $
+  Version:   $Revision: 1.39 $
   
   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,6 @@
 
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
@@ -49,7 +48,7 @@ SQItem::~SQItem()
                              cc != DocEntries.end();
                              ++cc)
    {
-      delete (*cc);
+      delete *cc;
    }
    DocEntries.clear();
 }
@@ -61,6 +60,7 @@ SQItem::~SQItem()
  */
  void SQItem::Print(std::ostream& os)
  {
+   os << "S ";
    std::ostringstream s;
 
    if (SQDepthLevel > 0)
@@ -70,7 +70,7 @@ SQItem::~SQItem()
          s << "   | " ;
       }
    }
-   std::cout << s.str() << " --- SQItem number " << SQItemNumber  << std::endl;
+   //std::cout << s.str() << " --- SQItem number " << SQItemNumber  << std::endl;
    for (ListDocEntry::iterator i  = DocEntries.begin();
                                i != DocEntries.end();
                              ++i)
@@ -97,22 +97,26 @@ SQItem::~SQItem()
  * \ingroup SQItem
  * \brief   canonical Writer
  */
-void SQItem::Write(std::ofstream* fp, FileType filetype)
+void SQItem::WriteContent(std::ofstream* fp, FileType filetype)
 {
+   int j;
    uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff };
    uint16_t itemt[4]= { 0xfffe, 0xe00d, 0xffff, 0xffff };
 
     //we force the writting of an 'Item' Start Element
     // because we want to write the Item as a 'no Length' item
-   fp->write((char*)&item[0],8);  // fffe e000 ffff ffff 
+   for(j=0;j<4;++j)
+   {
+      binary_write( *fp, item[j]);  // fffe e000 ffff ffff 
+   }
      
-   for (ListDocEntry::iterator i = DocEntries.begin();  
-                              i != DocEntries.end();
-                             ++i)
+   for (ListDocEntry::iterator it = DocEntries.begin();  
+                              it != DocEntries.end();
+                             ++it)
    {   
       // we skip delimitors (start and end one) because 
       // we force them as 'no length'
-      if ( (*i)->GetGroup() == 0xfffe )
+      if ( (*it)->GetGroup() == 0xfffe )
       {
          continue;
       }
@@ -120,18 +124,21 @@ void SQItem::Write(std::ofstream* fp, FileType filetype)
       // Fix in order to make some MR PHILIPS images e-film readable
       // see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm:
       // we just *always* ignore spurious fffe|0000 tag ! 
-      if ( (*i)->GetGroup() == 0xfffe && (*i)->GetElement() == 0x0000 )
+      if ( (*it)->GetGroup() == 0xfffe && (*it)->GetElement() == 0x0000 )
       {
          break; // FIXME : continue; ?!?
       }
 
-      (*i)->Write(fp, filetype);
+      (*it)->WriteContent(fp, filetype);
    }
       
     //we force the writting of an 'Item Delimitation' item
     // because we wrote the Item as a 'no Length' item
-   fp->write((char*)&itemt[0],8);  // fffe e000 ffff ffff 
-
+   for(j=0;j<4;++j)
+   {
+      binary_write( *fp, itemt[j]);  // fffe e000 ffff ffff 
+   }
+ 
 }
 
 //-----------------------------------------------------------------------------
@@ -230,10 +237,83 @@ bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group,
    }
    return false;
 }
-//-----------------------------------------------------------------------------
-// Protected
 
+/**
+ * \brief   Clear the hash table from given entry AND delete the entry.
+ * @param   entryToRemove Entry to remove AND delete.
+ * \warning Some problems when using under Windows... prefer the use of
+ *          Initialize / GetNext methods
+ */
+bool SQItem::RemoveEntry( DocEntry* entryToRemove)
+{
+   for(ListDocEntry::iterator it = DocEntries.begin();
+       it != DocEntries.end();
+       ++it)
+   {
+      if( *it == entryToRemove)
+      {
+         DocEntries.erase(it);
+         dbg.Verbose(0, "SQItem::RemoveEntry: one element erased.");
+         delete entryToRemove;
+         return true;
+      }
+   }
+                                                                                
+   dbg.Verbose(0, "SQItem::RemoveEntry: value not present ");
+   return false ;
+}
+                                                                                
+/**
+ * \brief   Clear the hash table from given entry BUT keep the entry.
+ * @param   entryToRemove Entry to remove.
+ */
+bool SQItem::RemoveEntryNoDestroy(DocEntry* entryToRemove)
+{
+   for(ListDocEntry::iterator it = DocEntries.begin();
+       it != DocEntries.end();
+       ++it)
+   {
+      if( *it == entryToRemove)
+      {
+         DocEntries.erase(it);
+         dbg.Verbose(0, "SQItem::RemoveEntry: one element erased.");
+         return true;
+      }
+   }
+                                                                                
+   dbg.Verbose(0, "SQItem::RemoveEntry: value not present ");
+   return false ;
+}
+                                                                                
+/**
+ * \brief   Initialise the visit of the chained list
+ */
+void SQItem::Initialize()
+{
+   ItDocEntries = DocEntries.begin();
+}
+                                                                                
+/**
+ * \brief   Get the next entry whil visiting the chained list
+ * \return  The next DocEntry if found, otherwhise NULL
+ */
+DocEntry *SQItem::GetNextEntry()
+{
+   if (ItDocEntries != DocEntries.end())
+   {
+      DocEntry *tmp = *ItDocEntries;
+      ++ItDocEntries;
+                                                                                
+      return(tmp);
+   }
+   else
+   {
+      return(NULL);
+   }
+}
 
+//-----------------------------------------------------------------------------
+// Protected
 /**
  * \brief   Gets a Dicom Element inside a SQ Item Entry, by number
  * @return