X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=src%2FgdcmDicomDirElement.cxx;h=d7197ce969d1ef5a049b2d74c8848047d2172df2;hb=be592d55a8d38139cea05c9b22292af14645133b;hp=25afc82dcd1c4be3e4c53161654d51097272db32;hpb=bc3e7a63638ffb3aa7460bf579ae65002ac6770c;p=gdcm.git

diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx
index 25afc82d..d7197ce9 100644
--- a/src/gdcmDicomDirElement.cxx
+++ b/src/gdcmDicomDirElement.cxx
@@ -53,17 +53,16 @@
          elem.value = buff;
 
          if(type=="metaElem")
-            MetaList.push_back(elem);
+             DicomDirMetaList.push_back(elem);
          else if(type=="patientElem")
-            PatientList.push_back(elem);
+            DicomDirPatientList.push_back(elem);
          else if(type=="studyElem")
-            StudyList.push_back(elem);
+            DicomDirStudyList.push_back(elem);
          else if(type=="serieElem")
-            SerieList.push_back(elem);
+            DicomDirSerieList.push_back(elem);
          else if(type=="imageElem")
-            ImageList.push_back(elem);
+            DicomDirImageList.push_back(elem);
       }
-
       from.getline(buff, 1024, '\n');
    }
    from.close();
@@ -74,11 +73,11 @@
  * \brief   destructor 
  */
  gdcmDicomDirElement::~gdcmDicomDirElement() {
-   MetaList.clear();
-   PatientList.clear();
-   StudyList.clear();
-   SerieList.clear();
-   ImageList.clear();
+   DicomDirMetaList.clear();
+   DicomDirPatientList.clear();
+   DicomDirStudyList.clear();
+   DicomDirSerieList.clear();
+   DicomDirImageList.clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -95,35 +94,35 @@ void gdcmDicomDirElement::Print(std::ostream &os) {
    char greltag[10];  //group element tag
 
    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;
    }
 
    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;
    }
 
    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;
    }
 
    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;
    }
 
    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;