Program: gdcm
Module: $RCSfile: gdcmDocEntrySet.cxx,v $
Language: C++
- Date: $Date: 2005/02/02 10:02:17 $
- Version: $Revision: 1.51 $
+ Date: $Date: 2005/09/06 15:28:49 $
+ Version: $Revision: 1.59 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmSeqEntry.h"
#include "gdcmValEntry.h"
#include "gdcmBinEntry.h"
+#include "gdcmUtil.h"
namespace gdcm
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
-
+DocEntrySet::DocEntrySet()
+{
+ PreviousDocEntry = 0;
+}
//-----------------------------------------------------------------------------
// Public
/**
* @param group Group number of the searched tag.
* @param elem Element number of the searched tag.
* @return Corresponding element value when it exists,
- * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
+ * and the string GDCM_UNFOUND otherwise.
*/
std::string DocEntrySet::GetEntryValue(uint16_t group, uint16_t elem)
{
ContentEntry *entry = dynamic_cast<ContentEntry *>(GetDocEntry(group,elem));
- if( entry )
+ if ( entry )
return entry->GetValue();
return GDCM_UNFOUND;
}
void *DocEntrySet::GetEntryBinArea(uint16_t group, uint16_t elem)
{
BinEntry *entry = GetBinEntry(group, elem);
- if( entry )
+ if ( entry )
return entry->GetBinArea();
return 0;
}
+/**
+ * \brief Return the value of the BinEntry if it's "std::string representable"
+ * @param group Group number of the searched tag.
+ * @param elem Element number of the searched tag.
+ * @return Corresponding element value when it's "std::string representable"
+ * and the string GDCM_NOTASCII otherwise.
+ */
+std::string DocEntrySet::GetEntryForcedAsciiValue(uint16_t group, uint16_t elem)
+{
+ DocEntry *d = GetDocEntry(group,elem);
+ if ( !d )
+ return GDCM_UNFOUND;
+
+ if (ValEntry *v = dynamic_cast<ValEntry *>(d))
+ return v->GetValue();
+
+ if (BinEntry *b = dynamic_cast<BinEntry *>(d))
+ {
+ uint8_t *a = b->GetBinArea();
+ if (!b)
+ return GDCM_NOTLOADED;
+ // TODO : unify those two methods.
+ if (Util::IsCleanArea(a, b->GetLength()) )
+ return Util::CreateCleanString(a, b->GetLength());
+ }
+ return GDCM_NOTASCII;
+}
+
/**
* \brief Searches within Header Entries (Dicom Elements) parsed with
* the public and private dictionaries
int DocEntrySet::GetEntryLength(uint16_t group, uint16_t elem)
{
DocEntry *entry = GetDocEntry(group, elem);
- if( entry )
+ if ( entry )
return entry->GetLength();
return -1;
}
std::string DocEntrySet::GetEntryVR(uint16_t group, uint16_t elem)
{
DocEntry *entry = GetDocEntry(group, elem);
- if( entry )
+ if ( entry )
return entry->GetVR();
return GDCM_UNFOUND;
}
DocEntry *currentEntry = GetDocEntry(group, elem);
if ( !currentEntry )
{
- gdcmVerboseMacro( "No corresponding BinEntry " << std::hex << group <<
+ gdcmWarningMacro( "No corresponding BinEntry " << std::hex << group <<
"," << elem);
return NULL;
}
DocEntry *currentEntry = GetDocEntry(group, elem);
if ( !currentEntry )
{
- gdcmVerboseMacro( "No corresponding SeqEntry " << std::hex << group <<
+ gdcmWarningMacro( "No corresponding SeqEntry " << std::hex << group <<
"," << elem);
return NULL;
}
ValEntry *entry = GetValEntry(group, elem);
if (!entry )
{
- gdcmVerboseMacro( "No corresponding ValEntry " << std::hex << group <<
+ gdcmWarningMacro( "No corresponding ValEntry " << std::hex << group <<
"," << elem << " element (try promotion first).");
return false;
}
BinEntry *entry = GetBinEntry(group, elem);
if (!entry )
{
- gdcmVerboseMacro( "No corresponding ValEntry " << std::hex << group <<
+ gdcmWarningMacro( "No corresponding ValEntry " << std::hex << group <<
"," << elem << " element (try promotion first).");
return false;
}
*/
bool DocEntrySet::SetValEntry(std::string const &content, ValEntry *entry)
{
- if(entry)
+ if (entry)
{
entry->SetValue(content);
return true;
*/
bool DocEntrySet::SetBinEntry(uint8_t *content, int lgth, BinEntry *entry)
{
- if(entry)
+ if (entry)
{
entry->SetBinArea(content);
entry->SetLength(lgth);
TagName const &vr )
{
ValEntry *valEntry = 0;
- DocEntry *currentEntry = GetDocEntry( group, elem);
+ DocEntry *currentEntry = GetDocEntry( group, elem );
if (currentEntry)
{
valEntry = dynamic_cast<ValEntry *>(currentEntry);
// Verify the VR
- if( valEntry )
- if( valEntry->GetVR()!=vr )
+ if ( valEntry )
+ if ( valEntry->GetVR()!=vr )
valEntry = NULL;
// if currentEntry doesn't correspond to the requested valEntry
- if( !valEntry)
+ if ( !valEntry)
{
- if( !RemoveEntry(currentEntry) )
+ if ( !RemoveEntry(currentEntry) )
{
- gdcmVerboseMacro( "Removal of previous DocEntry failed.");
+ gdcmWarningMacro( "Removal of previous DocEntry failed.");
return NULL;
}
}
// Create a new valEntry if necessary
- if( !valEntry )
+ if ( !valEntry )
{
- valEntry = NewValEntry(group, elem, vr);
+ valEntry = NewValEntry( group, elem, vr );
if ( !AddEntry(valEntry) )
{
- gdcmVerboseMacro("AddEntry failed although this is a creation.");
+ gdcmWarningMacro("AddEntry failed although this is a creation.");
delete valEntry;
return NULL;
return valEntry;
}
-/*
+/**
* \brief Modifies the value of a given Header Entry (Dicom Element)
* when it exists. Create it with the given value when unexistant.
* A copy of the binArea is made to be kept in the Document.
* @param binArea (binary) value to be set
+ * @param lgth length of the Bin Area we want to set
* @param group Group number of the Entry
* @param elem Element number of the Entry
* @param vr V(alue) R(epresentation) of the Entry -if private Entry-
TagName const &vr )
{
BinEntry *binEntry = 0;
- DocEntry *currentEntry = GetDocEntry( group, elem);
+ DocEntry *currentEntry = GetDocEntry( group, elem );
// Verify the currentEntry
if (currentEntry)
binEntry = dynamic_cast<BinEntry *>(currentEntry);
// Verify the VR
- if( binEntry )
- if( binEntry->GetVR()!=vr )
+ if ( binEntry )
+ if ( binEntry->GetVR()!=vr )
binEntry = NULL;
// if currentEntry doesn't correspond to the requested valEntry
- if( !binEntry)
+ if ( !binEntry)
{
- if( !RemoveEntry(currentEntry) )
+ if ( !RemoveEntry(currentEntry) )
{
- gdcmVerboseMacro( "Removal of previous DocEntry failed.");
+ gdcmWarningMacro( "Removal of previous DocEntry failed.");
return NULL;
}
}
// Create a new binEntry if necessary
- if( !binEntry)
+ if ( !binEntry)
{
binEntry = NewBinEntry(group, elem, vr);
if ( !AddEntry(binEntry) )
{
- gdcmVerboseMacro( "AddEntry failed allthough this is a creation.");
+ gdcmWarningMacro( "AddEntry failed although this is a creation.");
delete binEntry;
return NULL;
// Set the binEntry value
uint8_t *tmpArea;
- if( lgth>0 && binArea )
+ if ( lgth>0 && binArea )
{
tmpArea = new uint8_t[lgth];
memcpy(tmpArea,binArea,lgth);
{
tmpArea = 0;
}
- if( !SetBinEntry(tmpArea,lgth,binEntry) )
+ if ( !SetBinEntry(tmpArea,lgth,binEntry) )
{
- if( tmpArea )
+ if ( tmpArea )
{
delete[] tmpArea;
}
return binEntry;
}
-/*
- * \brief Modifies the value of a given Header Entry (Dicom Element)
+/**
+ * \brief Modifies the value of a given Doc Entry (Dicom Element)
* when it exists. Creates it when unexistant.
* @param group Group number of the Entry
* @param elem Element number of the Entry
SeqEntry *DocEntrySet::InsertSeqEntry(uint16_t group, uint16_t elem)
{
SeqEntry *seqEntry = 0;
- DocEntry *currentEntry = GetDocEntry( group, elem);
+ DocEntry *currentEntry = GetDocEntry( group, elem );
// Verify the currentEntry
- if( currentEntry )
+ if ( currentEntry )
{
seqEntry = dynamic_cast<SeqEntry *>(currentEntry);
// Verify the VR
- if( seqEntry )
- if( seqEntry->GetVR()!="SQ" )
- seqEntry = NULL;
+ if ( seqEntry )
+ seqEntry = NULL;
- // if currentEntry doesn't correspond to the requested valEntry
- if( !seqEntry )
+ // if currentEntry doesn't correspond to the requested seqEntry
+ if ( !seqEntry )
{
if (!RemoveEntry(currentEntry))
{
- gdcmVerboseMacro( "Removal of previous DocEntry failed.");
+ gdcmWarningMacro( "Removal of previous DocEntry failed.");
return NULL;
}
}
}
// Create a new seqEntry if necessary
- if( !seqEntry )
+ if ( !seqEntry )
{
seqEntry = NewSeqEntry(group, elem);
- if( !AddEntry(seqEntry) )
+ if ( !AddEntry(seqEntry) )
{
- gdcmVerboseMacro( "AddEntry failed allthough this is a creation.");
+ gdcmWarningMacro( "AddEntry failed although this is a creation.");
delete seqEntry;
return NULL;
}
}
+
+ // TODO : Find a trick to insert a SequenceDelimitationItem
+ // in the SeqEntry, at the end.
return seqEntry;
}
return GetDocEntry(group,elem)!=NULL;
}
-/**
- * \brief Request a new virtual dict entry to the dict set
- * @param group group number of the underlying DictEntry
- * @param elem element number of the underlying DictEntry
- * @param vr VR (Value Representation) of the underlying DictEntry
- * @param vm VM (Value Multiplicity) of the underlying DictEntry
- * @param name english name
- */
-DictEntry* DocEntrySet::NewVirtualDictEntry( uint16_t group,uint16_t elem,
- TagName const & vr,
- TagName const & vm,
- TagName const & name )
-{
- return Global::GetDicts()->NewVirtualDictEntry(group,elem,vr,vm,name);
-}
-
/**
* \brief Build a new Val Entry from all the low level arguments.
* Check for existence of dictionary entry, and build
* a default one when absent.
- * @param group group number of the new Entry
- * @param elem element number of the new Entry
- * @param vr VR of the new Entry
+ * @param group Group number of the new Entry
+ * @param elem Element number of the new Entry
+ * @param vr V(alue) R(epresentation) of the new Entry
*/
ValEntry *DocEntrySet::NewValEntry(uint16_t group,uint16_t elem,
- TagName const & vr)
+ TagName const &vr)
{
DictEntry *dictEntry = GetDictEntry(group, elem, vr);
gdcmAssertMacro(dictEntry);
ValEntry *newEntry = new ValEntry(dictEntry);
if (!newEntry)
{
- gdcmVerboseMacro( "Failed to allocate ValEntry");
+ gdcmWarningMacro( "Failed to allocate ValEntry");
return 0;
}
return newEntry;
* \brief Build a new Bin Entry from all the low level arguments.
* Check for existence of dictionary entry, and build
* a default one when absent.
- * @param group group number of the new Entry
- * @param elem element number of the new Entry
- * @param vr VR of the new Entry
+ * @param group Group number of the new Entry
+ * @param elem Element number of the new Entry
+ * @param vr V(alue) R(epresentation) of the new Entry
*/
BinEntry *DocEntrySet::NewBinEntry(uint16_t group, uint16_t elem,
TagName const &vr)
BinEntry *newEntry = new BinEntry(dictEntry);
if (!newEntry)
{
- gdcmVerboseMacro( "Failed to allocate BinEntry");
+ gdcmWarningMacro( "Failed to allocate BinEntry");
return 0;
}
return newEntry;
* \brief Build a new Seq Entry from all the low level arguments.
* Check for existence of dictionary entry, and build
* a default one when absent.
- * @param group group number of the new Entry
- * @param elem element number of the new Entry
+ * @param group Group number of the new Entry
+ * @param elem Element number of the new Entry
*/
SeqEntry* DocEntrySet::NewSeqEntry(uint16_t group, uint16_t elem)
{
SeqEntry *newEntry = new SeqEntry( dictEntry );
if (!newEntry)
{
- gdcmVerboseMacro( "Failed to allocate SeqEntry");
+ gdcmWarningMacro( "Failed to allocate SeqEntry");
return 0;
}
return newEntry;
}
+/**
+ * \brief Request a new virtual dict entry to the dict set
+ * @param group Group number of the underlying DictEntry
+ * @param elem Element number of the underlying DictEntry
+ * @param vr V(alue) R(epresentation) of the underlying DictEntry
+ * @param vm V(alue) M(ultiplicity) of the underlying DictEntry
+ * @param name english name
+ */
+DictEntry* DocEntrySet::NewVirtualDictEntry( uint16_t group, uint16_t elem,
+ TagName const &vr,
+ TagName const &vm,
+ TagName const &name )
+{
+ return Global::GetDicts()->NewVirtualDictEntry(group,elem,vr,vm,name);
+}
+
//-----------------------------------------------------------------------------
// Protected
/**
* \brief Searches [both] the public [and the shadow dictionary (when they
* exist)] for the presence of the DictEntry with given
* group and element. The public dictionary has precedence on the
- * shadow one.
- * @param group group number of the searched DictEntry
- * @param elem element number of the searched DictEntry
+ * shadow one(s), if any.
+ * @param group Group number of the searched DictEntry
+ * @param elem Element number of the searched DictEntry
* @return Corresponding DictEntry when it exists, NULL otherwise.
*/
DictEntry *DocEntrySet::GetDictEntry(uint16_t group,uint16_t elem)
Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
if (!pubDict)
{
- gdcmVerboseMacro( "We SHOULD have a default dictionary");
+ gdcmWarningMacro( "We SHOULD have a default dictionary");
}
else
{
* group and element, and create a new virtual DictEntry if necessary
* @param group group number of the searched DictEntry
* @param elem element number of the searched DictEntry
- * @param vr Value Representation to use, if necessary
+ * @param vr V(alue) R(epresentation) to use, if necessary
* @return Corresponding DictEntry when it exists, NULL otherwise.
*/
DictEntry *DocEntrySet::GetDictEntry(uint16_t group, uint16_t elem,
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff