X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.cxx;h=9b7286f06a28e627fcf8d8d3e7b7879a7e7a2d42;hb=801fe2221ca70b34c5c644b6f522aa1b7233945b;hp=d60f1dbef0bd11bf39ea43d0728c6b58cd570bfd;hpb=e49dda75179644e228e33af72931535878799dff;p=gdcm.git diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index d60f1dbe..9b7286f0 100644 --- a/src/gdcmDocEntrySet.cxx +++ b/src/gdcmDocEntrySet.cxx @@ -1,16 +1,25 @@ // gdcmDocEntrySet.cxx //----------------------------------------------------------------------------- // +#include +#include "gdcmDebug.h" +#include "gdcmCommon.h" +#include "gdcmGlobal.h" #include "gdcmDocEntrySet.h" #include "gdcmException.h" +#include "gdcmDocEntry.h" +#include "gdcmSeqEntry.h" +#include "gdcmValEntry.h" +#include "gdcmBinEntry.h" //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmDocEntrySEt + * \ingroup gdcmDocEntrySet * \brief Constructor from a given gdcmDocEntrySet */ -gdcmDocEntrySet::gdcmDocEntrySet() { +gdcmDocEntrySet::gdcmDocEntrySet(int depthLevel) { + SQDepthLevel = depthLevel + 1; } /** * \brief Canonical destructor. @@ -28,194 +37,12 @@ gdcmDocEntrySet::~gdcmDocEntrySet(){ //----------------------------------------------------------------------------- // Public - //----------------------------------------------------------------------------- // Protected + //----------------------------------------------------------------------------- // Private -/** - * \brief Parses an EntrySet (Document header or SQ Item ) - * \ and load element values (a voir !) - * @return false anything wrong happens - */ -bool gdcmDocEntrySet::LoadDocEntrySet(bool exception_on_error) - throw(gdcmFormatError) { - (void)exception_on_error; - - gdcmDocEntry *newDocEntry = (gdcmDocEntry *)0; - gdcmValEntry *newValEntry = (gdcmValEntry *)0; - gdcmBinEntry *newBinEntry = (gdcmBinEntry *)0; - gdcmSeqEntry *newSeqEntry = (gdcmSeqEntry *)0; - //gdcmDictEntry *NewTag = (gdcmDictEntry *)0; - - while (newDocEntry = ReadNextDocEntry())) { - // TODO (?) : liberation du DocEntry ainsi cree, - // apres copie dans un ValEntry, SeqEntry, BinEntry - vr = newDocEntry->getVR(); - - if (vr == "SQ" ) { - // --- SeqEntry - - newSeqEntry = (gdcmSeqEntry *)0; - if (!NewSeqEntry) { - dbg.Verbose(1, "gdcmDocEntrySet::LoadDocEntrySet", - "failed to allocate gdcmSeqEntry"); - return false; - } - newSeqEntry->Copy(newDocEntry); - // TODO - // SEQUENCE; appel 'récursif' de ??? pour charger la 'valeur' - // (ensemble d' ITEMs, en fait, - // chaque ITEM etant chargé avec LoadDocEntrySet) - - SkipDocEntry(newSeqEntry); // voir ce qu'on fait pour une SeQuence - AddDocEntry(newSeqEntry); - - } else if (vr == "AE" || vr == "AS" || vr == "DA" || vr == "PN" || - vr == "UI" || vr == "TM" ) { - // --- ValEntry - - newValEntry = (gdcmValEntry *)0; - if (!NewValEntry) { - dbg.Verbose(1, "gdcmDocEntrySet::LoadDocEntrySet", - "failed to allocate gdcmValEntry"); - return false; - } - newValEntry->Copy(newDocEntry); - SkipDocEntry(newValEntry); - AddDocEntry(newValEntry); - - } else { - // --- BinEntry - - NewBinEntry = new gdcmBinEntry(DictEntry); - if (!NewValEntry) { - dbg.Verbose(1, "gdcmDocEntrySet::LoadDocEntrySet", - "failed to allocate gdcmBinEntry"); - return false; - } - newBinEntry->Copy(newDocEntry); - SkipDocEntry(newBinEntry); - AddDocEntry(newBinEntry); - } - } - rewind(fp); - - - // TODO : il n'y a plus de Chained List qui contient toutes les Entries - // Le chargement des valeurs devra se faire à la volée - // Be carefull : merging this two loops may cause troubles ... - for (ListTag::iterator i = GetListEntry().begin(); - i != GetListEntry().end(); - ++i) - { - LoadDocEntry(*i); - } - rewind(fp); - - // -------------------------------------------------------------- - // Special Patch to allow gdcm to read ACR-LibIDO formated images - // - // if recognition code tells us we deal with a LibIDO image - // we switch lineNumber and columnNumber - // - std::string RecCode; - RecCode = GetEntryByNumber(0x0008, 0x0010); // recognition code - if (RecCode == "ACRNEMA_LIBIDO_1.1" || - RecCode == "CANRME_AILIBOD1_1." ) // for brain-damaged softwares - // with "little-endian strings" - { - filetype = ACR_LIBIDO; - std::string rows = GetEntryByNumber(0x0028, 0x0010); - std::string columns = GetEntryByNumber(0x0028, 0x0011); - SetEntryByNumber(columns, 0x0028, 0x0010); - SetEntryByNumber(rows , 0x0028, 0x0011); - } - // ----------------- End of Special Patch ---------------- - return true; -} - - - -/** - * \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. - * @param Entry Header Entry to check - * @param vr Dicom Value Representation - * @return false if the VR is incorrect of if the VR isn't referenced - * otherwise, it returns true -*/ - -// NE MARCHE PAS EN L'ETAT : -// On a besoin de VR pour 'fabriquer', au choix ValEntry, BinEntry, ou SeqEntry. -// - -bool gdcmDocEntrySet::CheckEntryVR(gdcmHeaderEntry *Entry, VRKey vr) -{ - char msg[100]; // for sprintf - bool RealExplicit = true; - - // Assume we are reading a falsely explicit VR file i.e. we reached - // a tag where we expect reading a VR but are in fact we read the - // first to bytes of the length. Then we will interogate (through find) - // the dicom_vr dictionary with oddities like "\004\0" which crashes - // both GCC and VC++ implementations of the STL map. Hence when the - // expected VR read happens to be non-ascii characters we consider - // we hit falsely explicit VR tag. - - if ( (!isalpha(vr[0])) && (!isalpha(vr[1])) ) - RealExplicit = false; - - // CLEANME searching the dicom_vr at each occurence is expensive. - // PostPone this test in an optional integrity check at the end - // of parsing or only in debug mode. - if ( RealExplicit && !gdcmGlobal::GetVR()->Count(vr) ) - RealExplicit= false; - - if ( !RealExplicit ) - { - // We thought this was explicit VR, but we end up with an - // implicit VR tag. Let's backtrack. - 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. - if (Entry->GetElement() == 0x0000) { // Group length is UL ! - Entry->SetVR("UL"); - } else { - Entry->SetVR(vr); - } - } - else if ( Entry->GetVR() != vr ) - { - // The VR present in the file and the dictionary disagree. We assume - // the file writer knew best and use the VR of the file. Since it would - // be unwise to overwrite the VR of a dictionary (since it would - // compromise it's next user), we need to clone the actual DictEntry - // and change the VR for the read one. - gdcmDictEntry* NewEntry = NewVirtualDictEntry( - Entry->GetGroup(),Entry->GetElement(), - vr,"FIXME",Entry->GetName()); - Entry->SetDictEntry(NewEntry); - } - return(true); -} - - - //-----------------------------------------------------------------------------