X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirElement.cxx;h=4af127cd3b5e8b0bc251c6c7adaa22b7c4481c31;hb=403b2021a56b6afcbf8ddf977dbbfed37ad0d917;hp=66665db6476f68e3f32eac05dbd24fd609bbf2b6;hpb=d1c68c2c2ae9fadf927053150f7fbc625a7c7366;p=gdcm.git

diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx
index 66665db6..4af127cd 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/01 10:29:54 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2005/10/19 12:01:50 $
+  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
@@ -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);
 
 //-----------------------------------------------------------------------------
@@ -39,9 +41,9 @@ DicomDirElement::DicomDirElement()
 {
    std::string filename = DictSet::BuildDictPath() + DICT_ELEM;
    std::ifstream from(filename.c_str());
-   if(!from)
+   if ( !from )
    {
-      gdcmVerboseMacro( "Can't open DicomDirElement dictionary" 
+      gdcmWarningMacro( "Can't open DicomDirElement dictionary" 
                         << filename.c_str());
       FillDefaultDIRDict( this );
    }
@@ -49,7 +51,7 @@ DicomDirElement::DicomDirElement()
    {
       char buff[1024];
       std::string strType;
-      Element elem;
+      DicomElement elem;
       DicomDirType type;
 
       while (!from.eof())
@@ -58,24 +60,24 @@ DicomDirElement::DicomDirElement()
          from.getline(buff, 1024, ' ');
          strType = buff;
 
-         if( strType == "metaElem" )
+         if ( strType == "metaElem" )
             type = DD_META;
-         else if( strType == "patientElem" )
+         else if ( strType == "patientElem" )
             type = DD_PATIENT;
-         else if( strType == "studyElem" )
+         else if ( strType == "studyElem" )
             type = DD_STUDY;
-         else if( strType == "serieElem" )
+         else if ( strType == "serieElem" )
             type = DD_SERIE;
-         else if( strType == "imageElem" )
+         else if ( strType == "imageElem" )
             type = DD_IMAGE;
          else
          {
-            gdcmVerboseMacro("Unknown type found in the file : "
+            gdcmWarningMacro("Unknown type found in the file : "
                              <<filename.c_str());
             type = DD_UNKNOWN;
          }
 
-         if( type!=DD_UNKNOWN )
+         if ( type!=DD_UNKNOWN )
          {
             from >> std::hex >> elem.Group >> elem.Elem;
 
@@ -108,11 +110,12 @@ 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)
+bool DicomDirElement::AddEntry(DicomDirType type, DicomElement const &elem)
 {
    switch( type )
    {
@@ -137,6 +140,23 @@ 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)
+{
+   DicomElement el;
+   el.Group = group;
+   el.Elem  = elem;
+   el.Value = "";
+   AddEntry(type, el);
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -152,42 +172,42 @@ bool DicomDirElement::AddEntry(DicomDirType type, Element const &elem)
 void DicomDirElement::Print(std::ostream &os)
 {
    std::ostringstream s;
-   std::list<Element>::iterator it;
+   std::list<DicomElement>::iterator it;
    //char greltag[10];  //group element tag
-   std::string greltag;
+   TagKey greltag;
 
    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;
    }