X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=3b67a2a9110c0ef74a3e972a3ea198ab146e7f15;hb=56ad78cdf3b5de32f0a94a38cd32ddc9f403ffc3;hp=482a05d0141953b22c722c39afad992d2130d7d0;hpb=595f90023c498f01bba240043841088ba5d45872;p=gdcm.git

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 482a05d0..3b67a2a9 100644
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -1,47 +1,122 @@
-// gdcmDictEntry.cxx
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDictEntry.cxx,v $
+  Language:  C++
+  Date:      $Date: 2007/05/23 14:18:09 $
+  Version:   $Revision: 1.61 $
+                                                                                
+  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 <stdio.h>    // FIXME For sprintf
 #include "gdcmDictEntry.h"
+#include "gdcmDebug.h"
 #include "gdcmUtil.h"
 
+#include <iomanip> // for std::ios::left, ...
+#include <fstream>
+#include <stdio.h> // for sprintf
 
-gdcmDictEntry::gdcmDictEntry(guint16 InGroup, guint16 InElement,
-                             string  InVr, string InFourth, string InName) {
-	group 		= InGroup;
-	element 	= InElement;
-	vr 		= InVr;
-	fourth 		= InFourth;
-	name 		= InName;
-	key 		= TranslateToKey(group, element);
+namespace GDCM_NAME_SPACE 
+{
+//-----------------------------------------------------------------------------
+// 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)
+{
+   Tag.SetGroup(group);
+   Tag.SetElement(elem);
+   VR      = vr;
+   VM      = vm;
+   Name    = name;
 }
 
-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;
+/**
+ * \brief   Destructor
+ */
+DictEntry::~DictEntry()
+{
+}
+//-----------------------------------------------------------------------------
+// Public
+/**
+ * \brief Class allocator
+ * @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::New(uint16_t group, uint16_t elem,
+                          VRKey const &vr,
+                          TagName const &vm,
+                          TagName const &name)
+{
+   return new DictEntry(group,elem,vr,vm,name);
 }
 
 /**
- * \ingroup     gdcmDictEntry
- * \brief       If-and only if-the vr is unset then overwrite it.
- * @param NewVr New vr to be set.
+ * \brief   concatenates 2 uint16_t (supposed to be a Dicom group number 
+ *                                              and a Dicom element number)
+ * @param  group the Dicom group number used to build the tag
+ * @param  elem the Dicom element number used to build the tag
+ * @return the built tag
  */
-void gdcmDictEntry::SetVR(string NewVr) {
-	if ( IsVrUnknown() )
-		vr = NewVr;
-	else {
-		dbg.Error(true, "gdcmDictEntry::SetVR",
-		          "Overwriting vr might compromise a dictionary");
-	}
+TagKey DictEntry::TranslateToKey(uint16_t group, uint16_t elem)
+{
+   // according to 'Purify', TranslateToKey is one of the most
+   // time consuming methods.
+   // Let's try to shorten it !
+   return TagKey(group,elem);
 }
 
-bool gdcmDictEntry::IsVrUnknown() {
-	if ( vr == "Unknown" )
-		return true;
-	return false;
+//-----------------------------------------------------------------------------
+// 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 & )
+{
+   os << GetKey(); 
+   os << " [" << 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
+