X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.cxx;h=ceba6d0747a1f6783269b7e8999c00f717eeb569;hb=25c9af365d9221bd45f3fbe27275ff0f66a265b1;hp=6a4597f0944a11022eaf8148d218e02a3d95cddd;hpb=5b89bede4607999aeb8d5b45311e7ee82f9471ef;p=gdcm.git diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index 6a4597f0..ceba6d07 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/02 16:18:48 $ - Version: $Revision: 1.52 $ + Date: $Date: 2005/02/05 01:37:08 $ + Version: $Revision: 1.54 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -129,7 +129,7 @@ BinEntry *DocEntrySet::GetBinEntry(uint16_t group, uint16_t elem) DocEntry *currentEntry = GetDocEntry(group, elem); if ( !currentEntry ) { - gdcmVerboseMacro( "No corresponding BinEntry " << std::hex << group << + gdcmWarningMacro( "No corresponding BinEntry " << std::hex << group << "," << elem); return NULL; } @@ -150,7 +150,7 @@ SeqEntry *DocEntrySet::GetSeqEntry(uint16_t group, uint16_t elem) DocEntry *currentEntry = GetDocEntry(group, elem); if ( !currentEntry ) { - gdcmVerboseMacro( "No corresponding SeqEntry " << std::hex << group << + gdcmWarningMacro( "No corresponding SeqEntry " << std::hex << group << "," << elem); return NULL; } @@ -172,7 +172,7 @@ bool DocEntrySet::SetValEntry(std::string const &content, 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; } @@ -194,7 +194,7 @@ bool DocEntrySet::SetBinEntry(uint8_t *content, int lgth, 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; } @@ -252,7 +252,7 @@ ValEntry *DocEntrySet::InsertValEntry(std::string const &value, TagName const &vr ) { ValEntry *valEntry = 0; - DocEntry *currentEntry = GetDocEntry( group, elem); + DocEntry *currentEntry = GetDocEntry( group, elem ); if (currentEntry) { @@ -268,7 +268,7 @@ ValEntry *DocEntrySet::InsertValEntry(std::string const &value, { if( !RemoveEntry(currentEntry) ) { - gdcmVerboseMacro( "Removal of previous DocEntry failed."); + gdcmWarningMacro( "Removal of previous DocEntry failed."); return NULL; } @@ -278,11 +278,11 @@ ValEntry *DocEntrySet::InsertValEntry(std::string const &value, // Create a new valEntry if necessary 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; @@ -294,11 +294,12 @@ ValEntry *DocEntrySet::InsertValEntry(std::string const &value, 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- @@ -310,7 +311,7 @@ BinEntry *DocEntrySet::InsertBinEntry(uint8_t *binArea, int lgth, TagName const &vr ) { BinEntry *binEntry = 0; - DocEntry *currentEntry = GetDocEntry( group, elem); + DocEntry *currentEntry = GetDocEntry( group, elem ); // Verify the currentEntry if (currentEntry) @@ -327,7 +328,7 @@ BinEntry *DocEntrySet::InsertBinEntry(uint8_t *binArea, int lgth, { if( !RemoveEntry(currentEntry) ) { - gdcmVerboseMacro( "Removal of previous DocEntry failed."); + gdcmWarningMacro( "Removal of previous DocEntry failed."); return NULL; } @@ -341,7 +342,7 @@ BinEntry *DocEntrySet::InsertBinEntry(uint8_t *binArea, int lgth, if ( !AddEntry(binEntry) ) { - gdcmVerboseMacro( "AddEntry failed allthough this is a creation."); + gdcmWarningMacro( "AddEntry failed allthough this is a creation."); delete binEntry; return NULL; @@ -370,7 +371,7 @@ BinEntry *DocEntrySet::InsertBinEntry(uint8_t *binArea, int lgth, return binEntry; } -/* +/** * \brief Modifies the value of a given Header Entry (Dicom Element) * when it exists. Creates it when unexistant. * @param group Group number of the Entry @@ -398,7 +399,7 @@ SeqEntry *DocEntrySet::InsertSeqEntry(uint16_t group, uint16_t elem) { if (!RemoveEntry(currentEntry)) { - gdcmVerboseMacro( "Removal of previous DocEntry failed."); + gdcmWarningMacro( "Removal of previous DocEntry failed."); return NULL; } @@ -411,7 +412,7 @@ SeqEntry *DocEntrySet::InsertSeqEntry(uint16_t group, uint16_t elem) if( !AddEntry(seqEntry) ) { - gdcmVerboseMacro( "AddEntry failed allthough this is a creation."); + gdcmWarningMacro( "AddEntry failed allthough this is a creation."); delete seqEntry; return NULL; @@ -440,7 +441,7 @@ bool DocEntrySet::CheckIfEntryExist(uint16_t group, uint16_t elem ) * @param vr VR 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); @@ -448,7 +449,7 @@ ValEntry *DocEntrySet::NewValEntry(uint16_t group,uint16_t elem, ValEntry *newEntry = new ValEntry(dictEntry); if (!newEntry) { - gdcmVerboseMacro( "Failed to allocate ValEntry"); + gdcmWarningMacro( "Failed to allocate ValEntry"); return 0; } return newEntry; @@ -472,7 +473,7 @@ BinEntry *DocEntrySet::NewBinEntry(uint16_t group, uint16_t elem, BinEntry *newEntry = new BinEntry(dictEntry); if (!newEntry) { - gdcmVerboseMacro( "Failed to allocate BinEntry"); + gdcmWarningMacro( "Failed to allocate BinEntry"); return 0; } return newEntry; @@ -493,7 +494,7 @@ 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; @@ -507,10 +508,10 @@ SeqEntry* DocEntrySet::NewSeqEntry(uint16_t group, uint16_t elem) * @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 ) +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); } @@ -532,7 +533,7 @@ 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 {