X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDicomDirElement.cxx;h=f6f9004eabecfa3d20f74f74d22eb7c5a37f0930;hb=305055c85fb1fa3146cdffce56a4f7c3073b1b96;hp=b526b5bcabe5dfabd4c5b875792224d311c3df7d;hpb=95e43356511d138225d8f718f632b3e7a8fcc106;p=gdcm.git

diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx
index b526b5bc..f6f9004e 100644
--- a/src/gdcmDicomDirElement.cxx
+++ b/src/gdcmDicomDirElement.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirElement.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/05 01:37:08 $
-  Version:   $Revision: 1.34 $
+  Date:      $Date: 2005/06/07 09:58:29 $
+  Version:   $Revision: 1.37 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,6 +27,8 @@
 namespace gdcm 
 {
 //-----------------------------------------------------------------------------
+/// \brief auto generate function, to fill up the default elements for 
+///        a DICOMDIR, if relevant file is not found on user's disk
 void FillDefaultDIRDict(DicomDirElement *dde);
 
 //-----------------------------------------------------------------------------
@@ -108,8 +110,9 @@ DicomDirElement::~DicomDirElement()
 //-----------------------------------------------------------------------------
 // Public
 /**
- * \brief Add an entry 
- * @param type type
+ * \brief Add an entry to one of the DicomDir Elements 
+ *        (Patient, Study, Serie, Image)
+ * @param type Element type (DD_PATIENT, DD_STUDY, DD_SERIE, DD_IMAGE) 
  * @param elem elem
  */
 bool DicomDirElement::AddEntry(DicomDirType type, Element const &elem)
@@ -137,6 +140,22 @@ bool DicomDirElement::AddEntry(DicomDirType type, Element const &elem)
    return true;
 }
 
+/**
+ * \brief Add an entry to one of the DicomDir Elements 
+ *        (Patient, Study, Serie, Image)
+ * @param type Element type (DD_PATIENT, DD_STUDY, DD_SERIE, DD_IMAGE) 
+ * @param group  Group number of the entry to be added
+ * @param elem Element number of the entry to be added
+ */
+void DicomDirElement::AddDicomDirElement(DicomDirType type,
+                                         uint16_t group, uint16_t elem)
+{
+   Element el;
+   el.Group = group;
+   el.Elem  = elem;
+   el.Value = "";
+   AddEntry(type, el);
+}
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -159,35 +178,35 @@ void DicomDirElement::Print(std::ostream &os)
    s << "Meta Elements :"<<std::endl;
    for (it = DicomDirMetaList.begin(); it != DicomDirMetaList.end(); ++it)
    {
-      greltag = Util::Format("%04x|%04x ",it->Group,it->Elem);
+      greltag = DictEntry::TranslateToKey(it->Group,it->Elem);
       s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Patient Elements :"<<std::endl;
    for (it = DicomDirPatientList.begin(); it != DicomDirPatientList.end(); ++it)
    {
-      greltag = Util::Format("%04x|%04x ",it->Group,it->Elem);
+      greltag = DictEntry::TranslateToKey(it->Group,it->Elem);
       s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Study Elements :"<<std::endl;
    for (it = DicomDirStudyList.begin(); it != DicomDirStudyList.end(); ++it)
    {
-      greltag = Util::Format("%04x|%04x ", it->Group, it->Elem);
+      greltag = DictEntry::TranslateToKey(it->Group, it->Elem);
       s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Serie Elements :"<<std::endl;
    for (it = DicomDirSerieList.begin(); it != DicomDirSerieList.end(); ++it)
    {
-      greltag = Util::Format("%04x|%04x ", it->Group, it->Elem);
+      greltag = DictEntry::TranslateToKey( it->Group, it->Elem);
       s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Image Elements :"<<std::endl;
    for (it = DicomDirImageList.begin(); it != DicomDirImageList.end(); ++it)
    {
-      greltag = Util::Format("%04x|%04x ", it->Group, it->Elem);
+      greltag = DictEntry::TranslateToKey(it->Group, it->Elem);
       s << "   (" << greltag << ") = " << it->Value << std::endl;
    }