Program: gdcm
Module: $RCSfile: gdcmSQItem.cxx,v $
Language: C++
- Date: $Date: 2005/01/18 08:01:42 $
- Version: $Revision: 1.53 $
+ Date: $Date: 2005/01/19 15:24:28 $
+ Version: $Revision: 1.55 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// Print
/*
* \brief canonical Printer
+ * @param os Stream to print to.
+ * @param indent Indentation string to be prepended during printing.
*/
void SQItem::Print(std::ostream &os, std::string const &)
{
os << s.str();
Entry->SetPrintLevel(PrintLevel);
Entry->Print(os);
- if ( /* SeqEntry *seqEntry =*/ dynamic_cast<SeqEntry*>(Entry) )
+ if ( dynamic_cast<SeqEntry*>(Entry) )
{
- //(void)seqEntry; //not used
PrintEndLine = false;
}
if (PrintEndLine)
}
if (group == (*i)->GetGroup() && elem == (*i)->GetElement() )
{
- if ( ValEntry* entry = dynamic_cast<ValEntry*>(*i) )
+ if ( ValEntry *entry = dynamic_cast<ValEntry*>(*i) )
{
entry->SetValue(val);
}
}
/**
- * \brief Clear the hash table from given entry AND delete the entry.
+ * \brief Clear the std::list 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
+ * @return true if the entry was found and removed; false otherwise
*/
bool SQItem::RemoveEntry( DocEntry* entryToRemove)
{
if( *it == entryToRemove)
{
DocEntries.erase(it);
- gdcmVerboseMacro( "One element erased.");
+ gdcmVerboseMacro( "One element erased: " << entryToRemove->GetKey() );
delete entryToRemove;
return true;
}
}
- gdcmVerboseMacro( "Value not present.");
+ gdcmVerboseMacro( "Entry not found: " << entryToRemove->GetKey() );
return false ;
}
/**
- * \brief Clear the hash table from given entry BUT keep the entry.
+ * \brief Clear the std::list from given entry BUT keep the entry.
* @param entryToRemove Entry to remove.
+ * @return true if the entry was found and removed; false otherwise
*/
bool SQItem::RemoveEntryNoDestroy(DocEntry* entryToRemove)
{
if( *it == entryToRemove)
{
DocEntries.erase(it);
- gdcmVerboseMacro( "One element erased.");
+ gdcmVerboseMacro( "One element erased, no destroyed: "
+ << entryToRemove->GetKey() );
return true;
}
}
- gdcmVerboseMacro( "Value not present.");
+ gdcmVerboseMacro( "Entry not found:" << entryToRemove->GetKey() );
return false ;
}
/**
- * \brief Initialise the visit of the chained list
+ * \brief Get the first entry while visiting the SQItem
+ * \return The first DocEntry if found, otherwhise 0
*/
-void SQItem::Initialize()
+DocEntry * SQItem::GetFirstEntry()
{
ItDocEntries = DocEntries.begin();
+ if (ItDocEntries != DocEntries.end())
+ return *ItDocEntries;
+ return 0;
}
/**
*/
DocEntry *SQItem::GetNextEntry()
{
- if (ItDocEntries != DocEntries.end())
+ // gdcmAssertMacro (ItDocEntries != DocEntries.end());
{
- DocEntry *tmp = *ItDocEntries;
++ItDocEntries;
-
- return tmp;
- }
- else
- {
+ if (ItDocEntries != DocEntries.end())
+ return *ItDocEntries;
return NULL;
}
}
* \brief Gets a Dicom Element inside a SQ Item Entry
* @param group Group number of the Entry
* @param elem Element number of the Entry
- * @return
+ * @return Entry whose (group,elem) was passed. 0 if not found
*/
-DocEntry* SQItem::GetDocEntry(uint16_t group, uint16_t elem)
+DocEntry *SQItem::GetDocEntry(uint16_t group, uint16_t elem)
{
for(ListDocEntry::iterator i = DocEntries.begin();
i != DocEntries.end(); ++i)
return 0;
}
+/**
+ * \brief Gets a Dicom Element inside a SQ Item Entry
+ * @param group Group number of the Entry
+ * @param elem Element number of the Entry
+ * @return Entry whose (group,elem) was passed. 0 if not found
+ */
+ValEntry* SQItem::GetValEntry(uint16_t group, uint16_t elem)
+{
+ DocEntry *d = GetDocEntry(group, elem);
+ if ( ValEntry *e = dynamic_cast<ValEntry*>(d) )
+ return e;
+ return 0;
+}
+
+/**
+ * \brief Gets a Dicom Element inside a SQ Item Entry
+ * @param group Group number of the Entry
+ * @param elem Element number of the Entry
+ * @return Entry whose (group,elem) was passed. 0 if not found
+ */
+BinEntry* SQItem::GetBinEntry(uint16_t group, uint16_t elem)
+{
+ DocEntry *d = GetDocEntry(group, elem);
+ if ( BinEntry *e = dynamic_cast<BinEntry*>(d) )
+ return e;
+ return 0;
+}
+
+/**
+ * \brief Gets a Dicom Element inside a SQ Item Entry
+ * @param group Group number of the Entry
+ * @param elem Element number of the Entry
+ * @return Entry whose (group,elem) was passed. 0 if not found
+ */
+SeqEntry* SQItem::GetSeqEntry(uint16_t group, uint16_t elem)
+{
+ DocEntry *d = GetDocEntry(group, elem);
+ if ( SeqEntry *e = dynamic_cast<SeqEntry*>(d) )
+ return e;
+ return 0;
+}
+
+
/**
* \brief Get the value of a Dicom Element inside a SQ Item Entry
+ * \note : meaningfull only if the required entry is NEITHER a SeqEntry
+ * NOR a BinEntry
* @param group Group number of the Entry
* @param elem Element number of the Entry
- * @return
+ * @return 'string value' of the entry whose (group,elem) was passed.
+ * GDCM_UNFOUND if not found
*/
std::string SQItem::GetEntry(uint16_t group, uint16_t elem)
{
+
+/*
+ DocEntry *e = GetFirstEntry();
+ while (e)
+ {
+ if ( e->GetGroup() == group && e->GetElement() == elem)
+ {
+
+ if (ValEntry *ve = dynamic_cast<ValEntry*>(e))
+ return ve->GetValue();
+ }
+ e = GetNextEntry();
+ }
+*/
for(ListDocEntry::iterator i = DocEntries.begin();
i != DocEntries.end(); ++i)
{
if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem)
{
- return ((ValEntry *)(*i))->GetValue(); //FIXME
+ if (ValEntry *ve = dynamic_cast<ValEntry*>(*i))
+ return ve->GetValue();
}
}
return GDCM_UNFOUND;