X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FmakeDicomDir.cxx;h=4ffd464bf6af83313f0ce96a2457076a350e25a9;hb=edfc14dd195f9759cf02da0959d96d1499d572be;hp=e4b1b5ac15e6c3af91863b56f6480c6d60f0927a;hpb=709489e13fe8c2b2a3f0cff5b5c948fd516bf855;p=gdcm.git diff --git a/Example/makeDicomDir.cxx b/Example/makeDicomDir.cxx index e4b1b5ac..4ffd464b 100644 --- a/Example/makeDicomDir.cxx +++ b/Example/makeDicomDir.cxx @@ -1,3 +1,20 @@ +/*========================================================================= + + Program: gdcm + Module: $RCSfile: makeDicomDir.cxx,v $ + Language: C++ + Date: $Date: 2004/11/16 04:26:18 $ + Version: $Revision: 1.8 $ + + 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 #include "gdcm.h" #include "gdcmDocEntry.h" @@ -5,31 +22,6 @@ #include "gdcmDicomDirPatient.h" #include "gdcmDirList.h" -#include -#ifdef GDCM_NO_ANSI_STRING_STREAM -# include -# define ostringstream ostrstream -# else -# include -#endif - -#define ostringstream ostrstream - -#include -#include - -// for Directory pb -#ifdef _MSC_VER - #include - #include -#else - #include - #include -#endif - -#include -#include - // --- void StartMethod(void *toto) { (void)toto; @@ -52,7 +44,7 @@ void EndMethod(void *toto) { */ int main(int argc, char* argv[]) { - gdcmDicomDir *dcmdir; + gdcm::DicomDir *dcmdir; std::string dirName; if (argc > 1) @@ -60,12 +52,12 @@ int main(int argc, char* argv[]) { else dirName = GDCM_DATA_ROOT; - dcmdir=new gdcmDicomDir(dirName, true); // we ask for Directory parsing + dcmdir = new gdcm::DicomDir(dirName, true); // we ask for Directory parsing dcmdir->SetStartMethod(StartMethod, (void *) NULL); dcmdir->SetEndMethod(EndMethod); - ListDicomDirPatient lp = dcmdir->GetDicomDirPatients(); + gdcm::ListDicomDirPatient lp = dcmdir->GetDicomDirPatients(); if (! lp.size() ) { std::cout << "makeDicomDir: no patient list present. Exiting." @@ -73,7 +65,7 @@ int main(int argc, char* argv[]) { return 1; } - dcmdir->Write("NewDICOMDIR"); + dcmdir->WriteDicomDir("NewDICOMDIR"); std::cout<