X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirElement.cxx;h=d4831c9b062bf084b01075c34842c9d5c9191671;hb=ac11759a2c7fcb32a6e0d2efdc8bb03982ae349e;hp=cc83188dd8e4926c0d731f44611de96b9954cfbe;hpb=fae5f95ae8cf044c024b1793b94032c9368f0f4b;p=gdcm.git

diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx
index cc83188d..d4831c9b 100644
--- a/src/gdcmDicomDirElement.cxx
+++ b/src/gdcmDicomDirElement.cxx
@@ -1,124 +1,152 @@
-// gdcmDicomDirElement.cxx
-//-----------------------------------------------------------------------------
-#include <fstream>
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirElement.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/10/10 00:42:54 $
+  Version:   $Revision: 1.19 $
+                                                                                
+  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 "gdcmDicomDirElement.h"
 #include "gdcmUtil.h"
+#include "gdcmDebug.h"
+#include "gdcmDictSet.h"
 
-#ifndef PUB_DICT_PATH
-#  define PUB_DICT_PATH     "../Dicts/"
-#endif
-#define DICT_ELEM "DicomDir.dic"
-
+#include <fstream>
 #include <iostream>
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
-gdcmDicomDirElement::gdcmDicomDirElement(void) 
+
+/**
+ * \brief   constructor : populates the chained lists 
+ *          from the file 'Dicts/DicomDir.dic'
+ */
+gdcmDicomDirElement::gdcmDicomDirElement()
 {
-   std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_ELEM);
+   std::string filename = gdcmDictSet::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, "gdcmDicomDirElement::gdcmDicomDirElement: can't open dictionary",
+              filename.c_str());
 
    char buff[1024];
    std::string type;
    gdcmElement elem;
 
-   while (!from.eof()) {
-      eatwhite(from);
+   while (!from.eof())
+   {
+      from >> std::ws;
       from.getline(buff, 1024, ' ');
       type = buff;
 
-      if( (type=="metaElem") || (type=="patientElem") || 
-          (type=="studyElem") || (type=="serieElem") || 
+      if( (type=="metaElem")  || (type=="patientElem") || 
+          (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")
-            MetaList.push_back(elem);
-         else if(type=="patientElem")
-            PatientList.push_back(elem);
-         else if(type=="studyElem")
-            StudyList.push_back(elem);
-         else if(type=="serieElem")
-            SerieList.push_back(elem);
-         else if(type=="imageElem")
-            ImageList.push_back(elem);
+         elem.Value = buff;
+
+         if( type == "metaElem" )
+         {
+            DicomDirMetaList.push_back(elem);
+         }
+         else if( type == "patientElem" )
+         {
+            DicomDirPatientList.push_back(elem);
+         }
+         else if( type == "studyElem" )
+         {
+            DicomDirStudyList.push_back(elem);
+         }
+         else if( type == "serieElem" )
+         {
+            DicomDirSerieList.push_back(elem);
+         }
+         else if( type == "imageElem" )
+         {
+            DicomDirImageList.push_back(elem);
+         }
       }
-
       from.getline(buff, 1024, '\n');
    }
    from.close();
 }
 
-gdcmDicomDirElement::~gdcmDicomDirElement() 
+/**
+ * \ingroup gdcmDicomDirElement
+ * \brief   canonical destructor 
+ */
+gdcmDicomDirElement::~gdcmDicomDirElement()
 {
-   MetaList.clear();
-   PatientList.clear();
-   StudyList.clear();
-   SerieList.clear();
-   ImageList.clear();
+   DicomDirMetaList.clear();
+   DicomDirPatientList.clear();
+   DicomDirStudyList.clear();
+   DicomDirSerieList.clear();
+   DicomDirImageList.clear();
 }
 
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmVR
- * \brief   Print all 
+ * \ingroup gdcmDicomDirElement
+ * \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 gdcmDicomDirElement::Print(std::ostream &os)
 {
    std::ostringstream s;
    std::list<gdcmElement>::iterator it;
-   char greltag[10];  //group element tag
+   //char greltag[10];  //group element tag
+   std::string greltag;
 
    s << "Meta Elements :"<<std::endl;
-   for (it = MetaList.begin();it!=MetaList.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 = gdcmUtil::Format("%04x|%04x ",it->Group,it->Elem);
+      s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Patient Elements :"<<std::endl;
-   for (it = PatientList.begin();it!=PatientList.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 = gdcmUtil::Format("%04x|%04x ",it->Group,it->Elem);
+      s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Study Elements :"<<std::endl;
-   for (it = StudyList.begin();it!=StudyList.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 = gdcmUtil::Format("%04x|%04x ", it->Group, it->Elem);
+      s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Serie Elements :"<<std::endl;
-   for (it = SerieList.begin();it!=SerieList.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 = gdcmUtil::Format("%04x|%04x ", it->Group, it->Elem);
+      s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    s << "Image Elements :"<<std::endl;
-   for (it = ImageList.begin();it!=ImageList.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 = gdcmUtil::Format("%04x|%04x ", it->Group, it->Elem);
+      s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
    os << s.str();