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

diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx
index d4831c9b..2769450b 100644
--- a/src/gdcmDicomDirElement.cxx
+++ b/src/gdcmDicomDirElement.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirElement.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/10 00:42:54 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2004/11/04 15:59:37 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,6 +24,9 @@
 #include <fstream>
 #include <iostream>
 
+namespace gdcm 
+{
+void FillDefaultDIRDict(DicomDirElement *dde);
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 
@@ -31,66 +34,54 @@
  * \brief   constructor : populates the chained lists 
  *          from the file 'Dicts/DicomDir.dic'
  */
-gdcmDicomDirElement::gdcmDicomDirElement()
+DicomDirElement::DicomDirElement()
 {
-   std::string filename = gdcmDictSet::BuildDictPath() + std::string(DICT_ELEM);
+   std::string filename = DictSet::BuildDictPath() + DICT_ELEM;
    std::ifstream from(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())
+   if(!from)
+   {
+      dbg.Verbose(2, 
+         "DicomDirElement::DicomDirElement: can't open dictionary", 
+            filename.c_str());
+      FillDefaultDIRDict( this );
+   }
+   else
    {
-      from >> std::ws;
-      from.getline(buff, 1024, ' ');
-      type = buff;
+      char buff[1024];
+      std::string type;
+      Element elem;
 
-      if( (type=="metaElem")  || (type=="patientElem") || 
-          (type=="studyElem") || (type=="serieElem")   || 
-          (type=="imageElem") )
+      while (!from.eof())
       {
-         from >> std::hex >> elem.Group >> elem.Elem;
-
          from >> std::ws;
-         from.getline(buff, 1024, '"');
-         from >> std::ws;
-         from.getline(buff, 1024, '"');
-         elem.Value = buff;
+         from.getline(buff, 1024, ' ');
+         type = 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" )
+         if( type == "metaElem"  || type == "patientElem" || 
+             type == "studyElem" || type == "serieElem"   || 
+             type == "imageElem" )
          {
-            DicomDirImageList.push_back(elem);
+            from >> std::hex >> elem.Group >> elem.Elem;
+
+            from >> std::ws;
+            from.getline(buff, 1024, '"');
+            from >> std::ws;
+            from.getline(buff, 1024, '"');
+            elem.Value = buff;
+
+            AddNewEntry(type, elem);
          }
+         from.getline(buff, 1024, '\n');
       }
-      from.getline(buff, 1024, '\n');
+      from.close();
    }
-   from.close();
 }
 
 /**
- * \ingroup gdcmDicomDirElement
+ * \ingroup DicomDirElement
  * \brief   canonical destructor 
  */
-gdcmDicomDirElement::~gdcmDicomDirElement()
+DicomDirElement::~DicomDirElement()
 {
    DicomDirMetaList.clear();
    DicomDirPatientList.clear();
@@ -102,50 +93,50 @@ 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;
+   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)
    {
-      greltag = gdcmUtil::Format("%04x|%04x ",it->Group,it->Elem);
+      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)
    {
-      greltag = gdcmUtil::Format("%04x|%04x ",it->Group,it->Elem);
+      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)
    {
-      greltag = gdcmUtil::Format("%04x|%04x ", it->Group, it->Elem);
+      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)
    {
-      greltag = gdcmUtil::Format("%04x|%04x ", it->Group, it->Elem);
+      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)
    {
-      greltag = gdcmUtil::Format("%04x|%04x ", it->Group, it->Elem);
+      greltag = Util::Format("%04x|%04x ", it->Group, it->Elem);
       s << "   (" << greltag << ") = " << it->Value << std::endl;
    }
 
@@ -155,6 +146,35 @@ void gdcmDicomDirElement::Print(std::ostream &os)
 //-----------------------------------------------------------------------------
 // Public
 
+bool DicomDirElement::AddNewEntry(std::string const & type, 
+                                  Element const & elem)
+{
+   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);
+   }
+   else
+   {
+     return false;
+   }
+   return true;
+}
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -162,3 +182,5 @@ void gdcmDicomDirElement::Print(std::ostream &os)
 // Private
 
 //-----------------------------------------------------------------------------
+
+} // end namespace gdcm