From: davila Date: Tue, 19 Jun 2007 13:09:43 +0000 (+0000) Subject: Name Space X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=16ba07627dcf6058da9bbabd2161581823487e3b;p=gdcm.git Name Space --- diff --git a/CMake/UseGDCM.cmake b/CMake/UseGDCM.cmake index b1dc2282..72152fa3 100644 --- a/CMake/UseGDCM.cmake +++ b/CMake/UseGDCM.cmake @@ -42,6 +42,7 @@ IF(NOT GDCM_USE_FILE_INCLUDED) FIND_PACKAGE(VTK) IF(VTK_FOUND) INCLUDE(${VTK_USE_FILE}) + set(GDCM_LIBRARIES ${GDCM_LIBRARIES} " vtkgdcm" ) ELSE(VTK_FOUND) MESSAGE("VTK not found in GDCM_VTK_DIR=\"${GDCM_VTK_DIR}\".") ENDIF(VTK_FOUND) diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt index 36d45bbc..d9a740c3 100644 --- a/Example/CMakeLists.txt +++ b/Example/CMakeLists.txt @@ -1,69 +1 @@ -# include stuff -INCLUDE_DIRECTORIES( - ${GDCM_SOURCE_DIR}/src - ${GDCM_BINARY_DIR} - ${GDCM_BINARY_DIR}/src -) - -SET(EXAMPLE_SOURCES -#names starting with 'ex' are examples - #Txt2Mat - #exDicomRTStructSetFile - #exExtractCSA - exReadPapyrus - exReadWriteFile - exColorToRGB - exGrey2RGB - exGC - exImageLighten - #exInLine - exOverlaysACR - exOverlaysDCM - exCurveData - exExtractTag - exSerieHelper - exXCoherentFileSet - exExtractDicomTags - exMoveImagesToSingleSerieUID - -#the following are utilities - - PrintDicomDir - PrintFile - MakeDicomDir - AnonymizeDicomDir # without loading it as a gdcm::DicomDir - Anonymize # for full gdcm readable files - AnonymizeNoLoad # without loading the Pixel Data - AnonymizeMultiPatient # without loading the Pixel Data - PatchHeader - ToInTag - #MagnetomVisionToBrucker - ReWrite - ReWriteExtended - RawToDicom - TestValidate - ToMRIregister - #BatchUncompress - ExtractOverlays - -#the following will be transformed into 'examples', or 'utilities' -# or will be removed -# -# Better you don't use them (not fully checked ...) - - FindTags - FlatHashTablePrint - Volume2Dicom - WriteDicomSimple - WriteRead - #WriteDicomAsJPEG - exCTPET - #Slice -) - -FOREACH(name ${EXAMPLE_SOURCES}) - ADD_EXECUTABLE(${name} ${name}.cxx ) - TARGET_LINK_LIBRARIES(${name} gdcm) - INSTALL_TARGETS(/bin/ ${name}) -ENDFOREACH(name) - +# include stuffINCLUDE_DIRECTORIES( ${GDCM_SOURCE_DIR}/src ${GDCM_BINARY_DIR} ${GDCM_BINARY_DIR}/src)SET(EXAMPLE_SOURCES#names starting with 'ex' are examples #Txt2Mat #exDicomRTStructSetFile #exExtractCSA exReadPapyrus exReadWriteFile exColorToRGB exGrey2RGB exGC exImageLighten #exInLine exOverlaysACR exOverlaysDCM exCurveData exExtractTag exSerieHelper exXCoherentFileSet exExtractDicomTags exMoveImagesToSingleSerieUID#the following are utilities PrintDicomDir PrintFile MakeDicomDir AnonymizeDicomDir # without loading it as a gdcm::DicomDir Anonymize # for full gdcm readable files AnonymizeNoLoad # without loading the Pixel Data AnonymizeMultiPatient # without loading the Pixel Data PatchHeader ToInTag #MagnetomVisionToBrucker ReWrite ReWriteExtended RawToDicom TestValidate ToMRIregister #BatchUncompress ExtractOverlays #the following will be transformed into 'examples', or 'utilities'# or will be removed## Better you don't use them (not fully checked ...) FindTags FlatHashTablePrint Volume2Dicom WriteDicomSimple WriteRead #WriteDicomAsJPEG exCTPET #Slice)FOREACH(name ${EXAMPLE_SOURCES}) ADD_EXECUTABLE(${name} ${name}.cxx ) TARGET_LINK_LIBRARIES(${name} gdcm) INSTALL_TARGETS(/bin/ ${name})ENDFOREACH(name) \ No newline at end of file diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i index 91206450..b18b5ee5 100644 --- a/gdcmPython/gdcm.i +++ b/gdcmPython/gdcm.i @@ -164,13 +164,13 @@ typedef unsigned long long uint64_t; %ignore GDCM_VRUNKNOWN; %ignore GDCM_FILESEPARATOR; -%constant const char *UNKNOWN = "gdcm::Unknown"; -%constant const char *UNFOUND = "gdcm::Unfound"; -%constant const char *BINLOADED = "gdcm::Binary data loaded"; -%constant const char *NOTLOADED = "gdcm::NotLoaded"; -%constant const char *UNREAD = "gdcm::UnRead"; -%constant const char *GDCM_NOTASCII = "gdcm::NotAscii"; -%constant const char *GDCM_PIXELDATA = "gdcm::Pixel Data to be loaded"; +%constant const char *UNKNOWN = "GDCM_NAME_SPACE::Unknown"; +%constant const char *UNFOUND = "GDCM_NAME_SPACE::Unfound"; +%constant const char *BINLOADED = "GDCM_NAME_SPACE::Binary data loaded"; +%constant const char *NOTLOADED = "GDCM_NAME_SPACE::NotLoaded"; +%constant const char *UNREAD = "GDCM_NAME_SPACE::UnRead"; +%constant const char *GDCM_NOTASCII = "GDCM_NAME_SPACE::NotAscii"; +%constant const char *GDCM_PIXELDATA = "GDCM_NAME_SPACE::Pixel Data to be loaded"; %constant const char *VRUNKNOWN = " "; %constant const char GDCM_FILESEPARATOR = '\\'; //////////////////////////////////////////////////////////////////////////// diff --git a/src/gdcmGlobal.cxx b/src/gdcmGlobal.cxx index 2f523fc2..3c6f927f 100644 --- a/src/gdcmGlobal.cxx +++ b/src/gdcmGlobal.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmGlobal.cxx,v $ Language: C++ - Date: $Date: 2007/05/23 14:18:10 $ - Version: $Revision: 1.34 $ + Date: $Date: 2007/06/19 13:09:45 $ + Version: $Revision: 1.35 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -35,13 +35,13 @@ namespace GDCM_NAME_SPACE /// Therefore the actual initialization is done in a cxx file (avoid /// duplicated symbol), and an extern is used in gdcmCommon.h -const std::string GDCM_UNKNOWN = "gdcm::Unknown"; -const std::string GDCM_UNFOUND = "gdcm::Unfound"; -const std::string GDCM_BINLOADED = "gdcm::Binary data loaded"; -const std::string GDCM_NOTLOADED = "gdcm::NotLoaded"; -const std::string GDCM_UNREAD = "gdcm::UnRead"; -const std::string GDCM_NOTASCII = "gdcm::NotAscii"; -const std::string GDCM_PIXELDATA = "gdcm::Pixel Data to be loaded"; +const std::string GDCM_UNKNOWN = "GDCM_NAME_SPACE::Unknown"; +const std::string GDCM_UNFOUND = "GDCM_NAME_SPACE::Unfound"; +const std::string GDCM_BINLOADED = "GDCM_NAME_SPACE::Binary data loaded"; +const std::string GDCM_NOTLOADED = "GDCM_NAME_SPACE::NotLoaded"; +const std::string GDCM_UNREAD = "GDCM_NAME_SPACE::UnRead"; +const std::string GDCM_NOTASCII = "GDCM_NAME_SPACE::NotAscii"; +const std::string GDCM_PIXELDATA = "GDCM_NAME_SPACE::Pixel Data to be loaded"; const char GDCM_VRUNKNOWN[2] = {' ',' '}; // avoid useless std::string stuff diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx index af682aad..7b862bec 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/08 12:39:07 $ - Version: $Revision: 1.89 $ + Date: $Date: 2007/06/19 13:09:45 $ + Version: $Revision: 1.90 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -92,7 +92,7 @@ #include #include -vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.89 $") +vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.90 $") vtkStandardNewMacro(vtkGdcmReader) //----------------------------------------------------------------------------- @@ -102,7 +102,7 @@ vtkGdcmReader::vtkGdcmReader() this->LookupTable = NULL; this->AllowLookupTable = false; //this->AllowLightChecking = false; - this->LoadMode = gdcm::LD_ALL; // Load everything (possible values : + this->LoadMode = GDCM_NAME_SPACE::LD_ALL; // Load everything (possible values : // - LD_NOSEQ, // - LD_NOSHADOW, // - LD_NOSHADOWSEQ) @@ -370,7 +370,7 @@ void vtkGdcmReader::ExecuteData(vtkDataObject *output) size_t size = this->NumColumns * this->NumLines * this->NumPlanes * data->GetScalarSize() * this->NumComponents; unsigned char *Dest = (unsigned char *)data->GetScalarPointer(); - for (std::vector::iterator it = InternalFileList.begin(); + for (std::vector::iterator it = InternalFileList.begin(); it != InternalFileList.end(); ++it) { @@ -464,7 +464,7 @@ void vtkGdcmReader::BuildFileListFromPattern() */ void vtkGdcmReader::LoadFileInformation() { - gdcm::File *file; + GDCM_NAME_SPACE::File *file; bool foundReference=false; std::string type; @@ -488,7 +488,7 @@ void vtkGdcmReader::LoadFileInformation() fclose(fp); // Read the file - file=gdcm::File::New(); + file=GDCM_NAME_SPACE::File::New(); file->SetLoadMode( LoadMode ); file->SetFileName(filename->c_str() ); file->Load(); @@ -570,7 +570,7 @@ void vtkGdcmReader::UpdateFileInformation() * These informations are required to specify the output image * caracteristics */ -void vtkGdcmReader::GetFileInformation(gdcm::File *file) +void vtkGdcmReader::GetFileInformation(GDCM_NAME_SPACE::File *file) { // Get the image caracteristics this->NumColumns = file->GetXSize(); @@ -598,7 +598,7 @@ void vtkGdcmReader::GetFileInformation(gdcm::File *file) { // Just because OrderFileList() is a member of gdcm::SerieHelper // we need to instanciate sh. - gdcm::SerieHelper *sh = gdcm::SerieHelper::New(); + GDCM_NAME_SPACE::SerieHelper *sh = GDCM_NAME_SPACE::SerieHelper::New(); sh->OrderFileList(CoherentFileList); // calls ImagePositionPatientOrdering() this->DataSpacing[2] = sh->GetZSpacing(); sh->Delete(); @@ -643,7 +643,7 @@ void vtkGdcmReader::GetFileInformation(gdcm::File *file) * * \return True if the file match, False otherwise */ -bool vtkGdcmReader::TestFileInformation(gdcm::File *file) +bool vtkGdcmReader::TestFileInformation(GDCM_NAME_SPACE::File *file) { int numColumns = file->GetXSize(); int numLines = file->GetYSize(); @@ -785,7 +785,7 @@ void vtkGdcmReader::IncrementProgress(const unsigned long updateProgressTarget, * with the previous ones */ void vtkGdcmReader::LoadImageInMemory( - gdcm::File *f, + GDCM_NAME_SPACE::File *f, unsigned char *dest, const unsigned long updateProgressTarget, unsigned long &updateProgressCount) @@ -793,7 +793,7 @@ void vtkGdcmReader::LoadImageInMemory( if(!f) return; - gdcm::FileHelper *fileH = gdcm::FileHelper::New( f ); + GDCM_NAME_SPACE::FileHelper *fileH = GDCM_NAME_SPACE::FileHelper::New( f ); fileH->SetUserFunction( UserFunction ); int numColumns = f->GetXSize(); diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h index 0ec7fe81..c3da1302 100644 --- a/vtk/vtkGdcmReader.h +++ b/vtk/vtkGdcmReader.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkGdcmReader.h,v $ Language: C++ - Date: $Date: 2007/06/08 12:43:19 $ - Version: $Revision: 1.32 $ + Date: $Date: 2007/06/19 13:09:45 $ + Version: $Revision: 1.33 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,7 +27,7 @@ #include #include -typedef void (*VOID_FUNCTION_PUINT8_PFILE_POINTER)(uint8_t *, gdcm::File *); +typedef void (*VOID_FUNCTION_PUINT8_PFILE_POINTER)(uint8_t *, GDCM_NAME_SPACE::File *); //----------------------------------------------------------------------------- class vtkLookupTable; @@ -45,7 +45,7 @@ public: virtual void SetFileName(const char *name); //BTX - void SetCoherentFileList( std::vector *cfl) { + void SetCoherentFileList( std::vector *cfl) { CoherentFileList = cfl; } //ETX @@ -106,8 +106,8 @@ protected: virtual void LoadFileInformation(); virtual void UpdateFileInformation(); //BTX - virtual void GetFileInformation(gdcm::File *file); - virtual bool TestFileInformation(gdcm::File *file); + virtual void GetFileInformation(GDCM_NAME_SPACE::File *file); + virtual bool TestFileInformation(GDCM_NAME_SPACE::File *file); //ETX private: @@ -122,14 +122,14 @@ private: const unsigned long updateProgressTarget, unsigned long &updateProgressCount);*/ - void LoadImageInMemory(gdcm::File *f, unsigned char *dest, + void LoadImageInMemory(GDCM_NAME_SPACE::File *f, unsigned char *dest, const unsigned long updateProgressTarget, unsigned long &updateProgressCount); //ETX // Variables //BTX - typedef std::vector gdcmFileList; + typedef std::vector gdcmFileList; //ETX vtkLookupTable *LookupTable; diff --git a/vtk/vtkGdcmWriter.cxx b/vtk/vtkGdcmWriter.cxx index eacec2af..7baa71ac 100644 --- a/vtk/vtkGdcmWriter.cxx +++ b/vtk/vtkGdcmWriter.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkGdcmWriter.cxx,v $ Language: C++ - Date: $Date: 2006/05/11 15:12:00 $ - Version: $Revision: 1.33 $ + Date: $Date: 2007/06/19 13:09:45 $ + Version: $Revision: 1.34 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -33,7 +33,7 @@ #define vtkFloatingPointType float #endif -vtkCxxRevisionMacro(vtkGdcmWriter, "$Revision: 1.33 $") +vtkCxxRevisionMacro(vtkGdcmWriter, "$Revision: 1.34 $") vtkStandardNewMacro(vtkGdcmWriter) vtkCxxSetObjectMacro(vtkGdcmWriter,LookupTable,vtkLookupTable); @@ -142,7 +142,7 @@ size_t ReverseData(vtkImageData *image,unsigned char **data) * vtkMedicalImageProperties */ #if (VTK_MAJOR_VERSION >= 5) -void SetMedicalImageInformation(gdcm::FileHelper *file, vtkMedicalImageProperties *medprop) +void SetMedicalImageInformation(GDCM_NAME_SPACE::FileHelper *file, vtkMedicalImageProperties *medprop) { // For now only do: // PatientName, PatientID, PatientAge, PatientSex, PatientBirthDate, StudyID @@ -197,7 +197,7 @@ void SetMedicalImageInformation(gdcm::FileHelper *file, vtkMedicalImagePropertie /** * Set the data informations in the file */ -void SetImageInformation(gdcm::FileHelper *file, vtkImageData *image) +void SetImageInformation(GDCM_NAME_SPACE::FileHelper *file, vtkImageData *image) { std::ostringstream str; @@ -403,11 +403,11 @@ void vtkGdcmWriter::RecursiveWrite(int axis, vtkImageData *cache, void vtkGdcmWriter::WriteDcmFile(char *fileName, vtkImageData *image) { - gdcm::FileHelper *dcmFile; + GDCM_NAME_SPACE::FileHelper *dcmFile; if ( GdcmFile != 0) - dcmFile = gdcm::FileHelper::New(GdcmFile); + dcmFile = GDCM_NAME_SPACE::FileHelper::New(GdcmFile); else - dcmFile = gdcm::FileHelper::New(); + dcmFile = GDCM_NAME_SPACE::FileHelper::New(); // From here, the write of the file begins @@ -438,7 +438,7 @@ void vtkGdcmWriter::WriteDcmFile(char *fileName, vtkImageData *image) dcmFile->SetWriteTypeToDcmExplVR(); } - dcmFile->SetContentType((gdcm::ImageContentType)ContentType); + dcmFile->SetContentType((GDCM_NAME_SPACE::ImageContentType)ContentType); if(!dcmFile->Write(fileName)) { diff --git a/vtk/vtkGdcmWriter.h b/vtk/vtkGdcmWriter.h index 9811f6cb..6e8c58ec 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/08 12:39:49 $ - Version: $Revision: 1.10 $ + Date: $Date: 2007/06/19 13:09:45 $ + 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 @@ -89,8 +89,8 @@ public: // (including his own Shadow Elements, or any gdcm::SeqEntry) // gdcm::FileHelper::CheckMandatoryElements() will check inconsistencies, as far as it knows how. // Sorry, not yet available under Python. - vtkSetMacro(GdcmFile, gdcm::File *); - vtkGetMacro(GdcmFile, gdcm::File *); + vtkSetMacro(GdcmFile, GDCM_NAME_SPACE::File *); + vtkGetMacro(GdcmFile, GDCM_NAME_SPACE::File *); //ETX vtkSetMacro(ContentType, int); @@ -120,7 +120,7 @@ private: vtkMedicalImageProperties *MedicalImageProperties; int WriteType; //BTX - gdcm::File *GdcmFile; + GDCM_NAME_SPACE::File *GdcmFile; //ETX int ContentType; diff --git a/vtk/vtkWriteDicomExtended.cxx b/vtk/vtkWriteDicomExtended.cxx index a7312cba..6785d49e 100755 --- a/vtk/vtkWriteDicomExtended.cxx +++ b/vtk/vtkWriteDicomExtended.cxx @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) // Initialize Arguments Manager - gdcm::ArgMgr *am= new gdcm::ArgMgr(argc, argv); + GDCM_NAME_SPACE::ArgMgr *am= new GDCM_NAME_SPACE::ArgMgr(argc, argv); if (argc == 1 || am->ArgMgrDefined("usage") ) { @@ -52,15 +52,15 @@ int main(int argc, char *argv[]) return 0; } - int loadMode = gdcm::LD_ALL; + int loadMode = GDCM_NAME_SPACE::LD_ALL; if ( am->ArgMgrDefined("noshadowseq") ) - loadMode |= gdcm::LD_NOSHADOWSEQ; + loadMode |= GDCM_NAME_SPACE::LD_NOSHADOWSEQ; else { if ( am->ArgMgrDefined("noshadow") ) - loadMode |= gdcm::LD_NOSHADOW; + loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) - loadMode |= gdcm::LD_NOSEQ; + loadMode |= GDCM_NAME_SPACE::LD_NOSEQ; } int filecontent = am->ArgMgrGetInt("filecontent", 1); @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) char *fileout = (char *)(am->ArgMgrGetString("fileout","fileout")); if (am->ArgMgrDefined("debug")) - gdcm::Debug::DebugOn(); + GDCM_NAME_SPACE::Debug::DebugOn(); int deuxD = am->ArgMgrDefined("2D"); @@ -82,9 +82,9 @@ int main(int argc, char *argv[]) } // ------------------------------------------------------------ - std::vector cfl; + std::vector cfl; - gdcm::File *f = gdcm::File::New(); + GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New(); f->SetFileName(filein); f->Load(); cfl.push_back(f); diff --git a/vtk/vtkgdcmSerieViewer.cxx b/vtk/vtkgdcmSerieViewer.cxx index 0667025d..e3de7efc 100644 --- a/vtk/vtkgdcmSerieViewer.cxx +++ b/vtk/vtkgdcmSerieViewer.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkgdcmSerieViewer.cxx,v $ Language: C++ - Date: $Date: 2006/01/26 16:01:06 $ - Version: $Revision: 1.16 $ + Date: $Date: 2007/06/19 13:09:45 $ + Version: $Revision: 1.17 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -51,10 +51,10 @@ #define vtkFloatingPointType float #endif -void userSuppliedMirrorFunction (uint8_t *im, gdcm::File *f); -void userSuppliedTopDownFunction(uint8_t *im, gdcm::File *f); -bool userSuppliedLessThanFunction(gdcm::File *f1, gdcm::File *f2); -bool userSuppliedLessThanFunction2(gdcm::File *f1, gdcm::File *f2); +void userSuppliedMirrorFunction (uint8_t *im, GDCM_NAME_SPACE::File *f); +void userSuppliedTopDownFunction(uint8_t *im, GDCM_NAME_SPACE::File *f); +bool userSuppliedLessThanFunction(GDCM_NAME_SPACE::File *f1, GDCM_NAME_SPACE::File *f2); +bool userSuppliedLessThanFunction2(GDCM_NAME_SPACE::File *f1, GDCM_NAME_SPACE::File *f2); int orderNb; uint16_t *elemsToOrderOn; @@ -127,7 +127,7 @@ int main(int argc, char *argv[]) // Initialize Arguments Manager - gdcm::ArgMgr *am= new gdcm::ArgMgr(argc, argv); + GDCM_NAME_SPACE::ArgMgr *am= new GDCM_NAME_SPACE::ArgMgr(argc, argv); if (argc == 1 || am->ArgMgrDefined("usage") ) { @@ -138,15 +138,15 @@ int main(int argc, char *argv[]) char *dirName = am->ArgMgrWantString("dirname",usage); - int loadMode = gdcm::LD_ALL; + int loadMode = GDCM_NAME_SPACE::LD_ALL; if ( am->ArgMgrDefined("noshadowseq") ) - loadMode |= gdcm::LD_NOSHADOWSEQ; + loadMode |= GDCM_NAME_SPACE::LD_NOSHADOWSEQ; else { if ( am->ArgMgrDefined("noshadow") ) - loadMode |= gdcm::LD_NOSHADOW; + loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) - loadMode |= gdcm::LD_NOSEQ; + loadMode |= GDCM_NAME_SPACE::LD_NOSEQ; } int reverse = am->ArgMgrDefined("reverse"); @@ -176,7 +176,7 @@ int main(int argc, char *argv[]) elemsToOrderOn = am->ArgMgrGetXInt16Enum("order", &orderNb); if (am->ArgMgrDefined("debug")) - gdcm::Debug::DebugOn(); + GDCM_NAME_SPACE::Debug::DebugOn(); /* if unused Param we give up */ if ( am->ArgMgrPrintUnusedLabels() ) @@ -190,7 +190,7 @@ int main(int argc, char *argv[]) // ----------------------- End Arguments Manager ---------------------- - gdcm::SerieHelper *sh = gdcm::SerieHelper::New(); + GDCM_NAME_SPACE::SerieHelper *sh = GDCM_NAME_SPACE::SerieHelper::New(); sh->SetLoadMode(loadMode); if (reverse) sh->SetSortOrderToReverse(); @@ -200,7 +200,7 @@ int main(int argc, char *argv[]) int nbFiles; // For all the 'Single Serie UID' FileSets of the gdcm::Serie - gdcm::FileList *l = sh->GetFirstSingleSerieUIDFileSet(); + GDCM_NAME_SPACE::FileList *l = sh->GetFirstSingleSerieUIDFileSet(); if (l == 0 ) { std::cout << "Oops! No 'Single Serie UID' FileSet found ?!?" << std::endl; @@ -348,7 +348,7 @@ int main(int argc, char *argv[]) } \ } -void userSuppliedMirrorFunction(uint8_t *im, gdcm::File *f) +void userSuppliedMirrorFunction(uint8_t *im, GDCM_NAME_SPACE::File *f) { if (f->GetZSize() != 1) { @@ -403,7 +403,7 @@ void userSuppliedMirrorFunction(uint8_t *im, gdcm::File *f) } \ } -void userSuppliedTopDownFunction(uint8_t *im, gdcm::File *f) +void userSuppliedTopDownFunction(uint8_t *im, GDCM_NAME_SPACE::File *f) { if (f->GetZSize() != 1) { @@ -449,12 +449,12 @@ void userSuppliedTopDownFunction(uint8_t *im, gdcm::File *f) // -------------------------------------------------------- -bool userSuppliedLessThanFunction(gdcm::File *f1, gdcm::File *f2) +bool userSuppliedLessThanFunction(GDCM_NAME_SPACE::File *f1, GDCM_NAME_SPACE::File *f2) { // for *this* user supplied function, I supposed only ValEntries are checked. // std::string s1, s2; - gdcm::DataEntry *e1,*e2; + GDCM_NAME_SPACE::DataEntry *e1,*e2; for (int ri=0; riGetFileName() << "] vs [" << f2->GetFileName() << "]" << std::endl; diff --git a/vtk/vtkgdcmSerieViewer2.cxx b/vtk/vtkgdcmSerieViewer2.cxx index e4d8e2ea..83a381f7 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/08 12:41:07 $ - Version: $Revision: 1.9 $ + Date: $Date: 2007/06/19 13:09:45 $ + Version: $Revision: 1.10 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -52,10 +52,10 @@ #define vtkFloatingPointType float #endif -void userSuppliedMirrorFunction (uint8_t *im, gdcm::File *f); -void userSuppliedUpsideDownFunction(uint8_t *im, gdcm::File *f); -bool userSuppliedLessThanFunction(gdcm::File *f1, gdcm::File *f2); -bool userSuppliedLessThanFunction2(gdcm::File *f1, gdcm::File *f2); +void userSuppliedMirrorFunction (uint8_t *im, GDCM_NAME_SPACE::File *f); +void userSuppliedUpsideDownFunction(uint8_t *im, GDCM_NAME_SPACE::File *f); +bool userSuppliedLessThanFunction(GDCM_NAME_SPACE::File *f1, GDCM_NAME_SPACE::File *f2); +bool userSuppliedLessThanFunction2(GDCM_NAME_SPACE::File *f1, GDCM_NAME_SPACE::File *f2); int orderNb; uint16_t *elemsToOrderOn; @@ -138,7 +138,7 @@ int main(int argc, char *argv[]) // Initialize Arguments Manager - gdcm::ArgMgr *am= new gdcm::ArgMgr(argc, argv); + GDCM_NAME_SPACE::ArgMgr *am= new GDCM_NAME_SPACE::ArgMgr(argc, argv); if (argc == 1 || am->ArgMgrDefined("usage") ) { @@ -149,15 +149,15 @@ int main(int argc, char *argv[]) char *dirName = am->ArgMgrWantString("dirname",usage); - int loadMode = gdcm::LD_ALL; + int loadMode = GDCM_NAME_SPACE::LD_ALL; if ( am->ArgMgrDefined("noshadowseq") ) - loadMode |= gdcm::LD_NOSHADOWSEQ; + loadMode |= GDCM_NAME_SPACE::LD_NOSHADOWSEQ; else { if ( am->ArgMgrDefined("noshadow") ) - loadMode |= gdcm::LD_NOSHADOW; + loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) - loadMode |= gdcm::LD_NOSEQ; + loadMode |= GDCM_NAME_SPACE::LD_NOSEQ; } int reverse = am->ArgMgrDefined("reverse"); @@ -181,7 +181,7 @@ int main(int argc, char *argv[]) elemsToOrderOn = am->ArgMgrGetXInt16Enum("order", &orderNb); if (am->ArgMgrDefined("debug")) - gdcm::Debug::DebugOn(); + GDCM_NAME_SPACE::Debug::DebugOn(); /* if unused Param we give up */ if ( am->ArgMgrPrintUnusedLabels() ) @@ -195,7 +195,7 @@ int main(int argc, char *argv[]) // ----------------------- End Arguments Manager ---------------------- - gdcm::SerieHelper *sh = gdcm::SerieHelper::New(); + GDCM_NAME_SPACE::SerieHelper *sh = GDCM_NAME_SPACE::SerieHelper::New(); sh->SetLoadMode(loadMode); if (reverse) sh->SetSortOrderToReverse(); @@ -205,7 +205,7 @@ int main(int argc, char *argv[]) int nbFiles; // For all the 'Single Serie UID' FileSets of the gdcm::Serie - gdcm::FileList *l = sh->GetFirstSingleSerieUIDFileSet(); + GDCM_NAME_SPACE::FileList *l = sh->GetFirstSingleSerieUIDFileSet(); if (l == 0 ) { std::cout << "Oops! No 'Single Serie UID' FileSet found ?!?" << std::endl; @@ -362,7 +362,7 @@ int main(int argc, char *argv[]) } \ } -void userSuppliedMirrorFunction(uint8_t *im, gdcm::File *f) +void userSuppliedMirrorFunction(uint8_t *im, GDCM_NAME_SPACE::File *f) { if (f->GetZSize() != 1) { @@ -417,7 +417,7 @@ void userSuppliedMirrorFunction(uint8_t *im, gdcm::File *f) } \ } -void userSuppliedUpsideDownFunction(uint8_t *im, gdcm::File *f) +void userSuppliedUpsideDownFunction(uint8_t *im, GDCM_NAME_SPACE::File *f) { if (f->GetZSize() != 1) { @@ -463,12 +463,12 @@ void userSuppliedUpsideDownFunction(uint8_t *im, gdcm::File *f) // -------------------------------------------------------- -bool userSuppliedLessThanFunction(gdcm::File *f1, gdcm::File *f2) +bool userSuppliedLessThanFunction(GDCM_NAME_SPACE::File *f1, GDCM_NAME_SPACE::File *f2) { // for *this* user supplied function, I supposed only ValEntries are checked. // std::string s1, s2; - gdcm::DataEntry *e1,*e2; + GDCM_NAME_SPACE::DataEntry *e1,*e2; for (int ri=0; riGetFileName() << "] vs [" << f2->GetFileName() << "]" << std::endl; diff --git a/vtk/vtkgdcmViewer.cxx b/vtk/vtkgdcmViewer.cxx index 298747fc..82dfd691 100644 --- a/vtk/vtkgdcmViewer.cxx +++ b/vtk/vtkgdcmViewer.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkgdcmViewer.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 15:13:10 $ - Version: $Revision: 1.28 $ + Date: $Date: 2007/06/19 13:09:45 $ + Version: $Revision: 1.29 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) reader->AddFileName( argv[i] ); // TODO : allow user to choose Load Mode - reader->SetLoadMode(gdcm::LD_NOSHADOWSEQ); + reader->SetLoadMode(GDCM_NAME_SPACE::LD_NOSHADOWSEQ); reader->Update(); //print debug info: diff --git a/vtk/vtkgdcmViewer2.cxx b/vtk/vtkgdcmViewer2.cxx index 99b64110..d97dfc85 100644 --- a/vtk/vtkgdcmViewer2.cxx +++ b/vtk/vtkgdcmViewer2.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkgdcmViewer2.cxx,v $ Language: C++ - Date: $Date: 2006/05/11 20:01:28 $ - Version: $Revision: 1.8 $ + Date: $Date: 2007/06/19 13:09:45 $ + Version: $Revision: 1.9 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -104,7 +104,7 @@ int main(int argc, char *argv[]) reader->AddFileName( argv[i] ); // TODO : allow user to choose Load Mode - reader->SetLoadMode(gdcm::LD_NOSHADOWSEQ); + reader->SetLoadMode(GDCM_NAME_SPACE::LD_NOSHADOWSEQ); reader->Update(); //print debug info: