X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirElement.cxx;h=aefcd12d74d9f4d9767e933db051c5e29ac8ca72;hb=867b8ef63054497249cc3a0138107383d60351dc;hp=e7a1fdb14078dbe4a7bb188163191ea5e01c3c5c;hpb=19f72d139faa0f6a03f4e4a33be4c6b3e70b18b7;p=gdcm.git

diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx
index e7a1fdb1..aefcd12d 100644
--- a/src/gdcmDicomDirElement.cxx
+++ b/src/gdcmDicomDirElement.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirElement.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/23 03:36:24 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2004/10/12 04:35:44 $
+  Version:   $Revision: 1.20 $
                                                                                 
   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.htm for details.
+  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
@@ -16,15 +16,15 @@
                                                                                 
 =========================================================================*/
 
-#include <fstream>
-#include <stdio.h>    // For sprintf
-#include <iostream>
-
 #include "gdcmDicomDirElement.h"
 #include "gdcmUtil.h"
 #include "gdcmDebug.h"
 #include "gdcmDictSet.h"
 
+#include <fstream>
+#include <iostream>
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -33,17 +33,20 @@
  * \brief   constructor : populates the chained lists 
  *          from the file 'Dicts/DicomDir.dic'
  */
-gdcmDicomDirElement::gdcmDicomDirElement() {
-   std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_ELEM);
+DicomDirElement::DicomDirElement()
+{
+   std::string filename = DictSet::BuildDictPath() + std::string(DICT_ELEM);
    std::ifstream from(filename.c_str());
-   dbg.Error(!from, "gdcmDicomDirElement::gdcmDicomDirElement: can't open dictionary",filename.c_str());
+   dbg.Error(!from, "DicomDirElement::DicomDirElement: can't open dictionary",
+              filename.c_str());
 
    char buff[1024];
    std::string type;
-   gdcmElement elem;
+   Element elem;
 
-   while (!from.eof()) {
-      eatwhite(from);
+   while (!from.eof())
+   {
+      from >> std::ws;
       from.getline(buff, 1024, ' ');
       type = buff;
 
@@ -51,24 +54,34 @@ gdcmDicomDirElement::gdcmDicomDirElement() {
           (type=="studyElem") || (type=="serieElem")   || 
           (type=="imageElem") )
       {
-         from >> std::hex >> elem.group >> elem.elem;
+         from >> std::hex >> elem.Group >> elem.Elem;
 
-         eatwhite(from);
+         from >> std::ws;
          from.getline(buff, 1024, '"');
-         eatwhite(from);
+         from >> std::ws;
          from.getline(buff, 1024, '"');
-         elem.value = buff;
-
-         if(type=="metaElem")
-             DicomDirMetaList.push_back(elem);
-         else if(type=="patientElem")
+         elem.Value = buff;
+
+         if( type == "metaElem" )
+         {
+            DicomDirMetaList.push_back(elem);
+         }
+         else if( type == "patientElem" )
+         {
             DicomDirPatientList.push_back(elem);
-         else if(type=="studyElem")
+         }
+         else if( type == "studyElem" )
+         {
             DicomDirStudyList.push_back(elem);
-         else if(type=="serieElem")
+         }
+         else if( type == "serieElem" )
+         {
             DicomDirSerieList.push_back(elem);
-         else if(type=="imageElem")
+         }
+         else if( type == "imageElem" )
+         {
             DicomDirImageList.push_back(elem);
+         }
       }
       from.getline(buff, 1024, '\n');
    }
@@ -76,10 +89,11 @@ gdcmDicomDirElement::gdcmDicomDirElement() {
 }
 
 /**
- * \ingroup gdcmDicomDirElement
+ * \ingroup DicomDirElement
  * \brief   canonical destructor 
  */
-gdcmDicomDirElement::~gdcmDicomDirElement() {
+DicomDirElement::~DicomDirElement()
+{
    DicomDirMetaList.clear();
    DicomDirPatientList.clear();
    DicomDirStudyList.clear();
@@ -90,49 +104,51 @@ gdcmDicomDirElement::~gdcmDicomDirElement() {
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmDicomDirElement
+ * \ingroup DicomDirElement
  * \brief   Print all
  * \todo add a 'Print Level' check 
  * @param   os The output stream to be written to.
  */
-void gdcmDicomDirElement::Print(std::ostream &os) {
+void DicomDirElement::Print(std::ostream &os)
+{
    std::ostringstream s;
-   std::list<gdcmElement>::iterator it;
-   char greltag[10];  //group element tag
+   std::list<Element>::iterator it;
+   //char greltag[10];  //group element tag
+   std::string greltag;
 
    s << "Meta Elements :"<<std::endl;
-   for (it = DicomDirMetaList.begin();it!=DicomDirMetaList.end();++it)
+   for (it = DicomDirMetaList.begin(); it != DicomDirMetaList.end(); ++it)
    {
-      sprintf(greltag,"%04x|%04x ",it->group,it->elem);
-      s << "   ("<<greltag<<") = "<< it->value<<std::endl;
+      greltag = Util::Format("%04x|%04x ",it->Group,it->Elem);
+      s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Patient Elements :"<<std::endl;
-   for (it = DicomDirPatientList.begin();it!=DicomDirPatientList.end();++it)
+   for (it = DicomDirPatientList.begin(); it != DicomDirPatientList.end(); ++it)
    {
-      sprintf(greltag,"%04x|%04x ",it->group,it->elem);
-      s << "   ("<<greltag<<") = "<< it->value<<std::endl;
+      greltag = Util::Format("%04x|%04x ",it->Group,it->Elem);
+      s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Study Elements :"<<std::endl;
-   for (it = DicomDirStudyList.begin();it!=DicomDirStudyList.end();++it)
+   for (it = DicomDirStudyList.begin(); it != DicomDirStudyList.end(); ++it)
    {
-      sprintf(greltag,"%04x|%04x ",it->group,it->elem);
-      s << "   ("<<greltag<<") = "<< it->value<<std::endl;
+      greltag = Util::Format("%04x|%04x ", it->Group, it->Elem);
+      s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Serie Elements :"<<std::endl;
-   for (it = DicomDirSerieList.begin();it!=DicomDirSerieList.end();++it)
+   for (it = DicomDirSerieList.begin(); it != DicomDirSerieList.end(); ++it)
    {
-      sprintf(greltag,"%04x|%04x ",it->group,it->elem);
-      s << "   ("<<greltag<<") = "<< it->value<<std::endl;
+      greltag = Util::Format("%04x|%04x ", it->Group, it->Elem);
+      s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Image Elements :"<<std::endl;
-   for (it = DicomDirImageList.begin();it!=DicomDirImageList.end();++it)
+   for (it = DicomDirImageList.begin(); it != DicomDirImageList.end(); ++it)
    {
-      sprintf(greltag,"%04x|%04x ",it->group,it->elem);
-      s << "   ("<<greltag<<") = "<< it->value<<std::endl;
+      greltag = Util::Format("%04x|%04x ", it->Group, it->Elem);
+      s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    os << s.str();
@@ -148,3 +164,5 @@ void gdcmDicomDirElement::Print(std::ostream &os) {
 // Private
 
 //-----------------------------------------------------------------------------
+
+} // end namespace gdcm