Program: gdcm
Module: $RCSfile: gdcmSQItem.cxx,v $
Language: C++
- Date: $Date: 2004/12/06 11:37:38 $
- Version: $Revision: 1.41 $
+ Date: $Date: 2005/01/30 17:30:57 $
+ Version: $Revision: 1.62 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
- * \ingroup SQItem
* \brief Constructor from a given SQItem
*/
SQItem::SQItem(int depthLevel )
: DocEntrySet( )
{
SQDepthLevel = depthLevel;
+ SQItemNumber = 0;
}
/**
*/
SQItem::~SQItem()
{
- for(ListDocEntry::iterator cc = DocEntries.begin();
- cc != DocEntries.end();
- ++cc)
- {
- delete *cc;
- }
- DocEntries.clear();
+ ClearEntry();
}
//-----------------------------------------------------------------------------
// 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)
+void SQItem::Print(std::ostream &os, std::string const &)
{
std::ostringstream s;
s << " | " ;
}
}
- //std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl;
+ os << s.str() << " --- SQItem number " << SQItemNumber << std::endl;
for (ListDocEntry::iterator i = DocEntries.begin();
i != DocEntries.end();
++i)
{
- DocEntry* Entry = *i;
+ DocEntry *Entry = *i;
bool PrintEndLine = true;
os << s.str();
- Entry->SetPrintLevel(2);
+ 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)
}
/*
- * \ingroup SQItem
* \brief canonical Writer
+ * @param fp file pointer to an already open file.
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
*/
-void SQItem::WriteContent(std::ofstream* fp, FileType filetype)
+void SQItem::WriteContent(std::ofstream *fp, FileType filetype)
{
int j;
uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff };
//-----------------------------------------------------------------------------
// Public
/**
- * \brief adds any Entry (Dicom Element) to the Sequence Item
+ * \brief Remove all entry in the Sequence Item
*/
-bool SQItem::AddEntry(DocEntry* entry)
+void SQItem::ClearEntry()
{
- DocEntries.push_back(entry);
- //TODO : check if it worked
- return true;
-}
+ for(ListDocEntry::iterator cc = DocEntries.begin();
+ cc != DocEntries.end();
+ ++cc)
+ {
+ delete *cc;
+ }
+ DocEntries.clear();
+}
/**
- * \brief Sets Entry (Dicom Element) value of an element,
- * specified by it's tag (Group, Number)
- * and the length, too ... inside a SQ Item
- * If the Element is not found, it's just created !
- * \warning we suppose, right now, the element belongs to a Public Group
- * (NOT a shadow one)
- * @param val string value to set
- * @param group Group number of the searched tag.
- * @param element Element number of the searched tag.
- * @return true if element was found or created successfully
+ * \brief adds any Entry (Dicom Element) to the Sequence Item
+ * @param entry Entry to add
*/
-
-bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group,
- uint16_t element)
+bool SQItem::AddEntry(DocEntry *entry)
{
- for(ListDocEntry::iterator i = DocEntries.begin();
- i != DocEntries.end();
- ++i)
- {
- if ( (*i)->GetGroup() == 0xfffe && (*i)->GetElement() == 0xe000 )
- {
- continue;
- }
-
- if ( ( group < (*i)->GetGroup() )
- ||( group == (*i)->GetGroup() && element < (*i)->GetElement()) )
- {
- // instead of ReplaceOrCreateByNumber
- // that is a method of Document :-(
- ValEntry* entry = 0;
- TagKey key = DictEntry::TranslateToKey(group, element);
-
- // we assume a Public Dictionnary *is* loaded
- Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
- // if the invoked (group,elem) doesn't exist inside the Dictionary
- // we create a VirtualDictEntry
- DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, element);
- if (dictEntry == NULL)
- {
- dictEntry =
- Global::GetDicts()->NewVirtualDictEntry(group, element,
- "UN", "??", "??");
- }
- // we assume the constructor didn't fail
- entry = new ValEntry(dictEntry);
-
- if (entry)
- {
- entry->SetValue(val);
- }
- entry->SetLength(val.length());
- DocEntries.insert(i,entry);
-
- return true;
- }
- if (group == (*i)->GetGroup() && element == (*i)->GetElement() )
- {
- if ( ValEntry* entry = dynamic_cast<ValEntry*>(*i) )
- {
- entry->SetValue(val);
- }
- (*i)->SetLength(val.length());
- return true;
- }
- }
- return false;
-}
+ DocEntries.push_back(entry);
+ return true;
+}
/**
- * \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)
+bool SQItem::RemoveEntry( DocEntry *entryToRemove)
{
for(ListDocEntry::iterator it = DocEntries.begin();
it != DocEntries.end();
if( *it == entryToRemove)
{
DocEntries.erase(it);
- dbg.Verbose(0, "SQItem::RemoveEntry: one element erased.");
+ gdcmVerboseMacro( "One element erased: " << entryToRemove->GetKey() );
delete entryToRemove;
return true;
}
}
-
- dbg.Verbose(0, "SQItem::RemoveEntry: 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)
+bool SQItem::RemoveEntryNoDestroy(DocEntry *entryToRemove)
{
for(ListDocEntry::iterator it = DocEntries.begin();
it != DocEntries.end();
if( *it == entryToRemove)
{
DocEntries.erase(it);
- dbg.Verbose(0, "SQItem::RemoveEntry: one element erased.");
+ gdcmVerboseMacro( "One element erased, no destroyed: "
+ << entryToRemove->GetKey() );
return true;
}
}
- dbg.Verbose(0, "SQItem::RemoveEntry: value not present ");
+ gdcmVerboseMacro( "Entry not found:" << entryToRemove->GetKey() );
return false ;
}
/**
- * \brief Initialise the visit of the chained list
+ * \brief Get the first Dicom 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;
}
/**
- * \brief Get the next entry whil visiting the chained list
+ * \brief Get the next Dicom entry while visiting the chained list
* \return The next DocEntry if found, otherwhise NULL
*/
DocEntry *SQItem::GetNextEntry()
{
+ ++ItDocEntries;
if (ItDocEntries != DocEntries.end())
- {
- DocEntry *tmp = *ItDocEntries;
- ++ItDocEntries;
-
- return(tmp);
- }
- else
- {
- return(NULL);
- }
+ return *ItDocEntries;
+ return NULL;
}
-//-----------------------------------------------------------------------------
-// Protected
/**
- * \brief Gets a Dicom Element inside a SQ Item Entry, by number
- * @return
+ * \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
*/
-DocEntry* SQItem::GetDocEntryByNumber(uint16_t group, uint16_t element)
+DocEntry *SQItem::GetDocEntry(uint16_t group, uint16_t elem)
{
for(ListDocEntry::iterator i = DocEntries.begin();
i != DocEntries.end(); ++i)
{
- if ( (*i)->GetGroup() == group && (*i)->GetElement() == element )
- {
+ if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem )
return *i;
- }
}
- return 0;
+ return NULL;
}
-/**
- * \brief Get the value of a Dicom Element inside a SQ Item Entry, by number
- * @return
- */
+//-----------------------------------------------------------------------------
+// Protected
-std::string SQItem::GetEntryByNumber(uint16_t group, uint16_t element)
-{
- for(ListDocEntry::iterator i = DocEntries.begin();
- i != DocEntries.end(); ++i)
- {
- if ( (*i)->GetGroup() == group && (*i)->GetElement() == element)
- {
- return ((ValEntry *)(*i))->GetValue(); //FIXME
- }
- }
- return GDCM_UNFOUND;
-}
//-----------------------------------------------------------------------------
// Private