X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.cxx;h=19b7d39d15e54d2e2a1eb1ebbe551642e6bc37d6;hb=a6152ede9f919769745b51f8fe560251a20c6a1a;hp=ceba6d0747a1f6783269b7e8999c00f717eeb569;hpb=95e43356511d138225d8f718f632b3e7a8fcc106;p=gdcm.git diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index ceba6d07..19b7d39d 100644 --- a/src/gdcmDocEntrySet.cxx +++ b/src/gdcmDocEntrySet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.cxx,v $ Language: C++ - Date: $Date: 2005/02/05 01:37:08 $ - Version: $Revision: 1.54 $ + Date: $Date: 2005/06/24 10:55:59 $ + Version: $Revision: 1.57 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -43,7 +43,7 @@ namespace gdcm std::string DocEntrySet::GetEntryValue(uint16_t group, uint16_t elem) { ContentEntry *entry = dynamic_cast(GetDocEntry(group,elem)); - if( entry ) + if ( entry ) return entry->GetValue(); return GDCM_UNFOUND; } @@ -57,7 +57,7 @@ std::string DocEntrySet::GetEntryValue(uint16_t group, uint16_t elem) void *DocEntrySet::GetEntryBinArea(uint16_t group, uint16_t elem) { BinEntry *entry = GetBinEntry(group, elem); - if( entry ) + if ( entry ) return entry->GetBinArea(); return 0; } @@ -73,7 +73,7 @@ void *DocEntrySet::GetEntryBinArea(uint16_t group, uint16_t elem) int DocEntrySet::GetEntryLength(uint16_t group, uint16_t elem) { DocEntry *entry = GetDocEntry(group, elem); - if( entry ) + if ( entry ) return entry->GetLength(); return -1; } @@ -94,7 +94,7 @@ int DocEntrySet::GetEntryLength(uint16_t group, uint16_t elem) 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; } @@ -210,7 +210,7 @@ bool DocEntrySet::SetBinEntry(uint8_t *content, int lgth, */ bool DocEntrySet::SetValEntry(std::string const &content, ValEntry *entry) { - if(entry) + if (entry) { entry->SetValue(content); return true; @@ -227,7 +227,7 @@ bool DocEntrySet::SetValEntry(std::string const &content, ValEntry *entry) */ bool DocEntrySet::SetBinEntry(uint8_t *content, int lgth, BinEntry *entry) { - if(entry) + if (entry) { entry->SetBinArea(content); entry->SetLength(lgth); @@ -259,14 +259,14 @@ ValEntry *DocEntrySet::InsertValEntry(std::string const &value, valEntry = dynamic_cast(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) ) { gdcmWarningMacro( "Removal of previous DocEntry failed."); @@ -276,7 +276,7 @@ ValEntry *DocEntrySet::InsertValEntry(std::string const &value, } // Create a new valEntry if necessary - if( !valEntry ) + if ( !valEntry ) { valEntry = NewValEntry( group, elem, vr ); @@ -319,14 +319,14 @@ BinEntry *DocEntrySet::InsertBinEntry(uint8_t *binArea, int lgth, binEntry = dynamic_cast(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) ) { gdcmWarningMacro( "Removal of previous DocEntry failed."); @@ -336,13 +336,13 @@ BinEntry *DocEntrySet::InsertBinEntry(uint8_t *binArea, int lgth, } // Create a new binEntry if necessary - if( !binEntry) + if ( !binEntry) { binEntry = NewBinEntry(group, elem, vr); if ( !AddEntry(binEntry) ) { - gdcmWarningMacro( "AddEntry failed allthough this is a creation."); + gdcmWarningMacro( "AddEntry failed although this is a creation."); delete binEntry; return NULL; @@ -351,7 +351,7 @@ BinEntry *DocEntrySet::InsertBinEntry(uint8_t *binArea, int lgth, // Set the binEntry value uint8_t *tmpArea; - if( lgth>0 && binArea ) + if ( lgth>0 && binArea ) { tmpArea = new uint8_t[lgth]; memcpy(tmpArea,binArea,lgth); @@ -360,9 +360,9 @@ BinEntry *DocEntrySet::InsertBinEntry(uint8_t *binArea, int lgth, { tmpArea = 0; } - if( !SetBinEntry(tmpArea,lgth,binEntry) ) + if ( !SetBinEntry(tmpArea,lgth,binEntry) ) { - if( tmpArea ) + if ( tmpArea ) { delete[] tmpArea; } @@ -372,7 +372,7 @@ BinEntry *DocEntrySet::InsertBinEntry(uint8_t *binArea, int lgth, } /** - * \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 @@ -382,20 +382,19 @@ BinEntry *DocEntrySet::InsertBinEntry(uint8_t *binArea, int lgth, 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(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)) { @@ -406,18 +405,21 @@ SeqEntry *DocEntrySet::InsertSeqEntry(uint16_t group, uint16_t elem) } } // Create a new seqEntry if necessary - if( !seqEntry ) + if ( !seqEntry ) { seqEntry = NewSeqEntry(group, elem); - if( !AddEntry(seqEntry) ) + if ( !AddEntry(seqEntry) ) { - gdcmWarningMacro( "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; } @@ -436,9 +438,9 @@ bool DocEntrySet::CheckIfEntryExist(uint16_t group, uint16_t elem ) * \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) @@ -460,9 +462,9 @@ ValEntry *DocEntrySet::NewValEntry(uint16_t group,uint16_t elem, * \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) @@ -483,8 +485,8 @@ BinEntry *DocEntrySet::NewBinEntry(uint16_t group, uint16_t elem, * \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) { @@ -502,10 +504,10 @@ SeqEntry* DocEntrySet::NewSeqEntry(uint16_t group, uint16_t elem) /** * \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 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, @@ -522,9 +524,9 @@ DictEntry* DocEntrySet::NewVirtualDictEntry( uint16_t group, uint16_t elem, * \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) @@ -548,7 +550,7 @@ DictEntry *DocEntrySet::GetDictEntry(uint16_t group,uint16_t elem) * 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,