X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirElement.cxx;h=d0bc124b95ebd851c98fc5ea881b1f2ffd72de0a;hb=d458de05c75d91f722d31020cd1a96745caf382f;hp=0545ddf3a6054f7d0ac492ae908cdba9151ff9e8;hpb=9ca0e4bb2208be93bebf21d0c5d75c8018e7605a;p=gdcm.git

diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx
index 0545ddf3..d0bc124b 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/06/24 10:55:58 $
-  Version:   $Revision: 1.38 $
+  Date:      $Date: 2005/11/04 15:29:59 $
+  Version:   $Revision: 1.42 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -51,7 +51,7 @@ DicomDirElement::DicomDirElement()
    {
       char buff[1024];
       std::string strType;
-      Element elem;
+      DicomElement elem;
       DicomDirType type;
 
       while (!from.eof())
@@ -60,20 +60,21 @@ DicomDirElement::DicomDirElement()
          from.getline(buff, 1024, ' ');
          strType = buff;
 
-         if ( strType == "metaElem" )
-            type = DD_META;
-         else if ( strType == "patientElem" )
-            type = DD_PATIENT;
-         else if ( strType == "studyElem" )
-            type = DD_STUDY;
+         if ( strType == "imageElem" )
+            type = DD_IMAGE;
          else if ( strType == "serieElem" )
             type = DD_SERIE;
-         else if ( strType == "imageElem" )
-            type = DD_IMAGE;
+         else if ( strType == "studyElem" )
+            type = DD_STUDY;
+         else if ( strType == "patientElem" )
+            type = DD_PATIENT;
+         else if ( strType == "metaElem" )
+            type = DD_META;
          else
          {
-            gdcmWarningMacro("Unknown type found in the file : "
-                             <<filename.c_str());
+            gdcmWarningMacro("Unknown type (" << strType 
+                             << ") found in the file : "
+                             << filename.c_str());
             type = DD_UNKNOWN;
          }
 
@@ -115,24 +116,24 @@ DicomDirElement::~DicomDirElement()
  * @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 )
    {
-      case DD_META :
-         DicomDirMetaList.push_back(elem);
+      case DD_IMAGE :
+         DicomDirImageList.push_back(elem);
          break;
-      case DD_PATIENT :
-         DicomDirPatientList.push_back(elem);
+      case DD_SERIE :
+         DicomDirSerieList.push_back(elem);
          break;
       case DD_STUDY :
          DicomDirStudyList.push_back(elem);
          break;
-      case DD_SERIE :
-         DicomDirSerieList.push_back(elem);
+      case DD_PATIENT :
+         DicomDirPatientList.push_back(elem);
          break;
-      case DD_IMAGE :
-         DicomDirImageList.push_back(elem);
+      case DD_META :
+         DicomDirMetaList.push_back(elem);
          break;
       default :
          return false;
@@ -150,12 +151,13 @@ bool DicomDirElement::AddEntry(DicomDirType type, Element const &elem)
 void DicomDirElement::AddDicomDirElement(DicomDirType type,
                                          uint16_t group, uint16_t elem)
 {
-   Element el;
+   DicomElement el;
    el.Group = group;
    el.Elem  = elem;
    el.Value = "";
    AddEntry(type, el);
 }
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -168,12 +170,12 @@ void DicomDirElement::AddDicomDirElement(DicomDirType type,
  * \brief   Print all
  * @param   os The output stream to be written to.
  */
-void DicomDirElement::Print(std::ostream &os)
+void DicomDirElement::Print(std::ostream &os,std::string const &)
 {
    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)