X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirElement.cxx;h=b7517e8d577762114bfd6c9a9b7ca62bc73d1ded;hb=7a06c1759c4f03b6c8dc7780bfda9b508a2250c5;hp=c26b9d32ae87c4f4167f633a99dec15d32867ee1;hpb=be70f5cdc8ac472bff8ad8a36637457fe49778bd;p=gdcm.git

diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx
index c26b9d32..b7517e8d 100644
--- a/src/gdcmDicomDirElement.cxx
+++ b/src/gdcmDicomDirElement.cxx
@@ -1,42 +1,51 @@
-// gdcmDicomDirElement.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDirElement.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/08/27 15:48:44 $
+  Version:   $Revision: 1.15 $
+                                                                                
+  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.
+                                                                                
+     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 <fstream>
 #include <stdio.h>    // For sprintf
+#include <iostream>
 
 #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 <iostream>
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 
 /**
- * \ingroup gdcmDicomDirElement
  * \brief   constructor : populates the chained lists 
  *          from the file 'Dicts/DicomDir.dic'
  */
- gdcmDicomDirElement::gdcmDicomDirElement(void) {
-   std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_ELEM);
+gdcmDicomDirElement::gdcmDicomDirElement()
+{
+   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()) {
+   while (!from.eof())
+   {
       eatwhite(from);
       from.getline(buff, 1024, ' ');
       type = buff;
@@ -53,16 +62,26 @@
          from.getline(buff, 1024, '"');
          elem.value = buff;
 
-         if(type=="metaElem")
-             DicomDirMetaList.push_back(elem);
-         else if(type=="patientElem")
+         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');
    }
@@ -73,7 +92,8 @@
  * \ingroup gdcmDicomDirElement
  * \brief   canonical destructor 
  */
- gdcmDicomDirElement::~gdcmDicomDirElement() {
+gdcmDicomDirElement::~gdcmDicomDirElement()
+{
    DicomDirMetaList.clear();
    DicomDirPatientList.clear();
    DicomDirStudyList.clear();
@@ -89,41 +109,42 @@
  * \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
 
    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;
    }
 
    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;
    }
 
    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;
    }
 
    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;
    }
 
    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;