Program: gdcm
Module: $RCSfile: gdcmElementSet.cxx,v $
Language: C++
- Date: $Date: 2004/10/22 03:05:41 $
- Version: $Revision: 1.25 $
+ Date: $Date: 2005/01/20 11:37:37 $
+ Version: $Revision: 1.47 $
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 ElementSet
* \brief Constructor from a given ElementSet
*/
//BOZ depthLevel is not usefull anymore
}
/**
- * \ingroup ElementSet
* \brief Canonical destructor.
*/
ElementSet::~ElementSet()
{
- for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
+ for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
{
- DocEntry* entryToDelete = cc->second;
- if ( entryToDelete )
+ if ( cc->second )
{
- delete entryToDelete;
+ delete cc->second;
}
}
TagHT.clear();
}
-
-//-----------------------------------------------------------------------------
-// Public
-
-
//-----------------------------------------------------------------------------
// Print
/**
* \brief Prints the Header Entries (Dicom Elements)
* from the H Table
- * @return
+ * @param os ostream to write to
+ * @param indent Indentation string to be prepended during printing
*/
-void ElementSet::Print(std::ostream& os)
+void ElementSet::Print(std::ostream &os, std::string const & )
{
for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
{
DocEntry* entry = i->second;
+
+ entry->SetPrintLevel(PrintLevel);
entry->Print(os);
- if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(entry) )
+
+ if ( dynamic_cast<SeqEntry*>(entry) )
{
- (void)seqEntry;
// Avoid the newline for a sequence:
continue;
}
}
}
+//-----------------------------------------------------------------------------
+// Public
/**
* \brief Writes the Header Entries (Dicom Elements)
* from the H Table
- * @return
+ * @param fp ofstream to write to
+ * @param filetype filetype
*/
-void ElementSet::Write(std::ofstream* fp, FileType filetype)
+void ElementSet::WriteContent(std::ofstream *fp, FileType filetype)
{
- for (TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
+ for (TagDocEntryHT::const_iterator i = TagHT.begin();
+ i != TagHT.end();
+ ++i)
{
- i->second->Write(fp, filetype);
+ i->second->WriteContent(fp, filetype);
}
}
-//-----------------------------------------------------------------------------
-// Protected
+
+
+/**
+ * \brief retrieves a Dicom Element using (group, element)
+ * @param group Group number of the searched Dicom Element
+ * @param elem Element number of the searched Dicom Element
+ * @return
+ */
+DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem)
+{
+ TagKey key = DictEntry::TranslateToKey(group, elem);
+ if ( !TagHT.count(key))
+ {
+ return NULL;
+ }
+ return TagHT.find(key)->second;
+}
+
+/**
+ * \brief Same as \ref Document::GetDocEntry except it only
+ * returns a result when the corresponding entry is of type
+ * ValEntry.
+ * @param group Group number of the searched Dicom Element
+ * @param elem Element number of the searched Dicom Element
+ * @return When present, the corresponding ValEntry.
+ */
+ValEntry *ElementSet::GetValEntry(uint16_t group, uint16_t elem)
+{
+ DocEntry *currentEntry = GetDocEntry(group, elem);
+ if ( !currentEntry )
+ {
+ return 0;
+ }
+ if ( ValEntry *entry = dynamic_cast<ValEntry*>(currentEntry) )
+ {
+ return entry;
+ }
+ gdcmVerboseMacro( "Unfound ValEntry.");
+
+ return 0;
+}
+
+/**
+ * \brief Same as \ref Document::GetDocEntry except it only
+ * returns a result when the corresponding entry is of type
+ * BinEntry.
+ * @param group Group number of the searched Dicom Element
+ * @param elem Element number of the searched Dicom Element
+ * @return When present, the corresponding BinEntry.
+ */
+BinEntry *ElementSet::GetBinEntry(uint16_t group, uint16_t elem)
+{
+ DocEntry *currentEntry = GetDocEntry(group, elem);
+ if ( !currentEntry )
+ {
+ return 0;
+ }
+ if ( BinEntry *entry = dynamic_cast<BinEntry*>(currentEntry) )
+ {
+ return entry;
+ }
+ gdcmVerboseMacro( "Unfound BinEntry.");
+
+ return 0;
+}
+
+/**
+ * \brief Same as \ref Document::GetDocEntry except it only
+ * returns a result when the corresponding entry is of type
+ * SeqEntry.
+ * @param group Group number of the searched Dicom Element
+ * @param elem Element number of the searched Dicom Element
+ * @return When present, the corresponding SeqEntry.
+ */
+SeqEntry *ElementSet::GetSeqEntry(uint16_t group, uint16_t elem)
+{
+ DocEntry *currentEntry = GetDocEntry(group, elem);
+ if ( !currentEntry )
+ {
+ return 0;
+ }
+ if ( SeqEntry *entry = dynamic_cast<SeqEntry*>(currentEntry) )
+ {
+ return entry;
+ }
+ gdcmVerboseMacro( "Unfound SeqEntry.");
+
+ return 0;
+}
+
//-----------------------------------------------------------------------------
+// Protected
//-----------------------------------------------------------------------------
// Private
* \brief add a new Dicom Element pointer to the H Table
* @param newEntry entry to add
*/
-bool ElementSet::AddEntry( DocEntry* newEntry)
+bool ElementSet::AddEntry(DocEntry *newEntry)
{
- TagKey key = newEntry->GetKey();
+ const TagKey &key = newEntry->GetKey();
if( TagHT.count(key) == 1 )
{
- dbg.Verbose(1, "ElementSet::AddEntry key already present: ",
- key.c_str());
- return(false);
- }
- else
+ gdcmVerboseMacro( "Key already present: " << key.c_str());
+ return false;
+ }
+ else
{
- TagHT[newEntry->GetKey()] = newEntry;
+ TagHT.insert(TagDocEntryHT::value_type(newEntry->GetKey(), newEntry));
return true;
- }
+ }
}
/**
- * \brief Clear the hash table from given entry BUT keep the entry.
- * @param entryToRemove Entry to remove.
+ * \brief Clear the hash table from given entry AND delete the entry.
+ * @param entryToRemove Entry to remove AND delete.
*/
-bool ElementSet::RemoveEntryNoDestroy( DocEntry* entryToRemove)
+bool ElementSet::RemoveEntry( DocEntry *entryToRemove)
{
- TagKey key = entryToRemove->GetKey();
+ const TagKey &key = entryToRemove->GetKey();
if( TagHT.count(key) == 1 )
{
TagHT.erase(key);
- dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
+ //gdcmVerboseMacro( "One element erased.");
+ delete entryToRemove;
return true;
}
- dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: ");
+ gdcmVerboseMacro( "Key not present");
return false ;
}
/**
- * \brief Clear the hash table from given entry AND delete the entry.
- * @param entryToRemove Entry to remove AND delete.
+ * \brief Clear the hash table from given entry BUT keep the entry.
+ * @param entryToRemove Entry to remove.
*/
-bool ElementSet::RemoveEntry( DocEntry* entryToRemove)
+bool ElementSet::RemoveEntryNoDestroy(DocEntry *entryToRemove)
{
- TagKey key = entryToRemove->GetKey();
+ const TagKey &key = entryToRemove->GetKey();
if( TagHT.count(key) == 1 )
{
TagHT.erase(key);
- dbg.Verbose(0, "ElementSet::RemoveEntry: one element erased.");
- delete entryToRemove;
+ //gdcmVerboseMacro( "One element erased.");
return true;
}
- dbg.Verbose(0, "ElementSet::RemoveEntry: key not present: ");
+ gdcmVerboseMacro( "Key not present");
return false ;
}
+
+/**
+ * \brief Get the first entry while visiting the DocEntrySet
+ * \return The first DocEntry if found, otherwhise NULL
+ */
+DocEntry *ElementSet::GetFirstEntry()
+{
+ ItTagHT = TagHT.begin();
+ if (ItTagHT != TagHT.end())
+ return ItTagHT->second;
+ return NULL;
+}
+
+/**
+ * \brief Get the next entry while visiting the Hash table (TagHT)
+ * \note : meaningfull only if GetFirstEntry already called
+ * \return The next DocEntry if found, otherwhise NULL
+ */
+DocEntry *ElementSet::GetNextEntry()
+{
+ gdcmAssertMacro (ItTagHT != TagHT.end());
+
+ ++ItTagHT;
+ if (ItTagHT != TagHT.end())
+ return ItTagHT->second;
+ return NULL;
+}
+
+//-----------------------------------------------------------------------------
} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff