X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmParser.cxx;h=327a37534531f3e366e43edf50576f340a8bfcd8;hb=8b0d3c6c373474dc31af9eb56cf949298a723a76;hp=24669fdc4b3727b58af8826b929bd5c5aeb1842b;hpb=81e328d78c2028a7c2ecb86e6cee04839f4d56b2;p=gdcm.git diff --git a/src/gdcmParser.cxx b/src/gdcmParser.cxx index 24669fdc..327a3753 100644 --- a/src/gdcmParser.cxx +++ b/src/gdcmParser.cxx @@ -1,5 +1,10 @@ // gdcmParser.cxx //----------------------------------------------------------------------------- +#include "gdcmParser.h" +#include "gdcmGlobal.h" +#include "gdcmUtil.h" +#include "gdcmDebug.h" + #include #include @@ -10,24 +15,18 @@ #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" #define UI1_2_840_10008_1_2_1_99 "1.2.840.10008.1.2.1.99" +typedef struct { + guint32 totalSQlength; + guint32 alreadyParsedlength; +} pileElem; + //----------------------------------------------------------------------------- // Refer to gdcmParser::CheckSwap() const unsigned int gdcmParser::HEADER_LENGTH_TO_READ = 256; @@ -44,11 +43,12 @@ const unsigned int gdcmParser::MAX_SIZE_PRINT_ELEMENT_VALUE = 64; /** * \brief constructor - * @param inFilename + * @param inFilename file to be opened for parsing * @param exception_on_error whether we throw an exception or not * @param enable_sequences = true to allow the header - * to be parsed *inside* the SeQuences, + * to be parsed *inside* the SeQuences, * when they have an actual length + * \warning enable_sequences *has to be* true for reading PAPYRUS 3.0 files * @param ignore_shadow to allow skipping the shadow elements, * to save memory space. * \warning The TRUE value for this param has to be used @@ -70,7 +70,7 @@ gdcmParser::gdcmParser(const char *inFilename, return; if (ParseHeader()) { LoadHeaderEntries(); - } + } CloseFile(); wasUpdated = 0; // will be set to 1 if user adds an entry @@ -83,6 +83,7 @@ gdcmParser::gdcmParser(const char *inFilename, * @param exception_on_error */ gdcmParser::gdcmParser(bool exception_on_error) { + (void)exception_on_error; enableSequences=0; SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); @@ -106,11 +107,10 @@ gdcmParser::~gdcmParser (void) { /** * \ingroup gdcmParser * \brief Prints the Header Entries (Dicom Elements) - * both from the H Table and the chained list + * from the chained list * @return */ void gdcmParser::PrintEntry(std::ostream & os) { - std::ostringstream s; for (ListTag::iterator i = listEntries.begin(); i != listEntries.end(); @@ -119,12 +119,152 @@ void gdcmParser::PrintEntry(std::ostream & os) { (*i)->SetPrintLevel(printLevel); (*i)->Print(os); } - os<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) std::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) + std::cout << "alrdyPseLgt:" + << pile[top].alreadyParsedlength << " totSeQlgt: " + << pile[top].totalSQlength << " curPseLgt: " + << currentParsedlength + << std::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 * @return */ void gdcmParser::PrintPubDict(std::ostream & os) { @@ -132,8 +272,7 @@ void gdcmParser::PrintPubDict(std::ostream & os) { } /** - * \ingroup gdcmParser - * \brief Prints The Dict Entries of THE shadow Dicom Dictionnary + * \brief Prints The Dict Entries of THE shadow Dicom Dictionary * @return */ void gdcmParser::PrintShaDict(std::ostream & os) { @@ -143,7 +282,6 @@ void gdcmParser::PrintShaDict(std::ostream & os) { //----------------------------------------------------------------------------- // Public /** - * \ingroup gdcmParser * \brief Get the public dictionary used */ gdcmDict *gdcmParser::GetPubDict(void) { @@ -151,7 +289,6 @@ gdcmDict *gdcmParser::GetPubDict(void) { } /** - * \ingroup gdcmParser * \brief Get the shadow dictionary used */ gdcmDict *gdcmParser::GetShaDict(void) { @@ -159,7 +296,6 @@ gdcmDict *gdcmParser::GetShaDict(void) { } /** - * \ingroup gdcmParser * \brief Set the shadow dictionary used * \param dict dictionary to use in shadow */ @@ -169,7 +305,6 @@ bool gdcmParser::SetShaDict(gdcmDict *dict){ } /** - * \ingroup gdcmParser * \brief Set the shadow dictionary used * \param dictName name of the dictionary to use in shadow */ @@ -179,7 +314,6 @@ bool gdcmParser::SetShaDict(DictKey dictName){ } /** - * \ingroup gdcmParser * \brief This predicate, based on hopefully reasonable heuristics, * decides whether or not the current gdcmParser was properly parsed * and contains the mandatory information for being considered as @@ -199,7 +333,6 @@ bool gdcmParser::IsReadable(void) { } /** - * \ingroup gdcmParser * \brief Determines if the Transfer Syntax was already encountered * and if it corresponds to a ImplicitVRLittleEndian one. * @return True when ImplicitVRLittleEndian found. False in all other cases. @@ -235,7 +368,6 @@ bool gdcmParser::IsExplicitVRLittleEndianTransferSyntax(void) { } /** - * \ingroup gdcmParser * \brief Determines if the Transfer Syntax was already encountered * and if it corresponds to a DeflatedExplicitVRLittleEndian one. * @return True when DeflatedExplicitVRLittleEndian found. False in all other cases. @@ -253,7 +385,6 @@ bool gdcmParser::IsDeflatedExplicitVRLittleEndianTransferSyntax(void) { } /** - * \ingroup gdcmParser * \brief Determines if the Transfer Syntax was already encountered * and if it corresponds to a Explicit VR Big Endian one. * @return True when big endian found. False in all other cases. @@ -271,7 +402,6 @@ bool gdcmParser::IsExplicitVRBigEndianTransferSyntax(void) { } /** - * \ingroup gdcmParser * \brief returns the File Type * (ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown) * @return the FileType code @@ -281,7 +411,6 @@ FileType gdcmParser::GetFileType(void) { } /** - * \ingroup gdcmParser * \brief opens the file * @param exception_on_error * @return @@ -322,7 +451,6 @@ FILE *gdcmParser::OpenFile(bool exception_on_error) } /** - * \ingroup gdcmParser * \brief closes the file * @return TRUE if the close was successfull */ @@ -335,13 +463,12 @@ bool gdcmParser::CloseFile(void) { } /** - * \ingroup gdcmParser - * \brief writes on disc all the Header Entries (Dicom Elements) + * \brief Writes in a file all the Header Entries (Dicom Elements) * of the Chained List * @param fp file pointer on an already open file - * @param type type of the File to be written + * @param type Type of the File to be written * (ACR-NEMA, ExplicitVR, ImplicitVR) - * @return always "True" ?! + * \return Always true. */ bool gdcmParser::Write(FILE *fp, FileType type) { // ============== @@ -388,6 +515,10 @@ bool gdcmParser::Write(FILE *fp, FileType type) { /* 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) @@ -396,18 +527,17 @@ bool gdcmParser::Write(FILE *fp, FileType type) { WriteEntries(fp,type); return(true); - } +} /** - * \ingroup gdcmParser * \brief Modifies the value of a given Header Entry (Dicom Element) - * if it exists; Creates it with the given value if it doesn't - * \warning : adds the Header Entry to the HTable, NOT to the chained List - * @param Value passed as a std::string - * @param Group group of the Entry - * @param Elem element of the Entry - * \return pointer to the created Header Entry - * NULL if creation failed + * when it exists. Create it with the given value when unexistant. + * \warning Adds the Header Entry to the HTable, NOT to the chained List + * @param Value Value to be set + * @param Group Group of the Entry + * @param Elem Element of the Entry + * \return pointer to the modified/created Header Entry (NULL when creation + * failed). */ gdcmHeaderEntry * gdcmParser::ReplaceOrCreateByNumber( std::string Value, @@ -416,47 +546,19 @@ gdcmHeaderEntry * gdcmParser::ReplaceOrCreateByNumber( gdcmHeaderEntry* a; a = GetHeaderEntryByNumber( Group, Elem); if (a == NULL) { - gdcmHeaderEntry *a =NewHeaderEntryByNumber(Group, Elem); + a =NewHeaderEntryByNumber(Group, Elem); if (a == NULL) return NULL; AddHeaderEntry(a); } - //SetEntryByNumber(Value, Group, Elem); + //CLEANME SetEntryByNumber(Value, Group, Elem); a->SetValue(Value); return(a); } /** - * \ingroup gdcmParser - * \brief Modifies the value of a given Header Entry (Dicom Element) - * if it exists; Creates it with the given value if it doesn't - * @param Value passed as a char* - * @param Group group of the Entry - * @param Elem element of the Entry - * \return pointer to the created Header Entry - * NULL if creation failed - * - */ -gdcmHeaderEntry * gdcmParser::ReplaceOrCreateByNumber( - char* Value, - guint16 Group, - guint16 Elem ) { - gdcmHeaderEntry* nvHeaderEntry=NewHeaderEntryByNumber(Group, Elem); - - if(!nvHeaderEntry) - return(NULL); - - AddHeaderEntry(nvHeaderEntry); - - std::string v = Value; - SetEntryByNumber(v, Group, Elem); - return(nvHeaderEntry); -} - -/** - * \ingroup gdcmParser - * \brief Set a new value if the invoked element exists - * Seems to be useless !!! + * \brief Set a new value if the invoked element exists + * Seems to be useless !!! * @param Value new element value * @param Group group of the Entry * @param Elem element of the Entry @@ -473,7 +575,6 @@ bool gdcmParser::ReplaceIfExistByNumber(char* Value, guint16 Group, guint16 Elem // Protected /** - * \ingroup gdcmParser * \brief Checks if a given Dicom Element exists * within the H table * @param group Group number of the searched Dicom Element @@ -715,7 +816,6 @@ void * gdcmParser::GetEntryVoidAreaByNumber(guint16 Group, guint16 Elem) } /** - * \ingroup gdcmParser * \brief Loads (from disk) the element content * when a string is not suitable * @param Group group of the Entry @@ -728,8 +828,8 @@ void *gdcmParser::LoadEntryVoidArea(guint16 Group, guint16 Elem) return NULL; size_t o =(size_t)Element->GetOffset(); fseek(fp, o, SEEK_SET); - int l=Element->GetLength(); - void * a = malloc(l); + size_t l=Element->GetLength(); + char* a = new char[l]; if(!a) return NULL; @@ -738,7 +838,7 @@ void *gdcmParser::LoadEntryVoidArea(guint16 Group, guint16 Elem) size_t l2 = fread(a, 1, l ,fp); if(l != l2) { - free(a); + delete[] a; return NULL; } @@ -871,7 +971,6 @@ void gdcmParser::LoadHeaderEntrySafe(gdcmHeaderEntry * entry) { } /** - * \ingroup gdcmParser * \brief Re-computes the length of a ACR-NEMA/Dicom group from a DcmHeader * \warning : to be re-written using the chained list instead of the H table. * \warning : DO NOT use (doesn't work any longer because of the multimap) @@ -920,7 +1019,7 @@ void gdcmParser::UpdateGroupLength(bool SkipSequence, FileType type) { // since it's at the end of the Hash Table // (fffe,e0dd) - // pas SEQUENCE en ACR-NEMA + // there is SEQUENCE in ACR-NEMA // WARNING : // --> la descente a l'interieur' des SQ // devrait etre faite avec une liste chainee, pas avec une HTable... @@ -957,7 +1056,7 @@ void gdcmParser::UpdateGroupLength(bool SkipSequence, FileType type) { { // FIXME: g++ -Wall -Wstrict-prototypes reports on following line: // warning: unsigned int format, different type arg - sscanf(g->first.c_str(),"%x",&gr_bid); + sscanf(g->first.c_str(),"%x",&gr_bid); //FIXME tk = g->first + "|0000"; // generate the element full tag if ( tagHT.count(tk) == 0) // if element 0x0000 not found @@ -978,33 +1077,30 @@ void gdcmParser::UpdateGroupLength(bool SkipSequence, FileType type) { } /** - * \ingroup gdcmParser - * \brief writes on disc according to the requested format - * (ACR-NEMA, ExplicitVR, ImplicitVR) ONE - * gdcmHeaderEntry - * @param tag pointer on the gdcmHeaderEntry to be written - * @param type type of the File to be written - * (ACR-NEMA, ExplicitVR, ImplicitVR) - * @param _fp already open file pointer + * \brief Writes in a file (according to the requested format) + * the group, the element, the value representation and the length + * of a single gdcmHeaderEntry passed as argument. + * @param tag pointer on the gdcmHeaderEntry to be written + * @param _fp already open file pointer + * @param type type of the File to be written */ -void gdcmParser::WriteEntry(gdcmHeaderEntry *tag, FILE *_fp,FileType type) +void gdcmParser::WriteEntryTagVRLength(gdcmHeaderEntry *tag, + FILE *_fp, + FileType type) { guint16 group = tag->GetGroup(); std::string vr = tag->GetVR(); - guint32 length = tag->GetLength(); guint16 el = tag->GetElement(); guint32 lgr = tag->GetReadLength(); - // === Deal with the length - // -------------------- - if(length%2==1) - { - tag->SetValue(tag->GetValue()+"\0"); - tag->SetLength(tag->GetReadLength()+1); - } + if ( (group == 0xfffe) && (el == 0x0000) ) + // Fix in order to make some MR PHILIPS images e-film readable + // see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm: + // we just *always* ignore spurious fffe|0000 tag ! + return; fwrite ( &group,(size_t)2 ,(size_t)1 ,_fp); //group - fwrite ( &el,(size_t)2 ,(size_t)1 ,_fp); //element + fwrite ( &el,(size_t)2 ,(size_t)1 ,_fp); //element if ( type == ExplicitVR ) { @@ -1014,12 +1110,6 @@ void gdcmParser::WriteEntry(gdcmHeaderEntry *tag, FILE *_fp,FileType type) // Hence we skip writing the VR and length and we pad by writing // 0xffffffff - if (el == 0x0000) - // Fix in order to make some MR PHILIPS images e-film readable - // see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm: - // we just ignore spurious fffe|0000 tag ! - return; - int ff=0xffffffff; fwrite (&ff,(size_t)4 ,(size_t)1 ,_fp); return; @@ -1046,25 +1136,28 @@ void gdcmParser::WriteEntry(gdcmHeaderEntry *tag, FILE *_fp,FileType type) { fwrite ( &lgr,(size_t)4 ,(size_t)1 ,_fp); } +} - // === Deal with the value - // ------------------- - if (vr == "SQ") return; // no "value" to write for the SEQuences - if (group == 0xfffe)return; // no "value" to write for the delimiters - - // Pixels are never loaded in the element ! - // we stop writting when Pixel are processed - // FIX : we loose trailing elements (RAB, right now) - - int compte =0; - itsTimeToWritePixels = false; - if ((group == GrPixel) && (el == NumPixel) ) { - compte++; - if (compte == countGrPixel) {// we passed *all* the GrPixel,NumPixel - itsTimeToWritePixels = true; - return; - } - } +/** + * \brief Writes in a file (according to the requested format) + * the value of a single gdcmHeaderEntry passed as argument. + * @param tag Pointer on the gdcmHeaderEntry to be written + * @param _fp Already open file pointer + * @param type type of the File to be written + */ +void gdcmParser::WriteEntryValue(gdcmHeaderEntry *tag, FILE *_fp,FileType type) +{ + (void)type; + guint16 group = tag->GetGroup(); + std::string vr = tag->GetVR(); + guint32 lgr = tag->GetReadLength(); + + if (vr == "SQ") + // SeQuences have no value: + return; + if (group == 0xfffe) + // Delimiters have no associated value: + return; void *voidArea; voidArea = tag->GetVoidArea(); @@ -1076,6 +1169,9 @@ void gdcmParser::WriteEntry(gdcmHeaderEntry *tag, FILE *_fp,FileType type) if (vr == "US" || vr == "SS") { + // some 'Short integer' fields may be mulivaluated + // each single value is separated from the next one by '\' + // we split the string and write each value as a short int std::vector tokens; tokens.erase(tokens.begin(),tokens.end()); // clean any previous value Tokenize (tag->GetValue(), tokens, "\\"); @@ -1088,7 +1184,9 @@ void gdcmParser::WriteEntry(gdcmHeaderEntry *tag, FILE *_fp,FileType type) tokens.clear(); return; } - + // some 'Integer' fields may be mulivaluated + // each single value is separated from the next one by '\' + // we split the string and write each value as an int if (vr == "UL" || vr == "SL") { std::vector tokens; @@ -1102,13 +1200,37 @@ void gdcmParser::WriteEntry(gdcmHeaderEntry *tag, FILE *_fp,FileType type) } tokens.clear(); return; - } - + } fwrite (tag->GetValue().c_str(), (size_t)lgr ,(size_t)1, _fp); // Elem value } /** - * \ingroup gdcmParser + * \brief Writes in a file (according to the requested format) + * a single gdcmHeaderEntry passed as argument. + * \sa WriteEntryValue, WriteEntryTagVRLength. + * @param tag Pointer on the gdcmHeaderEntry to be written + * @param _fp Already open file pointer + * @param type type of the File to be written + */ + +bool gdcmParser::WriteEntry(gdcmHeaderEntry *tag, FILE *_fp,FileType type) +{ + guint32 length = tag->GetLength(); + + // The value of a tag MUST (see the DICOM norm) be an odd number of + // bytes. When this is not the case, pad with an additional byte: + if(length%2==1) + { + tag->SetValue(tag->GetValue()+"\0"); + tag->SetLength(tag->GetReadLength()+1); + } + + WriteEntryTagVRLength(tag, _fp, type); + WriteEntryValue(tag, _fp, type); + return true; +} + +/** * \brief writes on disc according to the requested format * (ACR-NEMA, ExplicitVR, ImplicitVR) the image * using the Chained List @@ -1123,10 +1245,10 @@ void gdcmParser::WriteEntry(gdcmHeaderEntry *tag, FILE *_fp,FileType type) * @param _fp already open file pointer */ -void gdcmParser::WriteEntries(FILE *_fp,FileType type) +bool gdcmParser::WriteEntries(FILE *_fp,FileType type) { // TODO (?) tester les echecs en ecriture (apres chaque fwrite) - + for (ListTag::iterator tag2=listEntries.begin(); tag2 != listEntries.end(); ++tag2) @@ -1146,10 +1268,10 @@ void gdcmParser::WriteEntries(FILE *_fp,FileType type) // Ignore the documented delimiter continue; } - WriteEntry(*tag2,_fp,type); - if (itsTimeToWritePixels) - break; + if (! WriteEntry(*tag2,_fp,type) ) + return false; } + return true; } /** @@ -1185,8 +1307,7 @@ void gdcmParser::WriteEntriesDeprecated(FILE *_fp,FileType type) { // --> will be done with the next organization if ((*tag2->second).GetGroup() == 0xfffe ) continue; // ignore delimiters } - WriteEntry(tag2->second,_fp,type); - if (itsTimeToWritePixels) + if ( ! WriteEntry(tag2->second,_fp,type)) break; } } @@ -1258,7 +1379,7 @@ guint16 gdcmParser::UnswapShort(guint16 a) { * @return false if file is not ACR-NEMA / DICOM */ bool gdcmParser::ParseHeader(bool exception_on_error) throw(gdcmFormatError) { - + (void)exception_on_error; rewind(fp); if (!CheckSwap()) return false; @@ -1335,25 +1456,14 @@ void gdcmParser::LoadHeaderEntry(gdcmHeaderEntry *Entry) { guint16 group = Entry->GetGroup(); std::string vr= Entry->GetVR(); guint32 length = Entry->GetLength(); - bool SkipLoad = false; fseek(fp, (long)Entry->GetOffset(), SEEK_SET); - - // the test was commented out to 'go inside' the SeQuences - // we don't any longer skip them ! - - // if( vr == "SQ" ) // (DO NOT remove this comment) - // SkipLoad = true; // A SeQuence "contains" a set of Elements. // (fffe e000) tells us an Element is beginning // (fffe e00d) tells us an Element just ended // (fffe e0dd) tells us the current SeQuence just ended - if( group == 0xfffe ) - SkipLoad = true; - - if ( SkipLoad ) { - Entry->SetLength(0); + if( group == 0xfffe ) { Entry->SetValue("gdcm::Skipped"); return; } @@ -1376,18 +1486,16 @@ void gdcmParser::LoadHeaderEntry(gdcmHeaderEntry *Entry) { Entry->SetValue(s.str()); return; } - - // When integer(s) are expected, read and convert the following - // n *(two or four bytes) - // properly i.e. as integers as opposed to strings. - // Elements with Value Multiplicity > 1 - // contain a set of integers (not a single one) // Any compacter code suggested (?) if ( IsHeaderEntryAnInteger(Entry) ) { guint32 NewInt; std::ostringstream s; int nbInt; + // When short integer(s) are expected, read and convert the following + // n *two characters properly i.e. as short integers as opposed to strings. + // Elements with Value Multiplicity > 1 + // contain a set of integers (not a single one) if (vr == "US" || vr == "SS") { nbInt = length / 2; NewInt = ReadInt16(); @@ -1400,6 +1508,10 @@ void gdcmParser::LoadHeaderEntry(gdcmHeaderEntry *Entry) { } } } + // When integer(s) are expected, read and convert the following + // n * four characters properly i.e. as integers as opposed to strings. + // Elements with Value Multiplicity > 1 + // contain a set of integers (not a single one) else if (vr == "UL" || vr == "SL") { nbInt = length / 4; NewInt = ReadInt32(); @@ -1458,16 +1570,10 @@ void gdcmParser::AddHeaderEntry(gdcmHeaderEntry *newHeaderEntry) { */ void gdcmParser::FindHeaderEntryLength (gdcmHeaderEntry *Entry) { guint16 element = Entry->GetElement(); - guint16 group = Entry->GetGroup(); + //guint16 group = Entry->GetGroup(); //FIXME std::string vr = Entry->GetVR(); guint16 length16; - - if( (element == NumPixel) && (group == GrPixel) ) - { - dbg.SetDebug(GDCM_DEBUG); - dbg.Verbose(2, "gdcmParser::FindLength: ", - "we reached (GrPixel,NumPixel)"); - } + if ( (filetype == ExplicitVR) && (! Entry->IsImplicitVR()) ) { @@ -1591,7 +1697,7 @@ void gdcmParser::FindHeaderEntryVR( gdcmHeaderEntry *Entry) // is in explicit VR and try to fix things if it happens not to be // the case. - int lgrLue=fread (&VR, (size_t)2,(size_t)1, fp); // lgrLue not used + (void)fread (&VR, (size_t)2,(size_t)1, fp); VR[2]=0; if(!CheckHeaderEntryVR(Entry,VR)) { @@ -1697,6 +1803,13 @@ std::string gdcmParser::GetHeaderEntryValue(gdcmHeaderEntry *Entry) std::ostringstream s; int nbInt; + // When short integer(s) are expected, read and convert the following + // n * 2 bytes properly i.e. as a multivaluated strings + // (each single value is separated fromthe next one by '\' + // as usual for standard multivaluated filels + // Elements with Value Multiplicity > 1 + // contain a set of short integers (not a single one) + if (vr == "US" || vr == "SS") { guint16 NewInt16; @@ -1712,6 +1825,12 @@ std::string gdcmParser::GetHeaderEntryValue(gdcmHeaderEntry *Entry) } } + // When integer(s) are expected, read and convert the following + // n * 4 bytes properly i.e. as a multivaluated strings + // (each single value is separated fromthe next one by '\' + // as usual for standard multivaluated filels + // Elements with Value Multiplicity > 1 + // contain a set of integers (not a single one) else if (vr == "UL" || vr == "SL") { guint32 NewInt32; @@ -1809,8 +1928,7 @@ void gdcmParser::SkipHeaderEntry(gdcmHeaderEntry *entry) */ void gdcmParser::FixHeaderEntryFoundLength(gdcmHeaderEntry *Entry, guint32 FoundLength) { - Entry->SetReadLength(FoundLength); // will be updated only if a bug is found - + Entry->SetReadLength(FoundLength); // will be updated only if a bug is found if ( FoundLength == 0xffffffff) { FoundLength = 0; } @@ -1826,7 +1944,7 @@ void gdcmParser::FixHeaderEntryFoundLength(gdcmHeaderEntry *Entry, guint32 Found } // Sorry for the patch! - // XMedCom did the trick to read some nasty GE images ... + // XMedCom did the trick to read some naughty GE images ... if (FoundLength == 13) { // The following 'if' will be removed when there is no more // images on Creatis HDs with a 13 length for Manufacturer... @@ -1854,15 +1972,16 @@ void gdcmParser::FixHeaderEntryFoundLength(gdcmHeaderEntry *Entry, guint32 Found FoundLength =0; // ReadLength is unchanged } - // a SeQuence Element is beginning - // fffe|e000 is just a marker, its length *should be* zero + // we found a 'delimiter' element + // fffe|xxxx is just a marker, we don't take its length into account else if(Entry->GetGroup() == 0xfffe) - { + { // *normally, fffe|0000 doesn't exist ! if( Entry->GetElement() != 0x0000 ) // gdcm-MR-PHILIPS-16-Multi-Seq.dcm - // causes extra troubles :-( - FoundLength =0; - } + // causes extra troubles :-( + FoundLength =0; + } + Entry->SetUsableLength(FoundLength); }