Program: gdcm
Module: $RCSfile: gdcmSQItem.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 20:16:58 $
- Version: $Revision: 1.40 $
+ 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
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
- * \ingroup SQItem
* \brief Constructor from a given SQItem
*/
SQItem::SQItem(int depthLevel )
// 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)
- {
- os << "S ";
+void SQItem::Print(std::ostream &os, std::string const &)
+{
std::ostringstream s;
if (SQDepthLevel > 0)
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
*/
-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 };
/**
* \brief adds any Entry (Dicom Element) to the Sequence Item
*/
-bool SQItem::AddEntry(DocEntry* entry)
+bool SQItem::AddEntry(DocEntry *entry)
{
DocEntries.push_back(entry);
//TODO : check if it worked
* (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.
+ * @param elem Element number of the searched tag.
* @return true if element was found or created successfully
*/
-bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group,
- uint16_t element)
+bool SQItem::SetEntry(std::string const &val, uint16_t group,
+ uint16_t elem)
{
for(ListDocEntry::iterator i = DocEntries.begin();
i != DocEntries.end();
continue;
}
- if ( ( group < (*i)->GetGroup() )
- ||( group == (*i)->GetGroup() && element < (*i)->GetElement()) )
+ if ( ( group < (*i)->GetGroup() )
+ ||( group == (*i)->GetGroup() && elem < (*i)->GetElement()) )
{
- // instead of ReplaceOrCreateByNumber
+ // instead of ReplaceOrCreate
// that is a method of Document :-(
ValEntry* entry = 0;
- TagKey key = DictEntry::TranslateToKey(group, element);
+ TagKey key = DictEntry::TranslateToKey(group, elem);
- if ( ! PtagHT->count(key))
- {
- // 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);
- /// \todo
- /// ----
- /// better we don't assume too much !
- /// SQItem is now used to describe any DICOMDIR related object
- }
- else
+ // we assume a Public Dictionary *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->GetDictEntry(group, elem);
+ if (dictEntry == NULL)
{
- DocEntry* foundEntry = PtagHT->find(key)->second;
- entry = dynamic_cast<ValEntry*>(foundEntry);
- if (!entry)
- {
- dbg.Verbose(0, "SQItem::SetEntryByNumber: docEntries"
- " contains non ValEntry occurences");
- }
- }
+ dictEntry =
+ Global::GetDicts()->NewVirtualDictEntry(group, elem,
+ "UN", GDCM_UNKNOWN,
+ GDCM_UNKNOWN);
+ }
+ // 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 (group == (*i)->GetGroup() && elem == (*i)->GetElement() )
{
- if ( ValEntry* entry = dynamic_cast<ValEntry*>(*i) )
+ if ( ValEntry *entry = dynamic_cast<ValEntry*>(*i) )
{
entry->SetValue(val);
}
- (*i)->SetLength(val.length());
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)
{
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)
{
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 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 entry while visiting the chained list
* \return The next DocEntry if found, otherwhise NULL
*/
DocEntry *SQItem::GetNextEntry()
{
- if (ItDocEntries != DocEntries.end())
+ // gdcmAssertMacro (ItDocEntries != DocEntries.end());
{
- DocEntry *tmp = *ItDocEntries;
++ItDocEntries;
-
- return(tmp);
- }
- else
- {
- return(NULL);
+ if (ItDocEntries != DocEntries.end())
+ 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;
}
}
/**
- * \brief Get the value of 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
+ */
+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 'string value' of the entry whose (group,elem) was passed.
+ * GDCM_UNFOUND if not found
*/
-std::string SQItem::GetEntryByNumber(uint16_t group, uint16_t element)
+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() == element)
+ 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;
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff