X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.cxx;h=4f0e9ce2f648be9ae792cff907d25c01fc44223c;hb=b868cc4addde15e2f692a7b1fe9451c1335258f4;hp=c888737b5fb46c80588d287593e2c1f5124474a8;hpb=2012716d624d631dcdb825fdd4470908e115a717;p=gdcm.git

diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx
index c888737b..4f0e9ce2 100644
--- a/src/gdcmDocEntrySet.cxx
+++ b/src/gdcmDocEntrySet.cxx
@@ -3,61 +3,185 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntrySet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/20 18:08:47 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2005/01/07 22:24:00 $
+  Version:   $Revision: 1.40 $
                                                                                 
   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.htm for details.
+  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 <errno.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(int depthLevel) {
-   SQDepthLevel = depthLevel + 1;
+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::NewValEntryByNumber(uint16_t group,uint16_t elem,
+                                           TagName const & vr) 
+{
+   DictEntry *dictEntry = GetDictEntryByNumber(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
+
+
+/**
+ * \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::NewBinEntryByNumber(uint16_t group,uint16_t elem,
+                                           TagName const & vr) 
+{
+   DictEntry *dictEntry = GetDictEntryByNumber(group, elem, vr);
+   gdcmAssertMacro(dictEntry);
 
+   BinEntry *newEntry = new BinEntry(dictEntry);
+   if (!newEntry) 
+   {
+      gdcmVerboseMacro( "Failed to allocate BinEntry");
+      return 0;
+   }
+   return newEntry;
+}
 
-//-----------------------------------------------------------------------------
-// Public
+/**
+ * \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::NewSeqEntryByNumber(uint16_t group,uint16_t elem) 
+{
+   DictEntry *dictEntry = GetDictEntryByNumber(group, elem, "SQ");
+   gdcmAssertMacro(dictEntry);
 
-//-----------------------------------------------------------------------------
-// Protected
+   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::GetDictEntryByNumber(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->GetDictEntryByNumber(group, elem);  
+   }
+   return found;
+}
+
+DictEntry *DocEntrySet::GetDictEntryByNumber(uint16_t group, uint16_t elem,
+                                             TagName const & vr)
+{
+   DictEntry *dictEntry = GetDictEntryByNumber(group,elem);
+   DictEntry *goodEntry = dictEntry;
+   std::string goodVR = vr;
+
+   if (elem == 0x0000) goodVR="UL";
+
+   if ( goodEntry )
+   {
+      if ( goodVR != goodEntry->GetVR()
+        && goodVR != GDCM_UNKNOWN )
+      {
+         goodEntry = NULL;
+      }
+   }
+
+   // 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
 
 //-----------------------------------------------------------------------------