X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmParser.cxx;h=9a1c07cea4a1934d63cfb10120e64333ab917198;hb=8cdbf11a3b1f8427281f31a9fd2a70aa66d620fa;hp=0ec0e22f9731edc23beab9e3b06c5d34dc5e1c51;hpb=ac6281627c9571b711bd4d6e55a4adabc8b91afb;p=gdcm.git diff --git a/src/gdcmParser.cxx b/src/gdcmParser.cxx index 0ec0e22f..9a1c07ce 100644 --- a/src/gdcmParser.cxx +++ b/src/gdcmParser.cxx @@ -1,5 +1,13 @@ // gdcmParser.cxx //----------------------------------------------------------------------------- +//#define UINT32_MAX (4294967295U) + + +#include "gdcmParser.h" +#include "gdcmGlobal.h" +#include "gdcmUtil.h" +#include "gdcmDebug.h" + #include #include @@ -10,19 +18,8 @@ #include #endif -#ifdef GDCM_NO_ANSI_STRING_STREAM -# include -# define ostringstream ostrstream -# else -# include -#endif # include -#include "gdcmParser.h" -#include "gdcmGlobal.h" -#include "gdcmUtil.h" -#include "gdcmDebug.h" - #define UI1_2_840_10008_1_2 "1.2.840.10008.1.2" #define UI1_2_840_10008_1_2_1 "1.2.840.10008.1.2.1" #define UI1_2_840_10008_1_2_2 "1.2.840.10008.1.2.2" @@ -40,8 +37,6 @@ const unsigned int gdcmParser::HEADER_LENGTH_TO_READ = 256; // Refer to gdcmParser::SetMaxSizeLoadEntry() const unsigned int gdcmParser::MAX_SIZE_LOAD_ELEMENT_VALUE = 4096; -// Refer to gdcmParser::SetMaxSizePrintEntry() -// TODO : Right now, better see "define, in gdcmHederEntry.cxx const unsigned int gdcmParser::MAX_SIZE_PRINT_ELEMENT_VALUE = 64; //----------------------------------------------------------------------------- @@ -74,9 +69,8 @@ gdcmParser::gdcmParser(const char *inFilename, if ( !OpenFile(exception_on_error)) return; - if (ParseHeader()) { - LoadHeaderEntries(); - } + + LoadHeaderEntries(); CloseFile(); wasUpdated = 0; // will be set to 1 if user adds an entry @@ -84,7 +78,6 @@ gdcmParser::gdcmParser(const char *inFilename, } /** - * \ingroup gdcmParser * \brief constructor * @param exception_on_error */ @@ -100,7 +93,6 @@ gdcmParser::gdcmParser(bool exception_on_error) { } /** - * \ingroup gdcmParser * \brief Canonical destructor. */ gdcmParser::~gdcmParser (void) { @@ -111,7 +103,6 @@ gdcmParser::~gdcmParser (void) { //----------------------------------------------------------------------------- // Print /** - * \ingroup gdcmParser * \brief Prints the Header Entries (Dicom Elements) * from the chained list * @return @@ -127,147 +118,6 @@ void gdcmParser::PrintEntry(std::ostream & os) { } } -/** - * \ingroup gdcmParser - * \brief Prints the Header Entries (Dicom Elements) - * from the chained list - * and skips the elements belonging to a 'no length' SeQuence - * @return - */ -void gdcmParser::PrintEntryNoSQ(std::ostream & os) { - int countSQ = 0; - for (ListTag::iterator i = listEntries.begin(); - i != listEntries.end(); - ++i) - { - if ( (*i)->GetVR() == "SQ"){ - countSQ ++; - } - - if ( (*i)->GetGroup() == 0xfffe && (*i)->GetElement() == 0xe0dd){ - countSQ --; - continue; - } - - if (countSQ == 0) { - (*i)->SetPrintLevel(printLevel); - (*i)->Print(os); - } - } -} - -/** - * \ingroup gdcmParser - * \brief Prints the Header Entries (Dicom Elements) - * from the chained list - * and indents the elements belonging to any SeQuence - * \warning : will be removed - * @return - */ -void gdcmParser::PrintEntryNiceSQ(std::ostream & os) { - pileElem pile[50]; // Hope embedded sequence depth is no more than 50 - int top =-1; - int countSQ = 0; - int currentParsedlength = 0; - int totalElementlength; - std::ostringstream tab; - tab << " "; - - int DEBUG = 0; // Sorry; Dealing with e-film breaker images - // will (certainly) cause a lot of troubles ... - // I prefer keeping my 'trace' on . - - for (ListTag::iterator i = listEntries.begin(); - i != listEntries.end(); - ++i) { - if ( (*i)->GetVR() == "SQ" && (*i)->GetReadLength() != 0) { // SQ found - countSQ++; - top ++; - if ( top >= 50) { - std::cout << "Kaie ! Kaie! SQ stack overflow" << std::endl; - return; - } - if (DEBUG) cout << "\n >>>>> empile niveau " << top - << "; Lgr SeQ: " << (*i)->GetReadLength() - << "\n" <GetReadLength(); - pile[top].alreadyParsedlength = 0; - currentParsedlength = 0; - - } else { // non SQ found - - if (countSQ != 0) { // we are 'inside a SeQuence' - if ( (*i)->GetGroup()==0xfffe && (*i)->GetElement()==0xe0dd){ - // we just found 'end of SeQuence' - - if (DEBUG) - std::cout << "fffe,e0dd : depile" << std::endl; - currentParsedlength += 8; // gr:2 elem:2 vr:2 lgt:2 - countSQ --; - top --; - pile[top].alreadyParsedlength += currentParsedlength; - } else { - // we are on a 'standard' elem - // or a Zero-length SeQuence - - totalElementlength = (*i)->GetFullLength(); - currentParsedlength += totalElementlength; - pile[top].alreadyParsedlength += totalElementlength; - - if (pile[top].totalSQlength == 0xffffffff) { - if (DEBUG) - std::cout << "totalSeQlength == 0xffffffff" - << std::endl; - } else { - if (DEBUG) - cout << "alrdyPseLgt:" - << pile[top].alreadyParsedlength << " totSeQlgt: " - << pile[top].totalSQlength << " curPseLgt: " - << currentParsedlength - << endl; - while (pile[top].alreadyParsedlength==pile[top].totalSQlength) { - - if (DEBUG) - std::cout << " \n<<<<<< On depile niveau " << top - << "\n" << std::endl; - - currentParsedlength = pile[top].alreadyParsedlength; - countSQ --; - top --; - if (top >=0) { - - pile[top].alreadyParsedlength += currentParsedlength +12; - // 12 : length of 'SQ embedded' SQ element - currentParsedlength += 8; // gr:2 elem:2 vr:2 lgt:2 - - if (DEBUG) - std::cout << pile[top].alreadyParsedlength << " " - << pile[top].totalSQlength << " " - << currentParsedlength - << std::endl; - } - if (top == -1) { - currentParsedlength = 0; - break; - } - } - } - } - } // end : 'inside a SeQuence' - } - - if (countSQ != 0) { - for (int i=0;iSetPrintLevel(printLevel); - (*i)->Print(os); - - } // end for -} - - /** * \brief Prints The Dict Entries of THE public Dicom Dictionary @@ -356,7 +206,6 @@ bool gdcmParser::IsImplicitVRLittleEndianTransferSyntax(void) { } /** - * \ingroup gdcmParser * \brief Determines if the Transfer Syntax was already encountered * and if it corresponds to a ExplicitVRLittleEndian one. * @return True when ExplicitVRLittleEndian found. False in all other cases. @@ -477,32 +326,35 @@ bool gdcmParser::CloseFile(void) { * \return Always true. */ bool gdcmParser::Write(FILE *fp, FileType type) { -// ============== -// TODO The stuff was rewritten using the chained list instead -// of the H table -// so we could remove the GroupHT from the gdcmParser -// To be checked -// ============= - - // TODO : move the following lines (and a lot of others, to be written) - // to a future function CheckAndCorrectHeader +/// \todo +/// ============== +/// The stuff will have to be rewritten using the SeQuence based +/// tree-like stucture instead of the chained list . +/// (so we shall remove the GroupHT from the gdcmParser) +/// To be checked +/// ============= + + /// \todo move the following lines (and a lot of others, to be written) + /// to a future function CheckAndCorrectHeader - // Question : - // Comment pourrait-on savoir si le DcmHeader vient d'un fichier - // DicomV3 ou non (FileType est un champ de gdcmParser ...) - // WARNING : Si on veut ecrire du DICOM V3 a partir d'un DcmHeader ACR-NEMA - // no way - // a moins de se livrer a un tres complique ajout des champs manquants. - // faire un CheckAndCorrectHeader (?) + /// \todo + /// Question : + /// Comment pourrait-on savoir si le DcmHeader vient d'un fichier + /// DicomV3 ou non (FileType est un champ de gdcmParser ...) + /// WARNING : Si on veut ecrire du DICOM V3 a partir d'un DcmHeader ACR-NEMA + /// no way + /// a moins de se livrer a un tres complique ajout des champs manquants. + /// faire un CheckAndCorrectHeader (?) if (type == ImplicitVR) { std::string implicitVRTransfertSyntax = UI1_2_840_10008_1_2; ReplaceOrCreateByNumber(implicitVRTransfertSyntax,0x0002, 0x0010); - //FIXME Refer to standards on page 21, chapter 6.2 "Value representation": - // values with a VR of UI shall be padded with a single trailing null - // Dans le cas suivant on doit pader manuellement avec un 0 + /// \todo Refer to standards on page 21, chapter 6.2 + /// "Value representation": values with a VR of UI shall be + /// padded with a single trailing null + /// Dans le cas suivant on doit pader manuellement avec un 0 SetEntryLengthByNumber(18, 0x0002, 0x0010); } @@ -512,24 +364,26 @@ bool gdcmParser::Write(FILE *fp, FileType type) { std::string explicitVRTransfertSyntax = UI1_2_840_10008_1_2_1; ReplaceOrCreateByNumber(explicitVRTransfertSyntax,0x0002, 0x0010); - //FIXME Refer to standards on page 21, chapter 6.2 "Value representation": - // values with a VR of UI shall be padded with a single trailing null - // Dans le cas suivant on doit pader manuellement avec un 0 + /// \todo Refer to standards on page 21, chapter 6.2 + /// "Value representation": values with a VR of UI shall be + /// padded with a single trailing null + /// Dans le cas suivant on doit pader manuellement avec un 0 SetEntryLengthByNumber(20, 0x0002, 0x0010); } -/* TODO : rewrite later, if really usefull - ---> Warning : un-updated odd groups lengths can causes pb ---> (xmedcon breaks) ---> to be re- written with future org. - - if ( (type == ImplicitVR) || (type == ExplicitVR) ) - UpdateGroupLength(false,type); - if ( type == ACR) - UpdateGroupLength(true,ACR); -*/ +/** + * \todo rewrite later, if really usefull + * + * --> Warning : un-updated odd groups lengths can causes pb + * --> (xmedcon breaks) + * --> to be re- written with future org. + * + * if ( (type == ImplicitVR) || (type == ExplicitVR) ) + * UpdateGroupLength(false,type); + * if ( type == ACR) + * UpdateGroupLength(true,ACR); + */ WriteEntries(fp,type); return(true); @@ -593,7 +447,6 @@ int gdcmParser::CheckIfEntryExistByNumber(guint16 group, guint16 element ) { } /** - * \ingroup gdcmParser * \brief Searches within Header Entries (Dicom Elements) parsed with * the public and private dictionaries * for the element value of a given tag. @@ -611,7 +464,6 @@ std::string gdcmParser::GetEntryByName(std::string tagName) { } /** - * \ingroup gdcmParser * \brief Searches within Header Entries (Dicom Elements) parsed with * the public and private dictionaries * for the element value representation of a given tag. @@ -636,7 +488,6 @@ std::string gdcmParser::GetEntryVRByName(std::string tagName) { /** - * \ingroup gdcmParser * \brief Searches within Header Entries (Dicom Elements) parsed with * the public and private dictionaries * for the element value representation of a given tag. @@ -653,7 +504,6 @@ std::string gdcmParser::GetEntryByNumber(guint16 group, guint16 element){ } /** - * \ingroup gdcmParser * \brief Searches within Header Entries (Dicom Elements) parsed with * the public and private dictionaries * for the element value representation of a given tag.. @@ -675,7 +525,6 @@ std::string gdcmParser::GetEntryVRByNumber(guint16 group, guint16 element) { } /** - * \ingroup gdcmParser * \brief Searches within Header Entries (Dicom Elements) parsed with * the public and private dictionaries * for the value length of a given tag.. @@ -690,7 +539,6 @@ int gdcmParser::GetEntryLengthByNumber(guint16 group, guint16 element) { return elem->GetLength(); } /** - * \ingroup gdcmParser * \brief Sets the value (string) of the Header Entry (Dicom Element) * @param content string value of the Dicom Element * @param tagName name of the searched Dicom Element. @@ -706,7 +554,6 @@ bool gdcmParser::SetEntryByName(std::string content,std::string tagName) { } /** - * \ingroup gdcmParser * \brief Accesses an existing gdcmHeaderEntry (i.e. a Dicom Element) * through it's (group, element) and modifies it's content with * the given value. @@ -757,7 +604,6 @@ bool gdcmParser::SetEntryByNumber(std::string content, } /** - * \ingroup gdcmParser * \brief Accesses an existing gdcmHeaderEntry (i.e. a Dicom Element) * in the PubHeaderEntrySet of this instance * through it's (group, element) and modifies it's length with @@ -782,7 +628,6 @@ bool gdcmParser::SetEntryLengthByNumber(guint32 l, } /** - * \ingroup gdcmParser * \brief Gets (from Header) the offset of a 'non string' element value * (LoadElementValues has already be executed) * @param Group group of the Entry @@ -802,7 +647,6 @@ size_t gdcmParser::GetEntryOffsetByNumber(guint16 Group, guint16 Elem) } /** - * \ingroup gdcmParser * \brief Gets (from Header) a 'non string' element value * (LoadElementValues has already be executed) * @param Group group of the Entry @@ -840,7 +684,7 @@ void *gdcmParser::LoadEntryVoidArea(guint16 Group, guint16 Elem) return NULL; SetEntryVoidAreaByNumber(a, Group, Elem); - // TODO check the result + /// \todo check the result size_t l2 = fread(a, 1, l ,fp); if(l != l2) { @@ -852,7 +696,6 @@ void *gdcmParser::LoadEntryVoidArea(guint16 Group, guint16 Elem) } /** - * \ingroup gdcmParser * \brief Sets a 'non string' value to a given Dicom Element * @param area * @param group Group number of the searched Dicom Element @@ -871,7 +714,6 @@ bool gdcmParser::SetEntryVoidAreaByNumber(void * area, } /** - * \ingroup gdcmParser * \brief Update the entries with the shadow dictionary. * Only non even entries are analyzed */ @@ -915,7 +757,6 @@ void gdcmParser::UpdateShaEntries(void) { } /** - * \ingroup gdcmParser * \brief Searches within the Header Entries for a Dicom Element of * a given tag. * @param tagName name of the searched Dicom Element. @@ -931,7 +772,6 @@ void gdcmParser::UpdateShaEntries(void) { } /** - * \ingroup gdcmParser * \brief retrieves a Dicom Element (the first one) using (group, element) * \warning (group, element) IS NOT an identifier inside the Dicom Header * if you think it's NOT UNIQUE, check the count number @@ -950,7 +790,6 @@ gdcmHeaderEntry* gdcmParser::GetHeaderEntryByNumber(guint16 group, guint16 eleme } /** - * \ingroup gdcmParser * \brief retrieves the Dicom Elements (all of them) using (group, element) * @param group Group number of the searched Dicom Element. * @param element Element number of the searched Dicom Element. @@ -963,7 +802,6 @@ IterHT gdcmParser::GetHeaderEntrySameNumber(guint16 group, guint16 element){ } /** - * \ingroup gdcmParser * \brief Loads the element while preserving the current * underlying file position indicator as opposed to * to LoadHeaderEntry that modifies it. @@ -1253,7 +1091,7 @@ bool gdcmParser::WriteEntry(gdcmHeaderEntry *tag, FILE *_fp,FileType type) bool gdcmParser::WriteEntries(FILE *_fp,FileType type) { - // TODO (?) tester les echecs en ecriture (apres chaque fwrite) + /// \todo (?) check write failures (after *each* fwrite) for (ListTag::iterator tag2=listEntries.begin(); tag2 != listEntries.end(); @@ -1266,13 +1104,10 @@ bool gdcmParser::WriteEntries(FILE *_fp,FileType type) if ((*tag2)->GetElement() %2) // Ignore the "shadow" groups continue; - if ((*tag2)->GetVR() == "SQ" ) - // For the time being sequences are simply ignored - // TODO : find a trick not to *skip* the SeQuences ! - continue; - if ((*tag2)->GetGroup() == 0xfffe ) - // Ignore the documented delimiter + if ((*tag2)->GetVR() == "SQ" ) // ignore Sequences continue; + if ((*tag2)->GetSQDepthLevel() != 0) // Not only ignore the SQ element + continue; } if (! WriteEntry(*tag2,_fp,type) ) return false; @@ -1281,7 +1116,6 @@ bool gdcmParser::WriteEntries(FILE *_fp,FileType type) } /** - * \ingroup gdcmParser * \brief writes on disc according to the requested format * (ACR-NEMA, ExplicitVR, ImplicitVR) the image, * using only the last synonym of each mutimap H Table post. @@ -1305,13 +1139,10 @@ void gdcmParser::WriteEntriesDeprecated(FILE *_fp,FileType type) { tag2 != tagHT.end(); ++tag2){ if ( type == ACR ){ - if ((*tag2->second).GetGroup() < 0x0008) continue; // ignore pure DICOM V3 groups - if ((*tag2->second).GetElement() %2) continue; // ignore shadow groups - if ((*tag2->second).GetVR() == "SQ" ) continue; // ignore Sequences - // TODO : find a trick to *skip* the SeQuences ! - // Not only ignore the SQ element - // --> will be done with the next organization - if ((*tag2->second).GetGroup() == 0xfffe ) continue; // ignore delimiters + if ((*tag2->second).GetGroup() < 0x0008) continue; // ignore pure DICOM V3 groups + if ((*tag2->second).GetElement() %2) continue; // ignore shadow groups + if ((*tag2->second).GetVR() == "SQ" ) continue; // ignore Sequences + if ((*tag2->second).GetSQDepthLevel() != 0) continue; // Not only ignore the SQ element } if ( ! WriteEntry(tag2->second,_fp,type)) break; @@ -1319,7 +1150,6 @@ void gdcmParser::WriteEntriesDeprecated(FILE *_fp,FileType type) { } /** - * \ingroup gdcmParser * \brief Swaps back the bytes of 4-byte long integer accordingly to * processor order. * @return The properly swaped 32 bits integer. @@ -1348,7 +1178,6 @@ guint32 gdcmParser::SwapLong(guint32 a) { } /** - * \ingroup gdcmParser * \brief Unswaps back the bytes of 4-byte long integer accordingly to * processor order. * @return The properly unswaped 32 bits integer. @@ -1358,7 +1187,6 @@ guint32 gdcmParser::UnswapLong(guint32 a) { } /** - * \ingroup gdcmParser * \brief Swaps the bytes so they agree with the processor order * @return The properly swaped 16 bits integer. */ @@ -1369,7 +1197,6 @@ guint16 gdcmParser::SwapShort(guint16 a) { } /** - * \ingroup gdcmParser * \brief Unswaps the bytes so they agree with the processor order * @return The properly unswaped 16 bits integer. */ @@ -1380,11 +1207,10 @@ guint16 gdcmParser::UnswapShort(guint16 a) { //----------------------------------------------------------------------------- // Private /** - * \ingroup gdcmParser - * \brief Parses the header of the file but WITHOUT loading element values. - * @return false if file is not ACR-NEMA / DICOM + * \brief Parses the header of the file and load element values. + * @return false if file is not ACR-NEMA / PAPYRUS / DICOM */ -bool gdcmParser::ParseHeader(bool exception_on_error) throw(gdcmFormatError) { +bool gdcmParser::LoadHeaderEntries(bool exception_on_error) throw(gdcmFormatError) { (void)exception_on_error; rewind(fp); if (!CheckSwap()) @@ -1396,27 +1222,19 @@ bool gdcmParser::ParseHeader(bool exception_on_error) throw(gdcmFormatError) { if ( (ignoreShadow==0) || (newHeaderEntry->GetGroup()%2) == 0) { AddHeaderEntry(newHeaderEntry); } - } - return true; -} - -/** - * \ingroup gdcmParser - * \brief Loads the element values of all the Header Entries pointed in the - * public Chained List. - */ -void gdcmParser::LoadHeaderEntries(void) { - rewind(fp); - for (ListTag::iterator i = GetListEntry().begin(); - i != GetListEntry().end(); - ++i) - { - LoadHeaderEntry(*i); - } - + } rewind(fp); - - // Load 'non string' values + // Be carefull : merging this two loops may cause troubles ... + for (ListTag::iterator i = GetListEntry().begin(); + i != GetListEntry().end(); + ++i) + { + LoadHeaderEntry(*i); + } + rewind(fp); + + // Load 'non string' values + std::string PhotometricInterpretation = GetEntryByNumber(0x0028,0x0004); if( PhotometricInterpretation == "PALETTE COLOR " ) { LoadEntryVoidArea(0x0028,0x1200); // gray LUT @@ -1428,7 +1246,7 @@ void gdcmParser::LoadHeaderEntries(void) { LoadEntryVoidArea(0x0028,0x1222); // Segmented Green Palette Color LUT Data LoadEntryVoidArea(0x0028,0x1223); // Segmented Blue Palette Color LUT Data } - //FIXME : how to use it? + //FIXME later : how to use it? LoadEntryVoidArea(0x0028,0x3006); //LUT Data (CTX dependent) // -------------------------------------------------------------- @@ -1440,7 +1258,8 @@ void gdcmParser::LoadHeaderEntries(void) { std::string RecCode; RecCode = GetEntryByNumber(0x0008, 0x0010); // recognition code if (RecCode == "ACRNEMA_LIBIDO_1.1" || - RecCode == "CANRME_AILIBOD1_1." ) + RecCode == "CANRME_AILIBOD1_1." ) // for brain-damaged softwares + // with "little-endian strings" { filetype = ACR_LIBIDO; std::string rows = GetEntryByNumber(0x0028, 0x0010); @@ -1448,11 +1267,11 @@ void gdcmParser::LoadHeaderEntries(void) { SetEntryByNumber(columns, 0x0028, 0x0010); SetEntryByNumber(rows , 0x0028, 0x0011); } - // ----------------- End of Special Patch ---------------- + // ----------------- End of Special Patch ---------------- + return true; } /** - * \ingroup gdcmParser * \brief Loads the element content if its length doesn't exceed * the value specified with gdcmParser::SetMaxSizeLoadEntry() * @param Entry Header Entry (Dicom Element) to be dealt with @@ -1554,7 +1373,6 @@ void gdcmParser::LoadHeaderEntry(gdcmHeaderEntry *Entry) { } /** - * \ingroup gdcmParser * \brief add a new Dicom Element pointer to * the H Table and at the end of the chained List * \warning push_bash in listEntries ONLY during ParseHeader @@ -1570,7 +1388,6 @@ void gdcmParser::AddHeaderEntry(gdcmHeaderEntry *newHeaderEntry) { } /** - * \ingroup gdcmParser * \brief Find the value Length of the passed Header Entry * @param Entry Header Entry whose length of the value shall be loaded. */ @@ -1683,7 +1500,6 @@ void gdcmParser::AddHeaderEntry(gdcmHeaderEntry *newHeaderEntry) { } /** - * \ingroup gdcmParser * \brief Find the Value Representation of the current Dicom Element. * @param Entry */ @@ -1720,7 +1536,6 @@ void gdcmParser::FindHeaderEntryVR( gdcmHeaderEntry *Entry) } /** - * \ingroup gdcmParser * \brief Check the correspondance between the VR of the header entry * and the taken VR. If they are different, the header entry is * updated with the new VR. @@ -1792,7 +1607,6 @@ bool gdcmParser::CheckHeaderEntryVR(gdcmHeaderEntry *Entry, VRKey vr) } /** - * \ingroup gdcmParser * \brief Get the transformed value of the header entry. The VR value * is used to define the transformation to operate on the value * \warning NOT end user intended method ! @@ -1862,7 +1676,6 @@ std::string gdcmParser::GetHeaderEntryValue(gdcmHeaderEntry *Entry) } /** - * \ingroup gdcmParser * \brief Get the reverse transformed value of the header entry. The VR * value is used to define the reverse transformation to operate on * the value @@ -1916,7 +1729,6 @@ std::string gdcmParser::GetHeaderEntryUnvalue(gdcmHeaderEntry *Entry) } /** - * \ingroup gdcmParser * \brief Skip a given Header Entry * \warning NOT end user intended method ! * @param entry @@ -1927,7 +1739,6 @@ void gdcmParser::SkipHeaderEntry(gdcmHeaderEntry *entry) } /** - * \ingroup gdcmParser * \brief When the length of an element value is obviously wrong (because * the parser went Jabberwocky) one can hope improving things by * applying this heuristic. @@ -1992,7 +1803,6 @@ void gdcmParser::FixHeaderEntryFoundLength(gdcmHeaderEntry *Entry, guint32 Found } /** - * \ingroup gdcmParser * \brief Apply some heuristics to predict whether the considered * element value contains/represents an integer or not. * @param Entry The element value on which to apply the predicate. @@ -2036,7 +1846,6 @@ bool gdcmParser::IsHeaderEntryAnInteger(gdcmHeaderEntry *Entry) { return false; } /** - * \ingroup gdcmParser * \brief Find the Length till the next sequence delimiter * \warning NOT end user intended method ! * @return @@ -2088,7 +1897,6 @@ bool gdcmParser::IsHeaderEntryAnInteger(gdcmHeaderEntry *Entry) { } /** - * \ingroup gdcmParser * \brief Reads a supposed to be 16 Bits integer * (swaps it depending on processor endianity) * @return read value @@ -2109,7 +1917,6 @@ guint16 gdcmParser::ReadInt16(void) { } /** - * \ingroup gdcmParser * \brief Reads a supposed to be 32 Bits integer * (swaps it depending on processor endianity) * @return read value @@ -2130,7 +1937,6 @@ guint32 gdcmParser::ReadInt32(void) { } /** - * \ingroup gdcmParser * \brief skips bytes inside the source file * \warning NOT end user intended method ! * @return @@ -2141,7 +1947,6 @@ void gdcmParser::SkipBytes(guint32 NBytes) { } /** - * \ingroup gdcmParser * \brief Loads all the needed Dictionaries * \warning NOT end user intended method ! */ @@ -2152,7 +1957,6 @@ void gdcmParser::Initialise(void) } /** - * \ingroup gdcmParser * \brief Discover what the swap code is (among little endian, big endian, * bad little endian, bad big endian). * sw is set @@ -2336,7 +2140,6 @@ bool gdcmParser::CheckSwap() { } /** - * \ingroup gdcmParser * \brief Restore the unproperly loaded values i.e. the group, the element * and the dictionary entry depending on them. */ @@ -2364,7 +2167,6 @@ void gdcmParser::SwitchSwapToBigEndian(void) } /** - * \ingroup gdcmParser * \brief during parsing, Header Elements too long are not loaded in memory * @param NewSize */ @@ -2382,13 +2184,8 @@ void gdcmParser::SetMaxSizeLoadEntry(long NewSize) /** - * \ingroup gdcmParser * \brief Header Elements too long will not be printed - * \warning - * \todo : not yet usable - * (see MAX_SIZE_PRINT_ELEMENT_VALUE - * in gdcmHeaderEntry gdcmLoadEntry) - * + * \todo See comments of \ref gdcmParser::MAX_SIZE_PRINT_ELEMENT_VALUE * @param NewSize */ void gdcmParser::SetMaxSizePrintEntry(long NewSize) @@ -2404,7 +2201,6 @@ void gdcmParser::SetMaxSizePrintEntry(long NewSize) } /** - * \ingroup gdcmParser * \brief Searches both the public and the shadow dictionary (when they * exist) for the presence of the DictEntry with given name. * The public dictionary has precedence on the shadow one. @@ -2435,7 +2231,6 @@ gdcmDictEntry *gdcmParser::GetDictEntryByName(std::string Name) } /** - * \ingroup gdcmParser * \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 @@ -2468,7 +2263,6 @@ gdcmDictEntry *gdcmParser::GetDictEntryByNumber(guint16 group,guint16 element) } /** - * \ingroup gdcmParser * \brief Read the next tag but WITHOUT loading it's value * @return On succes the newly created HeaderEntry, NULL on failure. */ @@ -2505,7 +2299,6 @@ gdcmHeaderEntry *gdcmParser::ReadNextHeaderEntry(void) { } /** - * \ingroup gdcmParser * \brief Build a new Element Value from all the low level arguments. * Check for existence of dictionary entry, and build * a default one when absent. @@ -2528,7 +2321,6 @@ gdcmHeaderEntry *gdcmParser::NewHeaderEntryByName(std::string Name) } /** - * \ingroup gdcmParser * \brief Request a new virtual dict entry to the dict set * @param group group of the underlying DictEntry * @param element element of the underlying DictEntry @@ -2545,7 +2337,6 @@ gdcmDictEntry *gdcmParser::NewVirtualDictEntry(guint16 group, guint16 element, } /** - * \ingroup gdcmParser * \brief Build a new Element Value from all the low level arguments. * Check for existence of dictionary entry, and build * a default one when absent. @@ -2569,9 +2360,8 @@ gdcmHeaderEntry *gdcmParser::NewHeaderEntryByNumber(guint16 Group, guint16 Elem) return NewEntry; } -// Never used; commented out, waiting for removal. +/// \todo Never used; commented out, waiting for removal. /** - * \ingroup gdcmParser * \brief Small utility function that creates a new manually crafted * (as opposed as read from the file) gdcmHeaderEntry with user * specified name and adds it to the public tag hash table. @@ -2604,7 +2394,6 @@ gdcmHeaderEntry *gdcmParser::NewHeaderEntryByNumber(guint16 Group, guint16 Elem) //} /** - * \ingroup gdcmParser * \brief Generate a free TagKey i.e. a TagKey that is not present * in the TagHt dictionary. * @param group The generated tag must belong to this group.