-// gdcmDocEntrySet.cxx
-//-----------------------------------------------------------------------------
-//
-#include <errno.h>
+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: gdcmDocEntrySet.cxx,v $
+ Language: C++
+ Date: $Date: 2005/01/23 10:12:33 $
+ Version: $Revision: 1.43 $
+
+ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+ l'Image). All rights reserved. See Doc/License.txt or
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+#include "gdcmDocEntrySet.h"
+
#include "gdcmDebug.h"
#include "gdcmCommon.h"
+#include "gdcmDictSet.h"
#include "gdcmGlobal.h"
-#include "gdcmDocEntrySet.h"
#include "gdcmException.h"
#include "gdcmDocEntry.h"
#include "gdcmSeqEntry.h"
#include "gdcmValEntry.h"
#include "gdcmBinEntry.h"
+namespace gdcm
+{
+
//-----------------------------------------------------------------------------
-// Constructor / Destructor
+// Public
+
+
/**
- * \ingroup gdcmDocEntrySet
- * \brief Constructor from a given gdcmDocEntrySet
+ * \brief Request a new virtual dict entry to the dict set
+ * @param group group number of the underlying DictEntry
+ * @param elem element number of the underlying DictEntry
+ * @param vr VR (Value Representation) of the underlying DictEntry
+ * @param vm VM (Value Multiplicity) of the underlying DictEntry
+ * @param name english name
*/
-gdcmDocEntrySet::gdcmDocEntrySet() {
+DictEntry* DocEntrySet::NewVirtualDictEntry( uint16_t group,uint16_t elem,
+ TagName const & vr,
+ TagName const & vm,
+ TagName const & name )
+{
+ return Global::GetDicts()->NewVirtualDictEntry(group,elem,vr,vm,name);
}
+
+//-----------------------------------------------------------------------------
+// Protected
/**
- * \brief Canonical destructor.
+ * \brief Build a new Val Entry from all the low level arguments.
+ * Check for existence of dictionary entry, and build
+ * a default one when absent.
+ * @param group group number of the new Entry
+ * @param elem element number of the new Entry
+ * @param vr VR of the new Entry
*/
-gdcmDocEntrySet::~gdcmDocEntrySet(){
+ValEntry *DocEntrySet::NewValEntry(uint16_t group,uint16_t elem,
+ TagName const & vr)
+{
+ DictEntry *dictEntry = GetDictEntry(group, elem, vr);
+ gdcmAssertMacro(dictEntry);
+
+ ValEntry *newEntry = new ValEntry(dictEntry);
+ if (!newEntry)
+ {
+ gdcmVerboseMacro( "Failed to allocate ValEntry");
+ return 0;
+ }
+ return newEntry;
}
-//-----------------------------------------------------------------------------
-// Print
-/*
- * \ingroup gdcmDocEntrySet
- * \brief canonical Printer
- */
-//-----------------------------------------------------------------------------
-// Public
-//bool gdcmDocEntrySet::AddEntry(gdcmDocEntry *Entry){return true;}
+/**
+ * \brief Build a new Bin Entry from all the low level arguments.
+ * Check for existence of dictionary entry, and build
+ * a default one when absent.
+ * @param group group number of the new Entry
+ * @param elem element number of the new Entry
+ * @param vr VR of the new Entry
+ */
+BinEntry *DocEntrySet::NewBinEntry(uint16_t group,uint16_t elem,
+ TagName const & vr)
+{
+ DictEntry *dictEntry = GetDictEntry(group, elem, vr);
+ gdcmAssertMacro(dictEntry);
+
+ BinEntry *newEntry = new BinEntry(dictEntry);
+ if (!newEntry)
+ {
+ gdcmVerboseMacro( "Failed to allocate BinEntry");
+ return 0;
+ }
+ return newEntry;
+}
-//-----------------------------------------------------------------------------
-// Protected
+/**
+ * \brief Build a new Seq Entry from all the low level arguments.
+ * Check for existence of dictionary entry, and build
+ * a default one when absent.
+ * @param group group number of the new Entry
+ * @param elem element number of the new Entry
+ */
+SeqEntry* DocEntrySet::NewSeqEntry(uint16_t group,uint16_t elem)
+{
+ DictEntry *dictEntry = GetDictEntry(group, elem, "SQ");
+ gdcmAssertMacro(dictEntry);
+ SeqEntry *newEntry = new SeqEntry( dictEntry );
+ if (!newEntry)
+ {
+ gdcmVerboseMacro( "Failed to allocate SeqEntry");
+ return 0;
+ }
+ return newEntry;
+}
+
+/**
+ * \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
+ * shadow one.
+ * @param group group number of the searched DictEntry
+ * @param elem element number of the searched DictEntry
+ * @return Corresponding DictEntry when it exists, NULL otherwise.
+ */
+DictEntry *DocEntrySet::GetDictEntry(uint16_t group,uint16_t elem)
+{
+ DictEntry *found = 0;
+ Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
+ if (!pubDict)
+ {
+ gdcmVerboseMacro( "We SHOULD have a default dictionary");
+ }
+ else
+ {
+ found = pubDict->GetDictEntry(group, elem);
+ }
+ return found;
+}
-//-----------------------------------------------------------------------------
-// Private
/**
- * \brief Parses an EntrySet (Document header or SQ Item )
- * \ and load element values (a voir !)
- * @return false anything wrong happens
+ * \brief Searches both the public and the shadow dictionary (when they
+ * exist) for the presence of the DictEntry with given
+ * group and element, and create a new virtual DictEntry if necessary
+ * @param group group number of the searched DictEntry
+ * @param elem element number of the searched DictEntry
+ * @param vr Value Representation to use, if necessary
+ * @return Corresponding DictEntry when it exists, NULL otherwise.
*/
-
- /* just to keep the code
-
-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;
-
- string vr;
- while (newDocEntry = ReadNextDocEntry()) {
- // TODO (?) : liberation du DocEntry ainsi cree,
- // apres copie dans un ValEntry, SeqEntry, BinEntry
- vr = newDocEntry->GetVR();
-
- if (vr == "SQ" ) {
- // --- SeqEntry
-
- newSeqEntry = new gdcmSeqEntry((gdcmDictEntry*)NULL);
- 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
- AddEntry(newSeqEntry); // on appele la fonction generique,
- // ou une fonction spécialisée ?
-
- } else if (vr == "AE" || vr == "AS" || vr == "DA" || vr == "PN" ||
- vr == "UI" || vr == "TM" || vr == "SH" || vr == "LO" ||
- vr == "CS" || vr == "IS" || vr == "LO" || vr == "LT" ||
- vr == "SH" || vr == "ST" ||
- vr == "SL" || vr == "SS" || vr == "UL" || vr == "US"
- ) {
- // --- ValEntry
-
- newValEntry = new gdcmValEntry((gdcmDictEntry*)NULL);
- if (!newValEntry) {
- dbg.Verbose(1, "gdcmDocEntrySet::LoadDocEntrySet",
- "failed to allocate gdcmValEntry");
- return false;
- }
- newValEntry->Copy(newDocEntry);
- //SkipDocEntry(newValEntry); //le skip devrait etre fait dans le Read
- AddEntry(newValEntry); // on appele la fonction generique,
- // ou une fonction spécialisée ?
-
- // Maybe the following VR do correspond to a BinEntry
-
- //AT Attribute Tag; // 2 16-bit unsigned short integers
- //FL Floating Point Single; // 32-bit IEEE 754:1985 float
- //FD Floating Point Double; // 64-bit IEEE 754:1985 double
- //UN Unknown; // Any length of bytes
- //UT Unlimited Text; // At most 2^32 -1 chars
- //OB Other Byte String; // String of bytes (VR independant)
- //OW Other Word String; // String of 16-bit words (VR dependant)
- } else {
- // --- BinEntry
-
- newBinEntry = new gdcmBinEntry((gdcmDictEntry*)NULL);
- if (!newBinEntry) {
- dbg.Verbose(1, "gdcmDocEntrySet::LoadDocEntrySet",
- "failed to allocate gdcmBinEntry");
- return false;
- }
- newBinEntry->Copy(newDocEntry);
- // SkipDocEntry(newBinEntry); //le skip devrait etre fait dans le Read
- AddEntry(newBinEntry); // on appele la fonction generique,
- // ou une fonction spécialisée ?
- }
- }
-
-
-
- // 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 ...
-
-/*
- rewind(fp);
- for (ListTag::iterator i = GetListEntry().begin();
- i != GetListEntry().end();
- ++i)
- {
- LoadDocEntry(*i);
- }
- rewind(fp);
-
- */
-
- /* TO DO : deporter den fin de parsing du DOCUMENT (pas du EntrySet)
-
- // --------------------------------------------------------------
- // 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"
+DictEntry *DocEntrySet::GetDictEntry(uint16_t group, uint16_t elem,
+ TagName const & vr)
+{
+ DictEntry *dictEntry = GetDictEntry(group,elem);
+ DictEntry *goodEntry = dictEntry;
+ std::string goodVR = vr;
+
+ if (elem == 0x0000) goodVR="UL";
+
+ if ( goodEntry )
{
- filetype = ACR_LIBIDO;
- std::string rows = GetEntryByNumber(0x0028, 0x0010);
- std::string columns = GetEntryByNumber(0x0028, 0x0011);
- SetEntryByNumber(columns, 0x0028, 0x0010);
- SetEntryByNumber(rows , 0x0028, 0x0011);
+ if ( goodVR != goodEntry->GetVR()
+ && goodVR != GDCM_UNKNOWN )
+ {
+ goodEntry = NULL;
+ }
}
- // ----------------- End of Special Patch ----------------
- */
-
- /*
- return true;
+
+ // Create a new virtual DictEntry if necessary
+ if (!goodEntry)
+ {
+ if (dictEntry)
+ {
+ goodEntry = NewVirtualDictEntry(group, elem, goodVR, "FIXME",
+ dictEntry->GetName() );
+ }
+ else
+ {
+ goodEntry = NewVirtualDictEntry(group, elem, goodVR);
+ }
+ }
+ return goodEntry;
}
-*/
+//-----------------------------------------------------------------------------
+// Private
+
+} // end namespace gdcm
//-----------------------------------------------------------------------------