Program: gdcm
Module: $RCSfile: gdcmElementSet.cxx,v $
Language: C++
- Date: $Date: 2004/09/03 14:04:02 $
- Version: $Revision: 1.18 $
+ Date: $Date: 2005/10/24 16:00:47 $
+ Version: $Revision: 1.67 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
- http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
#include "gdcmElementSet.h"
#include "gdcmDebug.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
#include "gdcmSeqEntry.h"
+#include "gdcmDataEntry.h"
+namespace gdcm
+{
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
- * \ingroup gdcmElementSet
- * \brief Constructor from a given gdcmElementSet
+ * \brief Constructor for a given ElementSet
*/
-gdcmElementSet::gdcmElementSet(int depthLevel)
- : gdcmDocEntrySet(depthLevel)
+ElementSet::ElementSet()
+ : DocEntrySet()
{
}
/**
- * \ingroup gdcmElementSet
* \brief Canonical destructor.
*/
-gdcmElementSet::~gdcmElementSet()
+ElementSet::~ElementSet()
{
- for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
- {
- gdcmDocEntry* entryToDelete = cc->second;
- if ( entryToDelete )
- {
- delete entryToDelete;
- }
- }
- TagHT.clear();
+ ClearEntry();
}
-
//-----------------------------------------------------------------------------
// Public
-
-
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \brief Prints the Header Entries (Dicom Elements)
- * from the H Table
- * @return
- */
-void gdcmElementSet::Print(std::ostream & os)
-{
- for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
- {
- gdcmDocEntry* entry = i->second;
- entry->Print(os);
- bool PrintEndLine = true;
- if ( gdcmSeqEntry* seqEntry = dynamic_cast<gdcmSeqEntry*>(entry) )
- {
- (void)seqEntry; //not used
- PrintEndLine = false;
- }
- if( PrintEndLine )
- {
- os << std::endl;
- }
- }
-}
-
/**
* \brief Writes the Header Entries (Dicom Elements)
* from the H Table
- * @return
+ * @param fp ofstream to write to
+ * @param filetype filetype
*/
-void gdcmElementSet::Write(FILE *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
-
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// Private
/**
* \brief add a new Dicom Element pointer to the H Table
* @param newEntry entry to add
*/
-bool gdcmElementSet::AddEntry( gdcmDocEntry *newEntry)
+bool ElementSet::AddEntry(DocEntry *newEntry)
{
- gdcmTagKey key = newEntry->GetKey();
+ const TagKey &key = newEntry->GetKey();
- if( TagHT.count(key) == 1 )
+ if ( TagHT.count(key) == 1 )
{
- dbg.Verbose(1, "gdcmElementSet::AddEntry key already present: ",
- key.c_str());
- return(false);
- }
- else
+ gdcmWarningMacro( "Key already present: " << key );
+ return false;
+ }
+ else
{
- TagHT[newEntry->GetKey()] = newEntry;
+ TagHT.insert(TagDocEntryHT::value_type(newEntry->GetKey(), newEntry));
+ newEntry->Register();
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 gdcmElementSet::RemoveEntryNoDestroy( gdcmDocEntry *entryToRemove)
+bool ElementSet::RemoveEntry( DocEntry *entryToRemove)
{
- gdcmTagKey key = entryToRemove->GetKey();
- if( TagHT.count(key) == 1 )
+ const TagKey &key = entryToRemove->GetKey();
+ if ( TagHT.count(key) == 1 )
{
TagHT.erase(key);
- dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased.");
+ entryToRemove->Unregister();
return true;
}
- dbg.Verbose(0, "gdcmElementSet::RemoveEntry: key not present: ");
+ gdcmWarningMacro( "Key not present : " << key);
return false ;
}
/**
- * \brief Clear the hash table from given entry AND delete the entry.
- * @param entryToRemove Entry to remove AND delete.
+ * \brief delete all entries in the ElementSet
*/
-bool gdcmElementSet::RemoveEntry( gdcmDocEntry *entryToRemove)
+void ElementSet::ClearEntry()
{
- gdcmTagKey key = entryToRemove->GetKey();
- if( TagHT.count(key) == 1 )
+ for(TagDocEntryHT::iterator cc = TagHT.begin();cc != TagHT.end(); ++cc)
{
- TagHT.erase(key);
- dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased.");
- delete entryToRemove;
- return true;
+ if ( cc->second )
+ {
+ cc->second->Unregister();
+ }
}
+ TagHT.clear();
+}
- dbg.Verbose(0, "gdcmElementSet::RemoveEntry: key not present: ");
- return false ;
+/**
+ * \brief Get the first entry while visiting *the* 'zero level' DocEntrySet
+ * (DocEntries out of any Sequence)
+ * \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* 'zero level' DocEntrySet
+ * (DocEntries out of any Sequence)
+ * \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;
}
+
+/**
+ * \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);
+ TagDocEntryHT::iterator it = TagHT.find(key);
+
+ if ( it!=TagHT.end() )
+ return it->second;
+ return NULL;
+}
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief Prints the Header Entries (Dicom Elements) from the H Table
+ * @param os ostream to write to
+ * @param indent Indentation string to be prepended during printing
+ */
+void ElementSet::Print(std::ostream &os, std::string const & )
+{
+ // Let's change the 'warning value' for Pixel Data,
+ // to avoid human reader to be confused by 'gdcm::NotLoaded'.
+ DataEntry *pixelElement = GetDataEntry(0x7fe0,0x0010);
+ if ( pixelElement != 0 )
+ {
+ pixelElement->SetFlag( DataEntry::FLAG_PIXELDATA );
+ }
+
+ for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
+ {
+ DocEntry *entry = i->second;
+
+ entry->SetPrintLevel(PrintLevel);
+ entry->Print(os);
+
+ if ( dynamic_cast<SeqEntry *>(entry) )
+ {
+ // Avoid the newline for a sequence:
+ continue;
+ }
+ os << std::endl;
+ }
+}
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm