From: jpr Date: Fri, 6 Feb 2004 15:44:43 +0000 (+0000) Subject: Ops! The last Meta tag was missing X-Git-Tag: Version0.5.bp~320 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3254711a6889bec203e228090cf2ae960fa78af1;p=gdcm.git Ops! The last Meta tag was missing --- diff --git a/Testing/TestDicomDir.cxx b/Testing/TestDicomDir.cxx index 84d41113..37f842f1 100644 --- a/Testing/TestDicomDir.cxx +++ b/Testing/TestDicomDir.cxx @@ -48,7 +48,7 @@ int main(int argc, char* argv[]) // Exemples exploitation de la structure -// DON'T REMOVE neither the folowong code, nor the commented out lines +// DON'T REMOVE neither the folowing code, nor the commented out lines cout << std::endl << std::endl @@ -130,10 +130,6 @@ int main(int argc, char* argv[]) */ -// DICOM DIR - -//What about the META informations? - cout << std::endl << std::endl << " = Contenu Complet du DICOMDIR ==========================================" << std::endl<< std::endl; diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index cb54ee51..3592304d 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -202,16 +202,15 @@ void gdcmDicomDir::CreateDicomDir() begin=listEntries.begin(); end=begin; - for(ListTag::iterator j=listEntries.begin();j !=listEntries.end();++j) + for(ListTag::iterator j=begin;j !=listEntries.end();++j) { if((*j)->GetValue()=="PATIENT ") { k = j; break; } - AddObjectToEnd(gdcmDicomDir::GDCM_META,begin,j); } + AddObjectToEnd(gdcmDicomDir::GDCM_META,begin,k); -// for(ListTag::iterator i=listEntries.begin();i !=listEntries.end();++i) for(ListTag::iterator i=k;i !=listEntries.end();++i) { std::string v=(*i)->GetValue(); diff --git a/src/gdcmMeta.cxx b/src/gdcmMeta.cxx index 52bb3ad6..aedc2a43 100644 --- a/src/gdcmMeta.cxx +++ b/src/gdcmMeta.cxx @@ -1,4 +1,4 @@ -// gdcmMeta.cxx +// gdcmMeta.h //----------------------------------------------------------------------------- #include "gdcmMeta.h" @@ -8,7 +8,7 @@ * \ingroup gdcmMeta * \brief * @param begin iterator of begin for the object - * @param end iterator of end for the object + * @param end iterator of end for the object */ gdcmMeta::gdcmMeta(ListTag::iterator begin,ListTag::iterator end): gdcmObject(begin,end) @@ -32,9 +32,7 @@ gdcmMeta::~gdcmMeta() */ void gdcmMeta::Print(std::ostream &os) { - os<<"META : "; - os<