X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=cfe420d81a88496853dc6fe7a6aedf1eaf537607;hb=903abdfb9913f544b7173fce8a9a9bb1141af537;hp=5bcacb34fbe1960b1d907bdef4eec08229a56372;hpb=70e24c6c61481f9836e26b6b44a9670d92a4f43b;p=gdcm.git

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 5bcacb34..cfe420d8 100644
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -1,23 +1,118 @@
-#include "gdcmlib.h"
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDictEntry.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/10/19 13:17:04 $
+  Version:   $Revision: 1.53 $
+                                                                                
+  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.
+                                                                                
+=========================================================================*/
 
-gdcmDictEntry::gdcmDictEntry(guint16 InGroup, guint16 InElement,
-                             string  InVr, string InFourth, string InName) 
+#include "gdcmDictEntry.h"
+#include "gdcmDebug.h"
+#include "gdcmUtil.h"
+
+#include <iomanip> // for std::ios::left, ...
+#include <fstream>
+#include <stdio.h> // for sprintf
+
+namespace gdcm 
+{
+//-----------------------------------------------------------------------------
+// Constructor / Destructor
+/**
+ * \brief   Constructor
+ * @param   group      DICOM-Group Number
+ * @param   elem       DICOM-Element Number
+ * @param   vr         Value Representation
+ * @param   vm         Value Multiplicity 
+ * @param   name       description of the element
+*/
+
+DictEntry::DictEntry(uint16_t group, uint16_t elem,
+                     VRKey const &vr, 
+                     TagName const &vm,
+                     TagName const &name):
+   DicomEntry(group,elem,vr)
+{
+   VM      = vm;
+   Name    = name;
+}
+
+//-----------------------------------------------------------------------------
+// Public
+/**
+ * \brief       If-and only if-the V(alue) R(epresentation)
+ * \            is unset then overwrite it.
+ * @param vr    New V(alue) R(epresentation) to be set.
+ */
+void DictEntry::SetVR(VRKey const &vr) 
+{
+   if ( IsVRUnknown() )
+   {
+      DicomEntry::SetVR(vr);
+   }
+   else 
+   {
+      gdcmErrorMacro( "Overwriting VR might compromise a dictionary");
+   }
+}
+
+/**
+ * \brief       If-and only if-the V(alue) M(ultiplicity)
+ * \            is unset then overwrite it.
+ * @param vm    New V(alue) M(ultiplicity) to be set.
+ */
+void DictEntry::SetVM(TagName const &vm) 
 {
-	group = InGroup;
-	element = InElement;
-	vr = InVr;
-	fourth = InFourth;
-	name = InName;
-	key = TranslateToKey(group, element);
+   if ( IsVMUnknown() )
+   {
+      VM = vm;
+   }
+   else 
+   {
+      gdcmErrorMacro( "Overwriting VM might compromise a dictionary");
+   }
 }
 
-TagKey gdcmDictEntry::TranslateToKey(guint16 group, guint16 element) {
-	char trash[10];
-	TagKey key;
-	// CLEAN ME: better call the iostream<< with the hex manipulator on.
-	// This requires some reading of the stdlibC++ sources to make the
-	// proper call (or copy).
-	sprintf(trash, "%04x|%04x", group , element);
-	key = trash;  // Convertion through assignement
-	return key;
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief   Prints an entry of the Dicom DictionaryEntry
+ * @param   os ostream we want to print in
+ * @param indent Indentation string to be prepended during printing
+ */
+void DictEntry::Print(std::ostream &os, std::string const &indent )
+{
+   DicomEntry::Print(os,indent);
+
+   VRKey vr;
+   std::ostringstream s;
+
+   if ( PrintLevel >= 1 )
+   {
+      s.setf(std::ios::left);
+      s << std::setw(66-GetName().length()) << " ";
+   }
+
+   s << "[" << GetName()<< "]";
+   os << s.str() << std::endl;
 }
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm
+