X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=08b9245be33bd0541fbeedc8c0c85d5ada0cf73d;hb=f849604fc5f84d51fc9ed567e65f4f2931e2e5e8;hp=152e6d090d03a3a19c18e60652e238bca3c7ad0a;hpb=3e78befc911eac2ecc70747854911d1f803797b5;p=gdcm.git

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 152e6d09..08b9245b 100644
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -1,48 +1,120 @@
-// gdcmDictEntry.cxx
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDictEntry.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/11/28 18:01:25 $
+  Version:   $Revision: 1.57 $
+                                                                                
+  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,
-									  std::string  InVr, std::string InFourth,
-									  std::string  InName) {
-	group 		= InGroup;
-	element 	= InElement;
-	vr 		= InVr;
-	fourth 		= InFourth;
-	name 		= InName;
-	key 		= TranslateToKey(group, element);
+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;
 }
 
-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;
+//-----------------------------------------------------------------------------
+// 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       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 gdcmDictEntry::SetVR(std::string NewVr) {
-	if ( IsVrUnknown() )
-		vr = NewVr;
-	else {
-		dbg.Error(true, "gdcmDictEntry::SetVR",
-		          "Overwriting vr might compromise a dictionary");
-	}
+void DictEntry::SetVR(VRKey const &vr) 
+{
+   //gdcmAssertMacro( IsVRUnknown() );
+   DicomEntry::SetVR(vr);
 }
 
-bool gdcmDictEntry::IsVrUnknown() {
-	if ( vr == "Unknown" )
-		return true;
-	return false;
+/**
+ * \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) 
+{
+   gdcmAssertMacro( IsVMUnknown() );
+   VM = vm;
 }
+
+//-----------------------------------------------------------------------------
+// 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);
+
+   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
+