Program: gdcm
Module: $RCSfile: gdcmSQItem.cxx,v $
Language: C++
- Date: $Date: 2005/01/08 15:04:00 $
- Version: $Revision: 1.49 $
+ Date: $Date: 2005/02/02 16:18:48 $
+ Version: $Revision: 1.66 $
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
- */
-void SQItem::Print(std::ostream &os)
-{
- std::ostringstream s;
-
- if (SQDepthLevel > 0)
- {
- for (int i = 0; i < SQDepthLevel; ++i)
- {
- s << " | " ;
- }
- }
- //std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl;
- for (ListDocEntry::iterator i = DocEntries.begin();
- i != DocEntries.end();
- ++i)
- {
- DocEntry *Entry = *i;
- bool PrintEndLine = true;
-
- os << s.str();
- Entry->SetPrintLevel(PrintLevel);
- Entry->Print(os);
- if ( SeqEntry *seqEntry = dynamic_cast<SeqEntry*>(Entry) )
- {
- (void)seqEntry; //not used
- PrintEndLine = false;
- }
- if (PrintEndLine)
- {
- os << std::endl;
- }
- }
-}
-
+// Public
/*
- * \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)
{
}
for (ListDocEntry::iterator it = DocEntries.begin();
- it != DocEntries.end();
+ it != DocEntries.end();
++it)
{
// we skip delimitors (start and end one) because
for(j=0;j<4;++j)
{
binary_write( *fp, itemt[j]); // fffe e000 ffff ffff
- }
-
+ }
}
-//-----------------------------------------------------------------------------
-// Public
/**
- * \brief adds any Entry (Dicom Element) to the Sequence Item
+ * \brief Inserts *in the right place* any Entry (Dicom Element)
+ * into the Sequence Item
+ * @param entry Entry to add
*/
bool SQItem::AddEntry(DocEntry *entry)
-{
- DocEntries.push_back(entry);
- //TODO : check if it worked
- return true;
-}
-
-/**
- * \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 elem Element number of the searched tag.
- * @return true if element was found or created successfully
- */
+{
+ if (DocEntries.empty() )
+ {
+ DocEntries.push_back(entry);
+ return true;
+ }
+
+ ListDocEntry::iterator insertSpot;
+ ListDocEntry::iterator it = DocEntries.end();
+ do
+ {
+ it--;
-bool SQItem::SetEntry(std::string const &val, uint16_t group,
- uint16_t elem)
-{
- for(ListDocEntry::iterator i = DocEntries.begin();
- i != DocEntries.end();
- ++i)
- {
- if ( (*i)->GetGroup() == 0xfffe && (*i)->GetElement() == 0xe000 )
+ if ( (*it)->IsItemDelimitor() )
{
continue;
}
-
- if ( ( group < (*i)->GetGroup() )
- ||( group == (*i)->GetGroup() && elem < (*i)->GetElement()) )
- {
- // instead of ReplaceOrCreate
- // that is a method of Document :-(
- ValEntry* entry = 0;
- TagKey key = DictEntry::TranslateToKey(group, elem);
-
- // 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->GetDictEntry(group, elem);
- if (dictEntry == NULL)
- {
- 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);
- }
- DocEntries.insert(i,entry);
-
- return true;
- }
- if (group == (*i)->GetGroup() && elem == (*i)->GetElement() )
- {
- if ( ValEntry* entry = dynamic_cast<ValEntry*>(*i) )
- {
- entry->SetValue(val);
- }
- return true;
- }
- }
- return false;
-}
+ if ( (*it)->GetGroup() < entry->GetGroup() )
+ break;
+ else
+ if ( (*it)->GetGroup() == entry->GetGroup() &&
+ (*it)->GetElement() < entry->GetElement() )
+ break;
+ } while (it != DocEntries.begin() );
+
+ insertSpot = it++;
+ insertSpot++; // ?!?
+ DocEntries.insert(insertSpot, 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();
- ++it)
+ it != DocEntries.end();
+ ++it)
{
- if( *it == 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)
+bool SQItem::RemoveEntryNoDestroy(DocEntry *entryToRemove)
{
- for(ListDocEntry::iterator it = DocEntries.begin();
- it != DocEntries.end();
- ++it)
+ for(ListDocEntry::iterator it = DocEntries.begin();
+ it != DocEntries.end();
+ ++it)
{
- if( *it == 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 Remove all entry in the Sequence Item
+ */
+void SQItem::ClearEntry()
+{
+ for(ListDocEntry::iterator cc = DocEntries.begin();
+ cc != DocEntries.end();
+ ++cc)
+ {
+ delete *cc;
+ }
+ DocEntries.clear();
+}
+
+/**
+ * \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()
{
- if (ItDocEntries != DocEntries.end())
- {
- DocEntry *tmp = *ItDocEntries;
- ++ItDocEntries;
-
- return(tmp);
- }
- else
- {
- return(NULL);
- }
+ ++ItDocEntries;
+ if( ItDocEntries != DocEntries.end() )
+ return *ItDocEntries;
+ return NULL;
}
-//-----------------------------------------------------------------------------
-// Protected
/**
* \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)
+ for(ListDocEntry::iterator i = DocEntries.begin();
+ i != DocEntries.end();
+ ++i)
{
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
- * @param group Group number of the Entry
- * @param elem Element number of the Entry
- * @return
- */
+//-----------------------------------------------------------------------------
+// Protected
-std::string SQItem::GetEntry(uint16_t group, uint16_t elem)
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+// 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 &)
{
- for(ListDocEntry::iterator i = DocEntries.begin();
- i != DocEntries.end(); ++i)
+ std::ostringstream s;
+
+ if (SQDepthLevel > 0)
{
- if ( (*i)->GetGroup() == group && (*i)->GetElement() == elem)
+ for (int i = 0; i < SQDepthLevel; ++i)
{
- return ((ValEntry *)(*i))->GetValue(); //FIXME
+ s << " | " ;
}
}
- return GDCM_UNFOUND;
-}
-//-----------------------------------------------------------------------------
-// Private
+ os << s.str() << " --- SQItem number " << SQItemNumber << std::endl;
+ for (ListDocEntry::iterator i = DocEntries.begin();
+ i != DocEntries.end();
+ ++i)
+ {
+ DocEntry *Entry = *i;
+ bool PrintEndLine = true;
+ os << s.str();
+ Entry->SetPrintLevel(PrintLevel);
+ Entry->Print(os);
+ if ( dynamic_cast<SeqEntry*>(Entry) )
+ {
+ PrintEndLine = false;
+ }
+ if (PrintEndLine)
+ {
+ os << std::endl;
+ }
+ }
+}
//-----------------------------------------------------------------------------
-
} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff