X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmParser.cxx;h=7f6384f85edb59a4aa795a984ceface39f445775;hb=8402492c91eb411888fb7e220e0f02b3d94c59db;hp=384aa6e045beb73fd36eafe99c6ad616f2a64896;hpb=41cc62fb86c116bd195581980c27480c213c958b;p=gdcm.git diff --git a/src/gdcmParser.cxx b/src/gdcmParser.cxx index 384aa6e0..7f6384f8 100644 --- a/src/gdcmParser.cxx +++ b/src/gdcmParser.cxx @@ -24,13 +24,57 @@ #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" + // Fourth semantics: + // + // ---> Warning : This fourth field is NOT part + // of the 'official' Dicom Dictionnary + // and should NOT be used. + // (Not defined for all the groups + // may be removed in a future release) + // + // CMD Command + // META Meta Information + // DIR Directory + // ID + // PAT Patient + // ACQ Acquisition + // REL Related + // IMG Image + // SDY Study + // VIS Visit + // WAV Waveform + // PRC + // DEV Device + // NMI Nuclear Medicine + // MED + // BFS Basic Film Session + // BFB Basic Film Box + // BIB Basic Image Box + // BAB + // IOB + // PJ + // PRINTER + // RT Radio Therapy + // DVH + // SSET + // RES Results + // CRV Curve + // OLY Overlays + // PXL Pixels + // DL Delimiters + // + //----------------------------------------------------------------------------- // Refer to gdcmParser::CheckSwap() const unsigned int gdcmParser::HEADER_LENGTH_TO_READ = 256; -// Refer to gdcmParser::SetMaxSizeLoadElementValue() +// 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; + //----------------------------------------------------------------------------- // Constructor / Destructor /** @@ -41,15 +85,18 @@ const unsigned int gdcmParser::MAX_SIZE_LOAD_ELEMENT_VALUE = 4096; * @param enable_sequences = true to allow the header * to be parsed *inside* the SeQuences, * when they have an actual length - *\TODO may be we need one more bool, - * to allow skipping the private elements while parsing the header - * in order to save space + * @param ignore_shadow to allow skipping the shadow elements, + * to save memory space. + * \warning The TRUE value for this param has to be used + * with a FALSE value for the 'enable_sequence' param. + * ('public elements' may be embedded in 'shadow Sequences') */ gdcmParser::gdcmParser(const char *InFilename, bool exception_on_error, - bool enable_sequences ) -{ + bool enable_sequences, + bool ignore_shadow) { enableSequences=enable_sequences; + ignoreShadow =ignore_shadow; SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); filename = InFilename; @@ -57,12 +104,13 @@ gdcmParser::gdcmParser(const char *InFilename, if ( !OpenFile(exception_on_error)) return; - Parse(); - LoadHeaderEntries(); + if (ParseHeader()) { + LoadHeaderEntries(); + } CloseFile(); wasUpdated = 0; // will be set to 1 if user adds an entry - printLevel = 1; // 'Heavy' header print by default + printLevel = 1; // 'Medium' print level by default } /** @@ -70,23 +118,21 @@ gdcmParser::gdcmParser(const char *InFilename, * \brief * @param exception_on_error */ -gdcmParser::gdcmParser(bool exception_on_error) -{ +gdcmParser::gdcmParser(bool exception_on_error) { enableSequences=0; SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); Initialise(); wasUpdated = 0; // will be set to 1 if user adds an entry - printLevel = 1; // 'Heavy' header print by default + printLevel = 1; // 'Medium' print level by default } /** * \ingroup gdcmParser * \brief Canonical destructor. */ -gdcmParser::~gdcmParser (void) -{ +gdcmParser::~gdcmParser (void) { RefPubDict = NULL; RefShaDict = NULL; } @@ -99,11 +145,9 @@ gdcmParser::~gdcmParser (void) * both from the H Table and the chained list * @return */ -void gdcmParser::PrintEntry(std::ostream & os) -{ +void gdcmParser::PrintEntry(std::ostream & os) { std::ostringstream s; - s << "------------ using listEntries ----------------" << std::endl; for (ListTag::iterator i = listEntries.begin(); i != listEntries.end(); ++i) @@ -119,8 +163,7 @@ void gdcmParser::PrintEntry(std::ostream & os) * \brief Prints The Dict Entries of THE public Dicom Dictionnry * @return */ -void gdcmParser::PrintPubDict(std::ostream & os) -{ +void gdcmParser::PrintPubDict(std::ostream & os) { RefPubDict->Print(os); } @@ -129,8 +172,7 @@ void gdcmParser::PrintPubDict(std::ostream & os) * \brief Prints The Dict Entries of THE shadow Dicom Dictionnry * @return */ -void gdcmParser::PrintShaDict(std::ostream & os) -{ +void gdcmParser::PrintShaDict(std::ostream & os) { RefShaDict->Print(os); } @@ -140,8 +182,7 @@ void gdcmParser::PrintShaDict(std::ostream & os) * \ingroup gdcmParser * \brief Get the public dictionary used */ -gdcmDict *gdcmParser::GetPubDict(void) -{ +gdcmDict *gdcmParser::GetPubDict(void) { return(RefPubDict); } @@ -149,8 +190,7 @@ gdcmDict *gdcmParser::GetPubDict(void) * \ingroup gdcmParser * \brief Get the shadow dictionary used */ -gdcmDict *gdcmParser::GetShaDict(void) -{ +gdcmDict *gdcmParser::GetShaDict(void) { return(RefShaDict); } @@ -159,8 +199,7 @@ gdcmDict *gdcmParser::GetShaDict(void) * \brief Set the shadow dictionary used * \param dict dictionary to use in shadow */ -bool gdcmParser::SetShaDict(gdcmDict *dict) -{ +bool gdcmParser::SetShaDict(gdcmDict *dict){ RefShaDict=dict; return(!RefShaDict); } @@ -170,8 +209,7 @@ bool gdcmParser::SetShaDict(gdcmDict *dict) * \brief Set the shadow dictionary used * \param dictName name of the dictionary to use in shadow */ -bool gdcmParser::SetShaDict(DictKey dictName) -{ +bool gdcmParser::SetShaDict(DictKey dictName){ RefShaDict=gdcmGlobal::GetDicts()->GetDict(dictName); return(!RefShaDict); } @@ -185,21 +223,15 @@ bool gdcmParser::SetShaDict(DictKey dictName) * @return true when gdcmParser is the one of a reasonable Dicom/Acr file, * false otherwise. */ -bool gdcmParser::IsReadable(void) -{ - std::string res = GetEntryByNumber(0x0028, 0x0005); - if ( res != GDCM_UNFOUND && atoi(res.c_str()) > 4 ) - return false; // Image Dimensions - - if ( !GetHeaderEntryByNumber(0x0028, 0x0100) ) - return false; // "Bits Allocated" - if ( !GetHeaderEntryByNumber(0x0028, 0x0101) ) - return false; // "Bits Stored" - if ( !GetHeaderEntryByNumber(0x0028, 0x0102) ) - return false; // "High Bit" - if ( !GetHeaderEntryByNumber(0x0028, 0x0103) ) - return false; // "Pixel Representation" - return true; +bool gdcmParser::IsReadable(void) { + if(filetype==Unknown) { + return(false); + } + if(listEntries.size()<=0) { + return(false); + } + + return(true); } /** @@ -209,8 +241,7 @@ bool gdcmParser::IsReadable(void) * * @return True when ImplicitVRLittleEndian found. False in all other cases. */ -bool gdcmParser::IsImplicitVRLittleEndianTransferSyntax(void) -{ +bool gdcmParser::IsImplicitVRLittleEndianTransferSyntax(void) { gdcmHeaderEntry *Element = GetHeaderEntryByNumber(0x0002, 0x0010); if ( !Element ) return false; @@ -229,8 +260,7 @@ bool gdcmParser::IsImplicitVRLittleEndianTransferSyntax(void) * * @return True when ExplicitVRLittleEndian found. False in all other cases. */ -bool gdcmParser::IsExplicitVRLittleEndianTransferSyntax(void) -{ +bool gdcmParser::IsExplicitVRLittleEndianTransferSyntax(void) { gdcmHeaderEntry* Element = GetHeaderEntryByNumber(0x0002, 0x0010); if ( !Element ) return false; @@ -249,8 +279,7 @@ bool gdcmParser::IsExplicitVRLittleEndianTransferSyntax(void) * * @return True when DeflatedExplicitVRLittleEndian found. False in all other cases. */ -bool gdcmParser::IsDeflatedExplicitVRLittleEndianTransferSyntax(void) -{ +bool gdcmParser::IsDeflatedExplicitVRLittleEndianTransferSyntax(void) { gdcmHeaderEntry* Element = GetHeaderEntryByNumber(0x0002, 0x0010); if ( !Element ) return false; @@ -269,8 +298,7 @@ bool gdcmParser::IsDeflatedExplicitVRLittleEndianTransferSyntax(void) * * @return True when big endian found. False in all other cases. */ -bool gdcmParser::IsExplicitVRBigEndianTransferSyntax(void) -{ +bool gdcmParser::IsExplicitVRBigEndianTransferSyntax(void) { gdcmHeaderEntry* Element = GetHeaderEntryByNumber(0x0002, 0x0010); if ( !Element ) return false; @@ -325,10 +353,10 @@ FILE *gdcmParser::OpenFile(bool exception_on_error) return(fp); fclose(fp); - dbg.Verbose(0, "gdcmParser::gdcmParser not DICOM/ACR", filename.c_str()); + dbg.Verbose(0, "gdcmParser::OpenFile not DICOM/ACR", filename.c_str()); } else { - dbg.Verbose(0, "gdcmParser::gdcmParser cannot open file", filename.c_str()); + dbg.Verbose(0, "gdcmParser::OpenFile cannot open file", filename.c_str()); } return(NULL); } @@ -338,8 +366,7 @@ FILE *gdcmParser::OpenFile(bool exception_on_error) * \brief closes the file * @return TRUE if the close was successfull */ -bool gdcmParser::CloseFile(void) -{ +bool gdcmParser::CloseFile(void) { int closed = fclose(fp); fp = (FILE *)0; if (! closed) @@ -355,10 +382,9 @@ bool gdcmParser::CloseFile(void) * (ACR-NEMA, ExplicitVR, ImplicitVR) * @return always "True" ?! */ -bool gdcmParser::Write(FILE *fp, FileType type) -{ +bool gdcmParser::Write(FILE *fp, FileType type) { // ============== -// TODO The stuff has been rewritten using the chained list instead +// 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 @@ -400,13 +426,15 @@ bool gdcmParser::Write(FILE *fp, FileType type) SetEntryLengthByNumber(20, 0x0002, 0x0010); } +/* TODO : rewrite later if ( (type == ImplicitVR) || (type == ExplicitVR) ) UpdateGroupLength(false,type); if ( type == ACR) UpdateGroupLength(true,ACR); +*/ - WriteEntries(type, fp); + WriteEntries(fp,type); return(true); } @@ -420,8 +448,8 @@ bool gdcmParser::Write(FILE *fp, FileType type) * \return boolean */ bool gdcmParser::ReplaceOrCreateByNumber(std::string Value, - guint16 Group, guint16 Elem ) -{ + guint16 Group, + guint16 Elem ){ if (CheckIfEntryExistByNumber(Group, Elem) == 0) { gdcmHeaderEntry *a =NewHeaderEntryByNumber(Group, Elem); if (a == NULL) @@ -442,8 +470,7 @@ bool gdcmParser::ReplaceOrCreateByNumber(std::string Value, * \return boolean * */ -bool gdcmParser::ReplaceOrCreateByNumber(char* Value, guint16 Group, guint16 Elem ) -{ +bool gdcmParser::ReplaceOrCreateByNumber(char* Value, guint16 Group, guint16 Elem ) { gdcmHeaderEntry* nvHeaderEntry=NewHeaderEntryByNumber(Group, Elem); if(!nvHeaderEntry) @@ -482,8 +509,7 @@ bool gdcmParser::ReplaceIfExistByNumber(char* Value, guint16 Group, guint16 Elem * @param element Element number of the searched Dicom Element * @return number of occurences */ -int gdcmParser::CheckIfEntryExistByNumber(guint16 group, guint16 element ) -{ +int gdcmParser::CheckIfEntryExistByNumber(guint16 group, guint16 element ) { std::string key = gdcmDictEntry::TranslateToKey(group, element ); return (tagHT.count(key)); } @@ -498,8 +524,7 @@ int gdcmParser::CheckIfEntryExistByNumber(guint16 group, guint16 element ) * @return Corresponding element value when it exists, * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. */ -std::string gdcmParser::GetEntryByName(std::string tagName) -{ +std::string gdcmParser::GetEntryByName(std::string tagName) { gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); if( dictEntry == NULL) return GDCM_UNFOUND; @@ -521,8 +546,7 @@ std::string gdcmParser::GetEntryByName(std::string tagName) * @return Corresponding element value representation when it exists, * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. */ -std::string gdcmParser::GetEntryVRByName(std::string tagName) -{ +std::string gdcmParser::GetEntryVRByName(std::string tagName) { gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); if( dictEntry == NULL) return GDCM_UNFOUND; @@ -542,8 +566,7 @@ std::string gdcmParser::GetEntryVRByName(std::string tagName) * @return Corresponding element value representation when it exists, * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. */ -std::string gdcmParser::GetEntryByNumber(guint16 group, guint16 element) -{ +std::string gdcmParser::GetEntryByNumber(guint16 group, guint16 element){ TagKey key = gdcmDictEntry::TranslateToKey(group, element); if ( ! tagHT.count(key)) return GDCM_UNFOUND; @@ -565,8 +588,7 @@ std::string gdcmParser::GetEntryByNumber(guint16 group, guint16 element) * @return Corresponding element value representation when it exists, * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise. */ -std::string gdcmParser::GetEntryVRByNumber(guint16 group, guint16 element) -{ +std::string gdcmParser::GetEntryVRByNumber(guint16 group, guint16 element) { gdcmHeaderEntry* elem = GetHeaderEntryByNumber(group, element); if ( !elem ) return GDCM_UNFOUND; @@ -580,8 +602,7 @@ std::string gdcmParser::GetEntryVRByNumber(guint16 group, guint16 element) * @param tagName name of the searched Dicom Element. * @return true when found */ -bool gdcmParser::SetEntryByName(std::string content,std::string tagName) -{ +bool gdcmParser::SetEntryByName(std::string content,std::string tagName) { gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); if( dictEntry == NULL) return false; @@ -614,7 +635,6 @@ bool gdcmParser::SetEntryByNumber(std::string content, content = content + '\0'; } - //tagHT[key]->SetValue(content); gdcmHeaderEntry * a; IterHT p; TagHeaderEntryHT::iterator p2; @@ -628,7 +648,6 @@ bool gdcmParser::SetEntryByNumber(std::string content, a-> SetValue(content); - //std::string vr = tagHT[key]->GetVR(); std::string vr = a->GetVR(); guint32 lgr; @@ -639,7 +658,6 @@ bool gdcmParser::SetEntryByNumber(std::string content, else lgr = l; - //tagHT[key]->SetLength(lgr); a->SetLength(lgr); return true; } @@ -658,13 +676,13 @@ bool gdcmParser::SetEntryByNumber(std::string content, */ bool gdcmParser::SetEntryLengthByNumber(guint32 length, - guint16 group, guint16 element) + guint16 group, + guint16 element) { TagKey key = gdcmDictEntry::TranslateToKey(group, element); if ( ! tagHT.count(key)) return false; if (length%2) length++; // length must be even - //tagHT[key]->SetLength(length); ( ((tagHT.equal_range(key)).first)->second )->SetLength(length); return true ; @@ -714,6 +732,8 @@ void * gdcmParser::GetEntryVoidAreaByNumber(guint16 Group, guint16 Elem) * \ingroup gdcmParser * \brief Loads (from disk) the element content * when a string is not suitable + * @param Group + * @param Elem */ void *gdcmParser::LoadEntryVoidArea(guint16 Group, guint16 Elem) { @@ -735,6 +755,7 @@ void *gdcmParser::LoadEntryVoidArea(guint16 Group, guint16 Elem) free(a); return NULL; } + return a; } @@ -746,12 +767,13 @@ void *gdcmParser::LoadEntryVoidArea(guint16 Group, guint16 Elem) * @param element Element number of the searched Dicom Element * @return */ -bool gdcmParser::SetEntryVoidAreaByNumber(void * area,guint16 group, guint16 element) +bool gdcmParser::SetEntryVoidAreaByNumber(void * area, + guint16 group, + guint16 element) { TagKey key = gdcmDictEntry::TranslateToKey(group, element); if ( ! tagHT.count(key)) return false; - //tagHT[key]->SetVoidArea(area); ( ((tagHT.equal_range(key)).first)->second )->SetVoidArea(area); return true; } @@ -761,8 +783,7 @@ bool gdcmParser::SetEntryVoidAreaByNumber(void * area,guint16 group, guint16 ele * \brief Update the entries with the shadow dictionary. Only odd entries are * analized */ -void gdcmParser::UpdateShaEntries(void) -{ +void gdcmParser::UpdateShaEntries(void) { gdcmDictEntry *entry; std::string vr; @@ -786,8 +807,7 @@ void gdcmParser::UpdateShaEntries(void) vr=(*it)->GetVR(); (*it)->SetValue(GetHeaderEntryUnvalue(*it)); - if(entry) - { + if(entry){ // Set the new entry and the new value (*it)->SetDictEntry(entry); CheckHeaderEntryVR(*it,vr); @@ -810,8 +830,7 @@ void gdcmParser::UpdateShaEntries(void) * @return Corresponding Dicom Element when it exists, and NULL * otherwise. */ - gdcmHeaderEntry *gdcmParser::GetHeaderEntryByName(std::string tagName) - { + gdcmHeaderEntry *gdcmParser::GetHeaderEntryByName(std::string tagName) { gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); if( dictEntry == NULL) return NULL; @@ -838,6 +857,19 @@ gdcmHeaderEntry* gdcmParser::GetHeaderEntryByNumber(guint16 group, guint16 eleme return tagHT.find(key)->second; } +/** + * \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. + * @return a range (i.e.pair<,>) containing all elements whose key is group|element) + */ + +IterHT gdcmParser::GetHeaderEntrySameNumber(guint16 group, guint16 element){ + TagKey key = gdcmDictEntry::TranslateToKey(group, element); + return (tagHT.equal_range(key)); +} + /** * \ingroup gdcmParser * \brief Loads the element while preserving the current @@ -846,8 +878,7 @@ gdcmHeaderEntry* gdcmParser::GetHeaderEntryByNumber(guint16 group, guint16 eleme * @param entry Header Entry whose value shall be loaded. * @return */ -void gdcmParser::LoadHeaderEntrySafe(gdcmHeaderEntry * entry) -{ +void gdcmParser::LoadHeaderEntrySafe(gdcmHeaderEntry * entry) { long PositionOnEntry = ftell(fp); LoadHeaderEntry(entry); fseek(fp, PositionOnEntry, SEEK_SET); @@ -862,8 +893,7 @@ void gdcmParser::LoadHeaderEntrySafe(gdcmHeaderEntry * entry) * @param SkipSequence TRUE if we don't want to write Sequences (ACR-NEMA Files) * @param type Type of the File (ExplicitVR,ImplicitVR, ACR, ...) */ -void gdcmParser::UpdateGroupLength(bool SkipSequence, FileType type) -{ +void gdcmParser::UpdateGroupLength(bool SkipSequence, FileType type) { guint16 gr, el; std::string vr; @@ -968,11 +998,13 @@ void gdcmParser::UpdateGroupLength(bool SkipSequence, FileType type) * \ warning does NOT add the missing elements in the header : * \ it's up to the user doing it ! * \ (function CheckHeaderCoherence to be written) + * \ warning DON'T try, right now, to write a DICOM image + * \ from an ACR Header (meta elements will be missing!) * @param type type of the File to be written * (ACR-NEMA, ExplicitVR, ImplicitVR) * @param _fp already open file pointer */ -void gdcmParser::WriteEntries(FileType type, FILE * _fp) +void gdcmParser::WriteEntries(FILE *_fp,FileType type) { guint16 gr, el; guint32 lgr; @@ -980,27 +1012,32 @@ void gdcmParser::WriteEntries(FileType type, FILE * _fp) std::string vr; guint32 val_uint32; guint16 val_uint16; - + guint16 valZero =0; + void *voidArea; std::vector tokens; + // TODO : function CheckHeaderCoherence to be written + // uses now listEntries to iterate, not TagHt! // // pb : gdcmParser.Add does NOT update listEntries // TODO : find a trick (in STL?) to do it, at low cost ! void *ptr; - + // TODO (?) tester les echecs en ecriture (apres chaque fwrite) - + int compte =0; + for (ListTag::iterator tag2=listEntries.begin(); tag2 != listEntries.end(); ++tag2) { gr = (*tag2)->GetGroup(); el = (*tag2)->GetElement(); - lgr = (*tag2)->GetLength(); + lgr = (*tag2)->GetReadLength(); val = (*tag2)->GetValue().c_str(); vr = (*tag2)->GetVR(); + voidArea = (*tag2)->GetVoidArea(); if ( type == ACR ) { @@ -1014,30 +1051,55 @@ void gdcmParser::WriteEntries(FileType type, FILE * _fp) fwrite ( &gr,(size_t)2 ,(size_t)1 ,_fp); //group fwrite ( &el,(size_t)2 ,(size_t)1 ,_fp); //element - - if ( (type == ExplicitVR) && (gr <= 0x0002) ) + + // === Deal with the length + // -------------------- + + // if ( (type == ExplicitVR) && (gr <= 0x0002) ) // ?!? < 2 + if ( (type == ExplicitVR) || (type == DICOMDIR) ) { // EXPLICIT VR guint16 z=0, shortLgr; - fwrite (vr.c_str(),(size_t)2 ,(size_t)1 ,_fp); - - if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) - { - fwrite ( &z, (size_t)2 ,(size_t)1 ,_fp); - fwrite ( &lgr,(size_t)4 ,(size_t)1 ,_fp); - - } - else - { + if (vr == "unkn") { // Unknown was 'written' shortLgr=lgr; fwrite ( &shortLgr,(size_t)2 ,(size_t)1 ,_fp); - } + fwrite ( &z, (size_t)2 ,(size_t)1 ,_fp); + } else { + if (gr != 0xfffe) { // NO value for 'delimiters' + if (vr == "unkn") // Unknown was 'written' + fwrite(&z,(size_t)2 ,(size_t)1 ,_fp); + else + fwrite (vr.c_str(),(size_t)2 ,(size_t)1 ,_fp); + } + + if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || gr == 0xfffe) + { + if (gr != 0xfffe) + fwrite ( &z, (size_t)2 ,(size_t)1 ,_fp); + fwrite ( &lgr,(size_t)4 ,(size_t)1 ,_fp); + } + else + { + shortLgr=lgr; + fwrite ( &shortLgr,(size_t)2 ,(size_t)1 ,_fp); + } + } } - else // IMPLICIT VR + else // IMPLICIT VR { fwrite ( &lgr,(size_t)4 ,(size_t)1 ,_fp); } - + + // === Deal with the value + // ------------------- + if (vr == "SQ") continue; // no "value" to write for the SEQuences + if (gr == 0xfffe)continue; + + if (voidArea != NULL) { // there is a 'non string' LUT, overlay, etc + fwrite ( voidArea,(size_t)lgr ,(size_t)1 ,_fp); // Elem value + continue; + } + if (vr == "US" || vr == "SS") { tokens.erase(tokens.begin(),tokens.end()); // clean any previous value @@ -1063,11 +1125,17 @@ void gdcmParser::WriteEntries(FileType type, FILE * _fp) } tokens.clear(); continue; - } + } + // Pixels are never loaded in the element ! - if ((gr == 0x7fe0) && (el == 0x0010) ) - break; - + // we stop writting when Pixel are processed + // FIX : we loose trailing elements (RAB, right now) + + if ((gr == GrPixel) && (el == NumPixel) ) { + compte++; + if (compte == countGrPixel) // we passed *all* the GrPixel,NumPixel + break; + } fwrite ( val,(size_t)lgr ,(size_t)1 ,_fp); // Elem value } } @@ -1078,10 +1146,8 @@ void gdcmParser::WriteEntries(FileType type, FILE * _fp) * processor order. * @return The properly swaped 32 bits integer. */ -guint32 gdcmParser::SwapLong(guint32 a) -{ - switch (sw) - { +guint32 gdcmParser::SwapLong(guint32 a) { + switch (sw) { case 0 : break; case 4321 : @@ -1109,8 +1175,7 @@ guint32 gdcmParser::SwapLong(guint32 a) * processor order. * @return The properly unswaped 32 bits integer. */ -guint32 gdcmParser::UnswapLong(guint32 a) -{ +guint32 gdcmParser::UnswapLong(guint32 a) { return (SwapLong(a)); } @@ -1119,8 +1184,7 @@ guint32 gdcmParser::UnswapLong(guint32 a) * \brief Swaps the bytes so they agree with the processor order * @return The properly swaped 16 bits integer. */ -guint16 gdcmParser::SwapShort(guint16 a) -{ +guint16 gdcmParser::SwapShort(guint16 a) { if ( (sw==4321) || (sw==2143) ) a =(((a<<8) & 0x0ff00) | ((a>>8)&0x00ff)); return (a); @@ -1131,8 +1195,7 @@ guint16 gdcmParser::SwapShort(guint16 a) * \brief Unswaps the bytes so they agree with the processor order * @return The properly unswaped 16 bits integer. */ -guint16 gdcmParser::UnswapShort(guint16 a) -{ +guint16 gdcmParser::UnswapShort(guint16 a) { return (SwapShort(a)); } @@ -1141,18 +1204,22 @@ guint16 gdcmParser::UnswapShort(guint16 a) /** * \ingroup gdcmParser * \brief Parses the header of the file but WITHOUT loading element values. + * @return false if file is not ACR-NEMA / DICOM */ -void gdcmParser::Parse(bool exception_on_error) throw(gdcmFormatError) -{ - gdcmHeaderEntry *newHeaderEntry = (gdcmHeaderEntry *)0; +bool gdcmParser::ParseHeader(bool exception_on_error) throw(gdcmFormatError) { rewind(fp); - CheckSwap(); - while ( (newHeaderEntry = ReadNextHeaderEntry()) ) - { - SkipHeaderEntry(newHeaderEntry); - AddHeaderEntry(newHeaderEntry); + if (!CheckSwap()) + return false; + + gdcmHeaderEntry *newHeaderEntry = (gdcmHeaderEntry *)0; + while ( (newHeaderEntry = ReadNextHeaderEntry()) ) { + SkipHeaderEntry(newHeaderEntry); + if ( (ignoreShadow==0) || (newHeaderEntry->GetGroup()%2) == 0) { + AddHeaderEntry(newHeaderEntry); + } } + return true; } /** @@ -1160,8 +1227,7 @@ void gdcmParser::Parse(bool exception_on_error) throw(gdcmFormatError) * \brief Loads the element values of all the Header Entries pointed in the * public Chained List. */ -void gdcmParser::LoadHeaderEntries(void) -{ +void gdcmParser::LoadHeaderEntries(void) { rewind(fp); for (ListTag::iterator i = GetListEntry().begin(); i != GetListEntry().end(); @@ -1174,8 +1240,7 @@ void gdcmParser::LoadHeaderEntries(void) // Load 'non string' values std::string PhotometricInterpretation = GetEntryByNumber(0x0028,0x0004); - if( PhotometricInterpretation == "PALETTE COLOR " ) - { + if( PhotometricInterpretation == "PALETTE COLOR " ) { LoadEntryVoidArea(0x0028,0x1200); // gray LUT LoadEntryVoidArea(0x0028,0x1201); // R LUT LoadEntryVoidArea(0x0028,0x1202); // G LUT @@ -1184,8 +1249,10 @@ void gdcmParser::LoadHeaderEntries(void) LoadEntryVoidArea(0x0028,0x1221); // Segmented Red Palette Color LUT Data LoadEntryVoidArea(0x0028,0x1222); // Segmented Green Palette Color LUT Data LoadEntryVoidArea(0x0028,0x1223); // Segmented Blue Palette Color LUT Data - } - + } + //FIXME : how to use it? + LoadEntryVoidArea(0x0028,0x3006); //LUT Data (CTX dependent) + // -------------------------------------------------------------- // Special Patch to allow gdcm to read ACR-LibIDO formated images // @@ -1208,13 +1275,11 @@ void gdcmParser::LoadHeaderEntries(void) /** * \ingroup gdcmParser - * \brief Loads the element content if it's length is not bigger - * than the value specified with - * gdcmParser::SetMaxSizeLoadEntry() + * \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 */ -void gdcmParser::LoadHeaderEntry(gdcmHeaderEntry *Entry) -{ +void gdcmParser::LoadHeaderEntry(gdcmHeaderEntry *Entry) { size_t item_read; guint16 group = Entry->GetGroup(); std::string vr= Entry->GetVR(); @@ -1236,16 +1301,14 @@ void gdcmParser::LoadHeaderEntry(gdcmHeaderEntry *Entry) if( group == 0xfffe ) SkipLoad = true; - if ( SkipLoad ) - { + if ( SkipLoad ) { Entry->SetLength(0); Entry->SetValue("gdcm::Skipped"); return; } // When the length is zero things are easy: - if ( length == 0 ) - { + if ( length == 0 ) { Entry->SetValue(""); return; } @@ -1253,8 +1316,7 @@ void gdcmParser::LoadHeaderEntry(gdcmHeaderEntry *Entry) // The elements whose length is bigger than the specified upper bound // are not loaded. Instead we leave a short notice of the offset of // the element content and it's length. - if (length > MaxSizeLoadEntry) - { + if (length > MaxSizeLoadEntry) { std::ostringstream s; s << "gdcm::NotLoaded."; s << " Address:" << (long)Entry->GetOffset(); @@ -1266,41 +1328,33 @@ void gdcmParser::LoadHeaderEntry(gdcmHeaderEntry *Entry) // When integer(s) are expected, read and convert the following // n *(two or four bytes) - // properly i.e. as integers as opposed to a strings. + // 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) ) - { + if ( IsHeaderEntryAnInteger(Entry) ) { guint32 NewInt; std::ostringstream s; int nbInt; - if (vr == "US" || vr == "SS") - { + if (vr == "US" || vr == "SS") { nbInt = length / 2; NewInt = ReadInt16(); s << NewInt; - if (nbInt > 1) - { - for (int i=1; i < nbInt; i++) - { + if (nbInt > 1){ + for (int i=1; i < nbInt; i++) { s << '\\'; NewInt = ReadInt16(); s << NewInt; } - } - + } } - else if (vr == "UL" || vr == "SL") - { + else if (vr == "UL" || vr == "SL") { nbInt = length / 4; NewInt = ReadInt32(); s << NewInt; - if (nbInt > 1) - { - for (int i=1; i < nbInt; i++) - { + if (nbInt > 1) { + for (int i=1; i < nbInt; i++) { s << '\\'; NewInt = ReadInt32(); s << NewInt; @@ -1310,6 +1364,7 @@ void gdcmParser::LoadHeaderEntry(gdcmHeaderEntry *Entry) #ifdef GDCM_NO_ANSI_STRING_STREAM s << std::ends; // to avoid oddities on Solaris #endif //GDCM_NO_ANSI_STRING_STREAM + Entry->SetValue(s.str()); return; } @@ -1317,15 +1372,14 @@ void gdcmParser::LoadHeaderEntry(gdcmHeaderEntry *Entry) // We need an additional byte for storing \0 that is not on disk std::string NewValue(length,0); item_read = fread(&(NewValue[0]), (size_t)length, (size_t)1, fp); - if ( item_read != 1 ) - { + if ( item_read != 1 ) { dbg.Verbose(1, "gdcmParser::LoadElementValue","unread element value"); Entry->SetValue("gdcm::UnRead"); return; } if( (vr == "UI") ) // Because of correspondance with the VR dic - Entry->SetValue(NewValue.c_str()); + Entry->SetValue(NewValue.c_str()); // ??? JPR ??? else Entry->SetValue(NewValue); } @@ -1335,12 +1389,11 @@ void gdcmParser::LoadHeaderEntry(gdcmHeaderEntry *Entry) * \brief add a new Dicom Element pointer to * the H Table and to the chained List * \warning push_bash in listEntries ONLY during ParseHeader - * \todo something to allow further Elements addition, + * \TODO something to allow further Elements addition, * \ when position to be taken care of * @param newHeaderEntry */ -void gdcmParser::AddHeaderEntry(gdcmHeaderEntry *newHeaderEntry) -{ +void gdcmParser::AddHeaderEntry(gdcmHeaderEntry *newHeaderEntry) { tagHT.insert( PairHT( newHeaderEntry->GetKey(),newHeaderEntry) ); listEntries.push_back(newHeaderEntry); wasUpdated = 1; @@ -1353,17 +1406,16 @@ void gdcmParser::AddHeaderEntry(gdcmHeaderEntry *newHeaderEntry) * @return */ - void gdcmParser::FindHeaderEntryLength (gdcmHeaderEntry *Entry) - { + void gdcmParser::FindHeaderEntryLength (gdcmHeaderEntry *Entry) { guint16 element = Entry->GetElement(); guint16 group = Entry->GetGroup(); std::string vr = Entry->GetVR(); guint16 length16; - if( (element == 0x0010) && (group == 0x7fe0) ) + if( (element == NumPixel) && (group == GrPixel) ) { dbg.SetDebug(-1); dbg.Verbose(2, "gdcmParser::FindLength: ", - "we reached 7fe0 0010"); + "we reached (GrPixel,NumPixel)"); } if ( (filetype == ExplicitVR) && (! Entry->IsImplicitVR()) ) @@ -1478,7 +1530,6 @@ void gdcmParser::FindHeaderEntryVR( gdcmHeaderEntry *Entry) return; char VR[3]; - int lgrLue; long PositionOnEntry = ftell(fp); // Warning: we believe this is explicit VR (Value Representation) because @@ -1489,7 +1540,7 @@ void gdcmParser::FindHeaderEntryVR( gdcmHeaderEntry *Entry) // is in explicit VR and try to fix things if it happens not to be // the case. - lgrLue=fread (&VR, (size_t)2,(size_t)1, fp); + int lgrLue=fread (&VR, (size_t)2,(size_t)1, fp); // lgrLue not used VR[2]=0; if(!CheckHeaderEntryVR(Entry,VR)) { @@ -1544,14 +1595,23 @@ bool gdcmParser::CheckHeaderEntryVR(gdcmHeaderEntry *Entry, VRKey vr) sprintf(msg,"Falsely explicit vr file (%04x,%04x)\n", Entry->GetGroup(),Entry->GetElement()); dbg.Verbose(1, "gdcmParser::FindVR: ",msg); - + if (Entry->GetGroup()%2 && Entry->GetElement() == 0x0000) { // Group length is UL ! + gdcmDictEntry* NewEntry = NewVirtualDictEntry( + Entry->GetGroup(),Entry->GetElement(), + "UL","FIXME","Group Length"); + Entry->SetDictEntry(NewEntry); + } return(false); } if ( Entry->IsVRUnknown() ) { // When not a dictionary entry, we can safely overwrite the VR. - Entry->SetVR(vr); + if (Entry->GetElement() == 0x0000) { // Group length is UL ! + Entry->SetVR("UL"); + } else { + Entry->SetVR(vr); + } } else if ( Entry->GetVR() != vr ) { @@ -1616,7 +1676,6 @@ std::string gdcmParser::GetHeaderEntryValue(gdcmHeaderEntry *Entry) s << NewInt32; } } - #ifdef GDCM_NO_ANSI_STRING_STREAM s << std::ends; // to avoid oddities on Solaris #endif //GDCM_NO_ANSI_STRING_STREAM @@ -1701,19 +1760,25 @@ void gdcmParser::FixHeaderEntryFoundLength(gdcmHeaderEntry *Entry, guint32 Found { Entry->SetReadLength(FoundLength); // will be updated only if a bug is found - if ( FoundLength == 0xffffffff) - { + if ( FoundLength == 0xffffffff) { FoundLength = 0; } + + guint16 gr =Entry->GetGroup(); + guint16 el =Entry->GetElement(); + + if (FoundLength%2) { + std::cout << "Warning : Tag with uneven length " << FoundLength + << " in x(" << std::hex << gr << "," << el <<")" << std::endl; + } // Sorry for the patch! // XMedCom did the trick to read some nasty GE images ... - else if (FoundLength == 13) - { + if (FoundLength == 13) { // The following 'if' will be removed when there is no more // images on Creatis HDs with a 13 length for Manufacturer... if ( (Entry->GetGroup() != 0x0008) || - ( (Entry->GetElement() != 0x0070) && (Entry->GetElement() != 0x0080) ) ) { + ( (Entry->GetElement() != 0x0070) && (Entry->GetElement() != 0x0080) ) ){ // end of remove area FoundLength =10; Entry->SetReadLength(10); // a bug is to be fixed @@ -1723,8 +1788,7 @@ void gdcmParser::FixHeaderEntryFoundLength(gdcmHeaderEntry *Entry, guint32 Found // to fix some garbage 'Leonardo' Siemens images // May be commented out to avoid overhead else if ( (Entry->GetGroup() == 0x0009) && - ( (Entry->GetElement() == 0x1113) || (Entry->GetElement() == 0x1114) ) ) - { + ( (Entry->GetElement() == 0x1113) || (Entry->GetElement() == 0x1114) ) ){ FoundLength =4; Entry->SetReadLength(4); // a bug is to be fixed } @@ -1734,7 +1798,7 @@ void gdcmParser::FixHeaderEntryFoundLength(gdcmHeaderEntry *Entry, guint32 Found else if ( Entry->GetVR() == "SQ") { if (enableSequences) // only if the user does want to ! - FoundLength =0; + FoundLength =0; // ReadLength is unchanged } // a SeQuence Element is beginning @@ -1765,13 +1829,11 @@ void gdcmParser::FixHeaderEntryFoundLength(gdcmHeaderEntry *Entry, guint32 Found * @param Entry The element value on which to apply the predicate. * @return The result of the heuristical predicate. */ -bool gdcmParser::IsHeaderEntryAnInteger(gdcmHeaderEntry *Entry) -{ +bool gdcmParser::IsHeaderEntryAnInteger(gdcmHeaderEntry *Entry) { guint16 element = Entry->GetElement(); guint16 group = Entry->GetGroup(); std::string vr = Entry->GetVR(); guint32 length = Entry->GetLength(); - // When we have some semantics on the element we just read, and if we // a priori know we are dealing with an integer, then we shall be // able to swap it's element value properly. @@ -1782,10 +1844,22 @@ bool gdcmParser::IsHeaderEntryAnInteger(gdcmHeaderEntry *Entry) else { std::ostringstream s; - s << "Erroneous Group Length element length on :" \ - << std::hex << group << " , " << element; - dbg.Error("gdcmParser::IsAnInteger", - s.str().c_str()); + int filePosition = ftell(fp); + s << "Erroneous Group Length element length on : (" \ + << std::hex << group << " , " << element + << ") -before- position x(" << filePosition << ")" + << "lgt : " << length; + // These 2 lines commented out : a *very dirty* patch + // to go on PrintHeader'ing gdcm-MR-PHILIPS-16-Multi-Seq.dcm. + // have a glance at offset x(8336) ... + // For *regular* headers, the test is useless.. + // lets's print a warning message and go on, + // instead of giving up with an error message + + //std::cout << s.str().c_str() << std::endl; + + // dbg.Error("gdcmParser::IsHeaderEntryAnInteger", + // s.str().c_str()); } } if ( (vr == "UL") || (vr == "US") || (vr == "SL") || (vr == "SS") ) @@ -1800,8 +1874,7 @@ bool gdcmParser::IsHeaderEntryAnInteger(gdcmHeaderEntry *Entry) * * @return */ - guint32 gdcmParser::FindHeaderEntryLengthOB(void) - { + guint32 gdcmParser::FindHeaderEntryLengthOB(void) { // See PS 3.5-2001, section A.4 p. 49 on encapsulation of encoded pixel data. guint16 g; guint16 n; @@ -1851,22 +1924,20 @@ bool gdcmParser::IsHeaderEntryAnInteger(gdcmHeaderEntry *Entry) * \brief Reads a supposed to be 16 Bits integer * \ (swaps it depending on processor endianity) * - * @return integer acts as a boolean + * @return read value */ -guint16 gdcmParser::ReadInt16(void) -{ +guint16 gdcmParser::ReadInt16(void) { guint16 g; size_t item_read; item_read = fread (&g, (size_t)2,(size_t)1, fp); - if ( item_read != 1 ) - { + if ( item_read != 1 ) { if(ferror(fp)) dbg.Verbose(0, "gdcmParser::ReadInt16", " File Error"); errno = 1; return 0; } errno = 0; - g = SwapShort(g); + g = SwapShort(g); return g; } @@ -1875,15 +1946,13 @@ guint16 gdcmParser::ReadInt16(void) * \brief Reads a supposed to be 32 Bits integer * \ (swaps it depending on processor endianity) * - * @return + * @return read value */ -guint32 gdcmParser::ReadInt32(void) -{ +guint32 gdcmParser::ReadInt32(void) { guint32 g; size_t item_read; item_read = fread (&g, (size_t)4,(size_t)1, fp); - if ( item_read != 1 ) - { + if ( item_read != 1 ) { if(ferror(fp)) dbg.Verbose(0, "gdcmParser::ReadInt32", " File Error"); errno = 1; @@ -1900,8 +1969,7 @@ guint32 gdcmParser::ReadInt32(void) * * @return */ -void gdcmParser::SkipBytes(guint32 NBytes) -{ +void gdcmParser::SkipBytes(guint32 NBytes) { //FIXME don't dump the returned value (void)fseek(fp, (long)NBytes, SEEK_CUR); } @@ -1920,58 +1988,23 @@ 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 + * @return false when we are absolutely sure + * it's neither ACR-NEMA nor DICOM + * true when we hope ours assuptions are OK */ -void gdcmParser::CheckSwap() -{ - // Fourth semantics: - // - // ---> Warning : This fourth field is NOT part - // of the 'official' Dicom Dictionnary - // and should NOT be used. - // (Not defined for all the groups - // may be removed in a future release) - // - // CMD Command - // META Meta Information - // DIR Directory - // ID - // PAT Patient - // ACQ Acquisition - // REL Related - // IMG Image - // SDY Study - // VIS Visit - // WAV Waveform - // PRC - // DEV Device - // NMI Nuclear Medicine - // MED - // BFS Basic Film Session - // BFB Basic Film Box - // BIB Basic Image Box - // BAB - // IOB - // PJ - // PRINTER - // RT Radio Therapy - // DVH - // SSET - // RES Results - // CRV Curve - // OLY Overlays - // PXL Pixels - // DL Delimiters - // +bool gdcmParser::CheckSwap() { // The only guaranted way of finding the swap code is to find a // group tag since we know it's length has to be of four bytes i.e. // 0x00000004. Finding the swap code in then straigthforward. Trouble // occurs when we can't find such group... - guint32 s; + guint32 x=4; // x : for ntohs bool net2host; // true when HostByteOrder is the same as NetworkByteOrder - + guint32 s32; + guint16 s16; + int lgrLue; char *entCur; char deb[HEADER_LENGTH_TO_READ]; @@ -1982,16 +2015,15 @@ void gdcmParser::CheckSwap() net2host = true; else net2host = false; - //cout << net2host << endl; // The easiest case is the one of a DICOM header, since it possesses a // file preamble where it suffice to look for the string "DICM". lgrLue = fread(deb, 1, HEADER_LENGTH_TO_READ, fp); entCur = deb + 128; - if(memcmp(entCur, "DICM", (size_t)4) == 0) - { + if(memcmp(entCur, "DICM", (size_t)4) == 0) { dbg.Verbose(1, "gdcmParser::CheckSwap:", "looks like DICOM Version3"); + // Next, determine the value representation (VR). Let's skip to the // first element (0002, 0000) and check there if we find "UL" // - or "OB" if the 1st one is (0002,0001) -, @@ -2008,12 +2040,21 @@ void gdcmParser::CheckSwap() // * the 4 bytes of the first tag (0002, 0000),or (0002, 0001) // i.e. a total of 136 bytes. entCur = deb + 136; + + // FIXME : FIXME: + // Sometimes (see : gdcmData/icone.dcm) group 0x0002 *is* Explicit VR, + // but elem 0002,0010 (Transfert Syntax) tells us the file is *Implicit* VR. + // -and it is !- + + if( (memcmp(entCur, "UL", (size_t)2) == 0) || + (memcmp(entCur, "OB", (size_t)2) == 0) || + (memcmp(entCur, "UI", (size_t)2) == 0) || + (memcmp(entCur, "CS", (size_t)2) == 0) ) // CS, to remove later + // when Write DCM *adds* // FIXME // Use gdcmParser::dicom_vr to test all the possibilities - // instead of just checking for UL, OB and UI !? - if( (memcmp(entCur, "UL", (size_t)2) == 0) || - (memcmp(entCur, "OB", (size_t)2) == 0) || - (memcmp(entCur, "UI", (size_t)2) == 0) ) + // instead of just checking for UL, OB and UI !? // group 0000 + { filetype = ExplicitVR; dbg.Verbose(1, "gdcmParser::CheckSwap:", @@ -2025,6 +2066,7 @@ void gdcmParser::CheckSwap() dbg.Verbose(1, "gdcmParser::CheckSwap:", "not an explicit Value Representation"); } + if (net2host) { sw = 4321; @@ -2042,7 +2084,7 @@ void gdcmParser::CheckSwap() // after the file preamble and the "DICM" string). rewind(fp); fseek (fp, 132L, SEEK_SET); - return; + return true; } // End of DicomV3 // Alas, this is not a DicomV3 file and whatever happens there is no file @@ -2060,41 +2102,71 @@ void gdcmParser::CheckSwap() // We assume the array of char we are considering contains the binary // representation of a 32 bits integer. Hence the following dirty // trick : - s = *((guint32 *)(entCur)); - - switch (s) - { + s32 = *((guint32 *)(entCur)); + + switch (s32) { case 0x00040000 : sw = 3412; filetype = ACR; - return; + return true; case 0x04000000 : sw = 4321; filetype = ACR; - return; + return true; case 0x00000400 : sw = 2143; filetype = ACR; - return; + return true; case 0x00000004 : sw = 0; filetype = ACR; - return; + return true; + default : + + // We are out of luck. It is not a DicomV3 nor a 'clean' ACR/NEMA file. + // It is time for despaired wild guesses. + // So, let's check if this file wouldn't happen to be 'dirty' ACR/NEMA, + // i.e. the 'group length' element is not present : + + // check the supposed to be 'group number' + // 0x0002 or 0x0004 or 0x0008 + // to determine ' sw' value . + // Only 0 or 4321 will be possible + // (no oportunity to check for the formerly well known + // ACR-NEMA 'Bad Big Endian' or 'Bad Little Endian' + // if unsuccessfull (i.e. neither 0x0002 nor 0x0200 etc -4, 8-) + // the file IS NOT ACR-NEMA nor DICOM V3 + // Find a trick to tell it the caller... + + s16 = *((guint16 *)(deb)); + + switch (s16) { + case 0x0002 : + case 0x0004 : + case 0x0008 : + sw = 0; + filetype = ACR; + return true; + case 0x0200 : + case 0x0400 : + case 0x0800 : + sw = 4321; + filetype = ACR; + return true; default : dbg.Verbose(0, "gdcmParser::CheckSwap:", - "ACR/NEMA unfound swap info (time to raise bets)"); + "ACR/NEMA unfound swap info (Really hopeless !)"); + filetype = Unknown; + return false; + } + + // Then the only info we have is the net2host one. + //if (! net2host ) + // sw = 0; + //else + // sw = 4321; + //return; } - - // We are out of luck. It is not a DicomV3 nor a 'clean' ACR/NEMA file. - // It is time for despaired wild guesses. So, let's assume this file - // happens to be 'dirty' ACR/NEMA, i.e. the length of the group is - // not present. Then the only info we have is the net2host one. - filetype = Unknown; - if (! net2host ) - sw = 0; - else - sw = 4321; - return; } /** @@ -2128,7 +2200,6 @@ void gdcmParser::SwitchSwapToBigEndian(void) * \ingroup gdcmParser * \brief * @param NewSize - * @return */ void gdcmParser::SetMaxSizeLoadEntry(long NewSize) { @@ -2142,6 +2213,28 @@ void gdcmParser::SetMaxSizeLoadEntry(long NewSize) MaxSizeLoadEntry = NewSize; } + +/** + * \ingroup gdcmParser + * \brief + * \warning TODO : not yet usable + * (see MAX_SIZE_PRINT_ELEMENT_VALUE + * in gdcmHeaderEntry gdcmLoadEntry) + * + * @param NewSize + */ +void gdcmParser::SetMaxSizePrintEntry(long NewSize) +{ + if (NewSize < 0) + return; + if ((guint32)NewSize >= (guint32)0xffffffff) + { + MaxSizePrintEntry = 0xffffffff; + return; + } + MaxSizePrintEntry = NewSize; +} + /** * \ingroup gdcmParser * \brief Searches both the public and the shadow dictionary (when they @@ -2211,8 +2304,7 @@ gdcmDictEntry *gdcmParser::GetDictEntryByNumber(guint16 group,guint16 element) * \brief Read the next tag but WITHOUT loading it's value * @return On succes the newly created HeaderEntry, NULL on failure. */ -gdcmHeaderEntry *gdcmParser::ReadNextHeaderEntry(void) -{ +gdcmHeaderEntry *gdcmParser::ReadNextHeaderEntry(void) { guint16 g,n; gdcmHeaderEntry *NewEntry; @@ -2220,21 +2312,28 @@ gdcmHeaderEntry *gdcmParser::ReadNextHeaderEntry(void) n = ReadInt16(); if (errno == 1) - // We reached the EOF (or an error occured) and header parsing - // has to be considered as finished. + // We reached the EOF (or an error occured) therefore + // header parsing has to be considered as finished. return (gdcmHeaderEntry *)0; + +/* Pb : how to propagate the element length (used in SkipHeaderEntry) +// direct call to SkipBytes ? + if (ignoreShadow == 1 && g%2 ==1) //JPR + // if user wants to skip shadow groups + // and current element *is* a shadow element + // we don't create anything + return (gdcmHeaderEntry *)1; // to tell caller it's NOT finished +*/ NewEntry = NewHeaderEntryByNumber(g, n); FindHeaderEntryVR(NewEntry); FindHeaderEntryLength(NewEntry); - if (errno == 1) - { + if (errno == 1) { // Call it quits return NULL; } NewEntry->SetOffset(ftell(fp)); - //if ( (g==0x7fe0) && (n==0x0010) ) return NewEntry; } @@ -2249,7 +2348,7 @@ gdcmHeaderEntry *gdcmParser::NewHeaderEntryByName(std::string Name) { gdcmDictEntry *NewTag = GetDictEntryByName(Name); if (!NewTag) - NewTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", "Unknown", Name); + NewTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", "unkn", Name); gdcmHeaderEntry* NewEntry = new gdcmHeaderEntry(NewTag); if (!NewEntry) @@ -2303,6 +2402,7 @@ gdcmHeaderEntry *gdcmParser::NewHeaderEntryByNumber(guint16 Group, guint16 Elem) return NewEntry; } +// Never used; commented out, waiting for removal. /** * \ingroup gdcmParser * \brief Small utility function that creates a new manually crafted @@ -2313,28 +2413,28 @@ gdcmHeaderEntry *gdcmParser::NewHeaderEntryByNumber(guint16 Group, guint16 Elem) * @param VR The Value Representation to be given to this new tag. * @return The newly hand crafted Element Value. */ -gdcmHeaderEntry *gdcmParser::NewManualHeaderEntryToPubDict(std::string NewTagName, - std::string VR) -{ - gdcmHeaderEntry *NewEntry = NULL; - guint32 StuffGroup = 0xffff; // Group to be stuffed with additional info - guint32 FreeElem = 0; - gdcmDictEntry *DictEntry = NULL; - - FreeElem = GenerateFreeTagKeyInGroup(StuffGroup); - if (FreeElem == UINT32_MAX) - { - dbg.Verbose(1, "gdcmHeader::NewManualHeaderEntryToPubDict", - "Group 0xffff in Public Dict is full"); - return NULL; - } - - DictEntry = NewVirtualDictEntry(StuffGroup, FreeElem, - VR, "GDCM", NewTagName); - NewEntry = new gdcmHeaderEntry(DictEntry); - AddHeaderEntry(NewEntry); - return NewEntry; -} +//gdcmHeaderEntry *gdcmParser::NewManualHeaderEntryToPubDict(std::string NewTagName, +// std::string VR) +//{ +// gdcmHeaderEntry *NewEntry = NULL; +// guint32 StuffGroup = 0xffff; // Group to be stuffed with additional info +// guint32 FreeElem = 0; +// gdcmDictEntry *DictEntry = NULL; +// +// FreeElem = GenerateFreeTagKeyInGroup(StuffGroup); +// if (FreeElem == UINT32_MAX) +// { +// dbg.Verbose(1, "gdcmHeader::NewManualHeaderEntryToPubDict", +// "Group 0xffff in Public Dict is full"); +// return NULL; +// } +// +// DictEntry = NewVirtualDictEntry(StuffGroup, FreeElem, +// VR, "GDCM", NewTagName); +// NewEntry = new gdcmHeaderEntry(DictEntry); +// AddHeaderEntry(NewEntry); +// return NewEntry; +//} /** * \ingroup gdcmParser