From a1d5cc91ff5fed90aa70078fcef84e02a28b4389 Mon Sep 17 00:00:00 2001 From: jpr Date: Thu, 21 Jun 2007 14:47:16 +0000 Subject: [PATCH] replace gdcm:: by GDCM_NAME_SPACE:: --- vtk/vtkGdcmReader.cxx | 26 +++++++++++++------------- vtk/vtkGdcmWriter.h | 12 ++++++------ vtk/vtkgdcmSerieViewer.cxx | 8 ++++---- vtk/vtkgdcmSerieViewer2.cxx | 8 ++++---- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx index 7b862bec..edfdcb36 100644 --- a/vtk/vtkGdcmReader.cxx +++ b/vtk/vtkGdcmReader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkGdcmReader.cxx,v $ Language: C++ - Date: $Date: 2007/06/19 13:09:45 $ - Version: $Revision: 1.90 $ + Date: $Date: 2007/06/21 14:47:16 $ + Version: $Revision: 1.91 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,12 +20,12 @@ // ////////////////////////////////////////////////////////////// // //===> Many users expect from vtkGdcmReader it 'orders' the images -// (that's the job of gdcm::SerieHelper ...) +// (that's the job of GDCM_NAME_SPACE::SerieHelper ...) // When user *knows* the files with same Serie UID // have same sizes, same 'pixel' type, same color convention, ... // the right way to proceed is as follow : // -// gdcm::SerieHelper *sh= new gdcm::SerieHelper(); +// GDCM_NAME_SPACE::SerieHelper *sh= new GDCM_NAME_SPACE::SerieHelper(); // // if user wants *not* to load some parts of the file headers // sh->SetLoadMode(loadMode); // @@ -39,7 +39,7 @@ // // // here, we suppose only the first 'Serie' is of interest // // it's up to the user to decide ! -// gdcm::FileList *l = sh->GetFirstSingleSerieUIDFileSet(); +// GDCM_NAME_SPACE::FileList *l = sh->GetFirstSingleSerieUIDFileSet(); // // // if user is doesn't trust too much the files with same Serie UID // if ( !sh->IsCoherent(l) ) @@ -69,7 +69,7 @@ // // (a *very* simple example is given in vtkgdcmSerieViewer.cxx) // reader->SetUserFunction (userSuppliedFunction); // -// // to pass a 'Coherent File List' as produced by gdcm::SerieHelper +// // to pass a 'Coherent File List' as produced by GDCM_NAME_SPACE::SerieHelper // reader->SetCoherentFileList(l); // reader->Update(); // @@ -92,7 +92,7 @@ #include #include -vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.90 $") +vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.91 $") vtkStandardNewMacro(vtkGdcmReader) //----------------------------------------------------------------------------- @@ -589,14 +589,14 @@ void vtkGdcmReader::GetFileInformation(GDCM_NAME_SPACE::File *file) this->DataSpacing[1] = file->GetYSpacing(); // Most of the file headers have NO z spacing - // It must be calculated from the whole gdcm::Serie (if any) + // It must be calculated from the whole GDCM_NAME_SPACE::Serie (if any) // using Jolinda Smith's algoritm. - // see gdcm::SerieHelper::ImagePositionPatientOrdering() + // see GDCM_NAME_SPACE::SerieHelper::ImagePositionPatientOrdering() if (CoherentFileList == 0) this->DataSpacing[2] = file->GetZSpacing(); else { - // Just because OrderFileList() is a member of gdcm::SerieHelper + // Just because OrderFileList() is a member of GDCM_NAME_SPACE::SerieHelper // we need to instanciate sh. GDCM_NAME_SPACE::SerieHelper *sh = GDCM_NAME_SPACE::SerieHelper::New(); sh->OrderFileList(CoherentFileList); // calls ImagePositionPatientOrdering() @@ -765,8 +765,8 @@ void vtkGdcmReader::IncrementProgress(const unsigned long updateProgressTarget, { vtkDebugMacro(<< "Copying to memory image [" << fileName.c_str() << "]"); - gdcm::File *f; - f = new gdcm::File(); + GDCM_NAME_SPACE::File *f; + f = new GDCM_NAME_SPACE::File(); f->SetLoadMode( LoadMode ); f->SetFileName( fileName.c_str() ); f->Load( ); @@ -778,7 +778,7 @@ void vtkGdcmReader::IncrementProgress(const unsigned long updateProgressTarget, }*/ /* - * Loads the contents of the image/volume contained by gdcm::File* f at + * Loads the contents of the image/volume contained by GDCM_NAME_SPACE::File* f at * the Dest memory address. Returns the size of the data loaded. * \ param f File to consider. NULL if the file must be skiped * \remarks Assume that if (f != NULL) then its caracteristics match diff --git a/vtk/vtkGdcmWriter.h b/vtk/vtkGdcmWriter.h index 6e8c58ec..4d25c828 100644 --- a/vtk/vtkGdcmWriter.h +++ b/vtk/vtkGdcmWriter.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkGdcmWriter.h,v $ Language: C++ - Date: $Date: 2007/06/19 13:09:45 $ - Version: $Revision: 1.11 $ + Date: $Date: 2007/06/21 14:47:16 $ + Version: $Revision: 1.12 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,7 +20,7 @@ #define __vtkGdcmWriter_h #include "gdcmCommon.h" // To avoid warnings concerning the std -#include "gdcmFile.h" // for gdcm::File +#include "gdcmFile.h" // for GDCM_NAME_SPACE::File #include #include @@ -85,9 +85,9 @@ public: //BTX // Description: - // Aware user is allowed to pass his own gdcm::File *, so he may set *any Dicom field* he wants. - // (including his own Shadow Elements, or any gdcm::SeqEntry) - // gdcm::FileHelper::CheckMandatoryElements() will check inconsistencies, as far as it knows how. + // Aware user is allowed to pass his own GDCM_NAME_SPACE::File *, so he may set *any Dicom field* he wants. + // (including his own Shadow Elements, or any GDCM_NAME_SPACE::SeqEntry) + // GDCM_NAME_SPACE::FileHelper::CheckMandatoryElements() will check inconsistencies, as far as it knows how. // Sorry, not yet available under Python. vtkSetMacro(GdcmFile, GDCM_NAME_SPACE::File *); vtkGetMacro(GdcmFile, GDCM_NAME_SPACE::File *); diff --git a/vtk/vtkgdcmSerieViewer.cxx b/vtk/vtkgdcmSerieViewer.cxx index e3de7efc..f081e02b 100644 --- a/vtk/vtkgdcmSerieViewer.cxx +++ b/vtk/vtkgdcmSerieViewer.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkgdcmSerieViewer.cxx,v $ Language: C++ - Date: $Date: 2007/06/19 13:09:45 $ - Version: $Revision: 1.17 $ + Date: $Date: 2007/06/21 14:47:16 $ + Version: $Revision: 1.18 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,7 +16,7 @@ =========================================================================*/ // This example illustrates how the vtkGdcmReader vtk class can -// use the result of gdcm::SerieHelper constructor and check +// use the result of GDCM_NAME_SPACE::SerieHelper constructor and check // the various Setters : // SerieHelper::SetOrderToReverse, // SerieHelper::SetUserLessThanFunction @@ -199,7 +199,7 @@ int main(int argc, char *argv[]) // Just to see int nbFiles; - // For all the 'Single Serie UID' FileSets of the gdcm::Serie + // For all the 'Single Serie UID' FileSets of the GDCM_NAME_SPACE::Serie GDCM_NAME_SPACE::FileList *l = sh->GetFirstSingleSerieUIDFileSet(); if (l == 0 ) { diff --git a/vtk/vtkgdcmSerieViewer2.cxx b/vtk/vtkgdcmSerieViewer2.cxx index 83a381f7..7b108e37 100755 --- a/vtk/vtkgdcmSerieViewer2.cxx +++ b/vtk/vtkgdcmSerieViewer2.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkgdcmSerieViewer2.cxx,v $ Language: C++ - Date: $Date: 2007/06/19 13:09:45 $ - Version: $Revision: 1.10 $ + Date: $Date: 2007/06/21 14:47:16 $ + Version: $Revision: 1.11 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,7 +16,7 @@ =========================================================================*/ // This example illustrates how the vtkGdcmReader vtk class can -// use the result of gdcm::SerieHelper constructor and check +// use the result of GDCM_NAME_SPACE::SerieHelper constructor and check // the various Setters : // SerieHelper::SetOrderToReverse, // SerieHelper::SetUserLessThanFunction @@ -204,7 +204,7 @@ int main(int argc, char *argv[]) // Just to see int nbFiles; - // For all the 'Single Serie UID' FileSets of the gdcm::Serie + // For all the 'Single Serie UID' FileSets of the GDCM_NAME_SPACE::Serie GDCM_NAME_SPACE::FileList *l = sh->GetFirstSingleSerieUIDFileSet(); if (l == 0 ) { -- 2.45.1