Program: gdcm
Module: $RCSfile: gdcmSQItem.cxx,v $
Language: C++
- Date: $Date: 2005/02/01 10:29:56 $
- Version: $Revision: 1.64 $
+ Date: $Date: 2005/07/12 17:08:12 $
+ Version: $Revision: 1.74 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
}
for (ListDocEntry::iterator it = DocEntries.begin();
- it != DocEntries.end();
+ it != DocEntries.end();
++it)
{
// we skip delimitors (start and end one) because
for(j=0;j<4;++j)
{
binary_write( *fp, itemt[j]); // fffe e000 ffff ffff
- }
-
+ }
}
/**
- * \brief Remove all entry in the Sequence Item
+ * \brief Inserts *in the right place* any Entry (Dicom Element)
+ * into the Sequence Item
+ * @param entry Entry to add
+ * @return always true
*/
-void SQItem::ClearEntry()
-{
- for(ListDocEntry::iterator cc = DocEntries.begin();
- cc != DocEntries.end();
- ++cc)
+bool SQItem::AddEntry(DocEntry *entry)
+{
+ if (DocEntries.empty() )
{
- delete *cc;
+ DocEntries.push_back(entry);
+ return true;
}
- DocEntries.clear();
-}
+
+ ListDocEntry::iterator insertSpot;
+ ListDocEntry::iterator it = DocEntries.end();
+ do
+ {
+ it--;
-/**
- * \brief Adds any Entry (Dicom Element) to the Sequence Item
- * @param entry Entry to add
- */
-bool SQItem::AddEntry(DocEntry *entry)
-{
- DocEntries.push_back(entry);
+ if ( (*it)->IsItemDelimitor() )
+ {
+ continue;
+ }
+ if ( (*it)->GetGroup() < entry->GetGroup() )
+ break;
+ else
+ if ( (*it)->GetGroup() == entry->GetGroup() &&
+ (*it)->GetElement() < entry->GetElement() )
+ break;
+ } while (it != DocEntries.begin() );
+
+ insertSpot = it++;
+ insertSpot++; // ?!?
+ DocEntries.insert(insertSpot, entry);
return true;
}
* @param entryToRemove Entry to remove AND delete.
* @return true if the entry was found and removed; false otherwise
*/
-bool SQItem::RemoveEntry( DocEntry *entryToRemove)
+bool SQItem::RemoveEntry( DocEntry *entryToRemove )
{
for(ListDocEntry::iterator it = DocEntries.begin();
- it != DocEntries.end();
- ++it)
+ it != DocEntries.end();
+ ++it)
{
- if( *it == entryToRemove)
+ if ( *it == entryToRemove )
{
DocEntries.erase(it);
- gdcmVerboseMacro( "One element erased: " << entryToRemove->GetKey() );
+ gdcmWarningMacro( "One element erased: " << entryToRemove->GetKey() );
delete entryToRemove;
return true;
}
}
- gdcmVerboseMacro( "Entry not found: " << entryToRemove->GetKey() );
+ gdcmWarningMacro( "Entry not found: " << entryToRemove->GetKey() );
return false ;
}
*/
bool SQItem::RemoveEntryNoDestroy(DocEntry *entryToRemove)
{
- for(ListDocEntry::iterator it = DocEntries.begin();
- it != DocEntries.end();
- ++it)
+ for(ListDocEntry::iterator it = DocEntries.begin();
+ it != DocEntries.end();
+ ++it)
{
- if( *it == entryToRemove)
+ if ( *it == entryToRemove )
{
DocEntries.erase(it);
- gdcmVerboseMacro( "One element erased, no destroyed: "
+ gdcmWarningMacro( "One element removed, no destroyed: "
<< entryToRemove->GetKey() );
return true;
}
}
- gdcmVerboseMacro( "Entry not found:" << entryToRemove->GetKey() );
+ gdcmWarningMacro( "Entry not found:" << entryToRemove->GetKey() );
return false ;
}
+/**
+ * \brief Remove all entry in the Sequence Item
+ */
+void SQItem::ClearEntry()
+{
+ for(ListDocEntry::iterator cc = DocEntries.begin();
+ cc != DocEntries.end();
+ ++cc)
+ {
+ delete *cc;
+ }
+ DocEntries.clear();
+}
+
+/**
+ * \brief Clear the std::list from given Sequence Item BUT keep the entries
+ */
+void SQItem::ClearEntryNoDestroy()
+{
+ DocEntries.clear();
+}
+
+
+/**
+ * \brief Move all the entries from a given Sequence Item
+ */
+void SQItem::MoveObject(SQItem *source)
+{
+ DocEntries = source->DocEntries;
+ source->ClearEntryNoDestroy();
+}
+
/**
* \brief Get the first Dicom entry while visiting the SQItem
* \return The first DocEntry if found, otherwhise 0
DocEntry *SQItem::GetFirstEntry()
{
ItDocEntries = DocEntries.begin();
- if (ItDocEntries != DocEntries.end())
+ if ( ItDocEntries != DocEntries.end() )
return *ItDocEntries;
return 0;
}
/**
- * \brief Get the next Dicom entry while visiting the chained list
+ * \brief Get the next Dicom entry while visiting the SQItem
* \return The next DocEntry if found, otherwhise NULL
*/
DocEntry *SQItem::GetNextEntry()
{
++ItDocEntries;
- if (ItDocEntries != DocEntries.end())
+ if ( ItDocEntries != DocEntries.end() )
return *ItDocEntries;
return NULL;
}
*/
DocEntry *SQItem::GetDocEntry(uint16_t group, uint16_t elem)
{
- for(ListDocEntry::iterator i = DocEntries.begin();
- i != DocEntries.end(); ++i)
+ for(ListDocEntry::iterator i = DocEntries.begin();
+ i != DocEntries.end();
+ ++i)
{
if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem )
return *i;