From f3cc252fad08c3e8dbc395f2ca7cabf47bf95302 Mon Sep 17 00:00:00 2001 From: regrain Date: Tue, 30 Aug 2005 15:13:05 +0000 Subject: [PATCH] * Remove #define and replace then by the call to the corresponding variables (in the LodModeType enum) - Thanks to Mathieu -- BeNours --- Example/Anonymize.cxx | 6 +++--- Example/AnonymizeNoLoad.cxx | 12 ++++++------ Example/MakeDicomDir.cxx | 12 ++++++------ Example/PatchHeader.cxx | 12 ++++++------ Example/PrintDocument.cxx | 6 +++--- Example/PrintFile.cxx | 12 ++++++------ Example/ReWrite.cxx | 12 ++++++------ Example/TestPrintTime.cxx | 8 ++++---- Example/exColorToRGB.cxx | 6 +++--- Example/exGC.cxx | 6 +++--- Example/exImageLighten.cxx | 6 +++--- Example/exOverlaysACR.cxx | 6 +++--- Example/exPrintWritePrint.cxx | 6 +++--- Example/exSerieHelper.cxx | 6 +++--- Testing/TestAllPrint.cxx | 6 +++--- Testing/TestAllReadCompareDicom.cxx | 6 +++--- Testing/TestMakeDicomDir.cxx | 8 ++++---- Testing/TestSerieHelper.cxx | 6 +++--- Testing/TestWriteSimple.cxx | 14 +++++++------- src/gdcmCommon.h | 23 +++++++++-------------- src/gdcmDicomDir.cxx | 6 +++--- src/gdcmDocument.cxx | 8 ++++---- vtk/vtkGdcmReader.cxx | 8 ++++---- vtk/vtkgdcmSerieViewer.cxx | 12 ++++++------ vtk/vtkgdcmViewer.cxx | 6 +++--- vtk/vtkgdcmViewer2.cxx | 6 +++--- 26 files changed, 110 insertions(+), 115 deletions(-) diff --git a/Example/Anonymize.cxx b/Example/Anonymize.cxx index 2d99336a..16983535 100644 --- a/Example/Anonymize.cxx +++ b/Example/Anonymize.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: Anonymize.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:28 $ - Version: $Revision: 1.4 $ + Date: $Date: 2005/08/30 15:13:05 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -77,7 +77,7 @@ int main(int argc, char *argv[]) gdcm::File *f; f = new gdcm::File( ); - f->SetLoadMode( GDCM_LD_ALL ); + f->SetLoadMode( gdcm::LD_ALL ); f->SetFileName( fileName ); int res = f->Load(); diff --git a/Example/AnonymizeNoLoad.cxx b/Example/AnonymizeNoLoad.cxx index cf6f22ee..3fa85005 100644 --- a/Example/AnonymizeNoLoad.cxx +++ b/Example/AnonymizeNoLoad.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: AnonymizeNoLoad.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:28 $ - Version: $Revision: 1.11 $ + Date: $Date: 2005/08/30 15:13:05 $ + 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 @@ -75,15 +75,15 @@ int main(int argc, char *argv[]) return 0; } - int loadMode = GDCM_LD_ALL; + int loadMode = gdcm::LD_ALL; if ( am->ArgMgrDefined("noshadowseq") ) - loadMode |= GDCM_LD_NOSHADOWSEQ; + loadMode |= gdcm::LD_NOSHADOWSEQ; else { if ( am->ArgMgrDefined("noshadow") ) - loadMode |= GDCM_LD_NOSHADOW; + loadMode |= gdcm::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) - loadMode |= GDCM_LD_NOSEQ; + loadMode |= gdcm::LD_NOSEQ; } int rubOutNb; diff --git a/Example/MakeDicomDir.cxx b/Example/MakeDicomDir.cxx index 3da658b7..76cf5b18 100644 --- a/Example/MakeDicomDir.cxx +++ b/Example/MakeDicomDir.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: MakeDicomDir.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:28 $ - Version: $Revision: 1.13 $ + Date: $Date: 2005/08/30 15:13:05 $ + Version: $Revision: 1.14 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -73,15 +73,15 @@ int main(int argc, char *argv[]) char *dirName; dirName = am->ArgMgrGetString("dirName",(char *)"."); - int loadMode = GDCM_LD_ALL; + int loadMode = gdcm::LD_ALL; if ( am->ArgMgrDefined("noshadowseq") ) - loadMode |= GDCM_LD_NOSHADOWSEQ; + loadMode |= gdcm::LD_NOSHADOWSEQ; else { if ( am->ArgMgrDefined("noshadow") ) - loadMode |= GDCM_LD_NOSHADOW; + loadMode |= gdcm::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) - loadMode |= GDCM_LD_NOSEQ; + loadMode |= gdcm::LD_NOSEQ; } if (am->ArgMgrDefined("debug")) diff --git a/Example/PatchHeader.cxx b/Example/PatchHeader.cxx index 23dbfd11..27654339 100644 --- a/Example/PatchHeader.cxx +++ b/Example/PatchHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: PatchHeader.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:28 $ - Version: $Revision: 1.3 $ + Date: $Date: 2005/08/30 15:13:05 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -264,15 +264,15 @@ int main(int argc, char *argv[]) if (am->ArgMgrDefined("debug")) gdcm::Debug::DebugOn(); - int loadMode = GDCM_LD_ALL; + int loadMode = gdcm::LD_ALL; if ( am->ArgMgrDefined("noshadowseq") ) - loadMode |= GDCM_LD_NOSHADOWSEQ; + loadMode |= gdcm::LD_NOSHADOWSEQ; else { if ( am->ArgMgrDefined("noshadow") ) - loadMode |= GDCM_LD_NOSHADOW; + loadMode |= gdcm::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) - loadMode |= GDCM_LD_NOSEQ; + loadMode |= gdcm::LD_NOSEQ; } /* if unused Param we give up */ diff --git a/Example/PrintDocument.cxx b/Example/PrintDocument.cxx index e2f9ce6f..c5472a3c 100644 --- a/Example/PrintDocument.cxx +++ b/Example/PrintDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: PrintDocument.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:28 $ - Version: $Revision: 1.18 $ + Date: $Date: 2005/08/30 15:13:05 $ + Version: $Revision: 1.19 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) gdcm::Debug::DebugOn(); if (argc > 4) - e1->SetLoadMode(GDCM_LD_NOSEQ | GDCM_LD_NOSHADOW); + e1->SetLoadMode(gdcm::LD_NOSEQ | gdcm::LD_NOSHADOW); e1->SetFileName( fileName.c_str() ); e1->Load( ); diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx index 3b421623..4310831a 100644 --- a/Example/PrintFile.cxx +++ b/Example/PrintFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: PrintFile.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:28 $ - Version: $Revision: 1.49 $ + Date: $Date: 2005/08/30 15:13:05 $ + Version: $Revision: 1.50 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -165,15 +165,15 @@ int main(int argc, char *argv[]) if (am->ArgMgrDefined("debug")) gdcm::Debug::DebugOn(); - int loadMode = GDCM_LD_ALL; + int loadMode = gdcm::LD_ALL; if ( am->ArgMgrDefined("noshadowseq") ) - loadMode |= GDCM_LD_NOSHADOWSEQ; + loadMode |= gdcm::LD_NOSHADOWSEQ; else { if ( am->ArgMgrDefined("noshadow") ) - loadMode |= GDCM_LD_NOSHADOW; + loadMode |= gdcm::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) - loadMode |= GDCM_LD_NOSEQ; + loadMode |= gdcm::LD_NOSEQ; } int level = am->ArgMgrGetInt("level", 2); diff --git a/Example/ReWrite.cxx b/Example/ReWrite.cxx index 430f11aa..1a6c735b 100644 --- a/Example/ReWrite.cxx +++ b/Example/ReWrite.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: ReWrite.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:28 $ - Version: $Revision: 1.10 $ + Date: $Date: 2005/08/30 15:13:05 $ + 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 @@ -68,15 +68,15 @@ int main(int argc, char *argv[]) char *mode = am->ArgMgrGetString("mode",(char *)"X"); - int loadMode = GDCM_LD_ALL; + int loadMode = gdcm::LD_ALL; if ( am->ArgMgrDefined("noshadowseq") ) - loadMode |= GDCM_LD_NOSHADOWSEQ; + loadMode |= gdcm::LD_NOSHADOWSEQ; else { if ( am->ArgMgrDefined("noshadow") ) - loadMode |= GDCM_LD_NOSHADOW; + loadMode |= gdcm::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) - loadMode |= GDCM_LD_NOSEQ; + loadMode |= gdcm::LD_NOSEQ; } bool rgb = ( 0 != am->ArgMgrDefined("RGB") ); diff --git a/Example/TestPrintTime.cxx b/Example/TestPrintTime.cxx index 68dec9e3..a67cb203 100644 --- a/Example/TestPrintTime.cxx +++ b/Example/TestPrintTime.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestPrintTime.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:28 $ - Version: $Revision: 1.4 $ + Date: $Date: 2005/08/30 15:13:06 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -59,7 +59,7 @@ int main(int, char *[]) std::cout << "-----------Not Readable " << std::endl; delete e1; e1= new gdcm::File( ); - e1->SetLoadMode( GDCM_LD_NOSEQ | GDCM_LD_NOSHADOW ); + e1->SetLoadMode( gdcm::LD_NOSEQ | gdcm::LD_NOSHADOW ); r3 = times(&tms3); e1->SetFileName( filename ); e1->Load( ); @@ -120,7 +120,7 @@ int main(int, char *[]) filename += gdcmDataImages[i]; e1= new gdcm::File( ); - e1->SetLoadMode( GDCM_LD_NOSEQ | GDCM_LD_NOSHADOW ); + e1->SetLoadMode( gdcm::LD_NOSEQ | gdcm::LD_NOSHADOW ); e1->SetFileName( filename ); e1->Load( ); if (!e1->IsReadable()) diff --git a/Example/exColorToRGB.cxx b/Example/exColorToRGB.cxx index d62cbe97..55585731 100644 --- a/Example/exColorToRGB.cxx +++ b/Example/exColorToRGB.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: exColorToRGB.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:28 $ - Version: $Revision: 1.5 $ + Date: $Date: 2005/08/30 15:13:06 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) std::cout << argv[1] << std::endl; gdcm::File *f = new gdcm::File(); - f->SetLoadMode( GDCM_LD_ALL); + f->SetLoadMode( gdcm::LD_ALL); f->SetFileName( fileName ); bool res = f->Load(); diff --git a/Example/exGC.cxx b/Example/exGC.cxx index 4d5e411f..9e1d4c48 100644 --- a/Example/exGC.cxx +++ b/Example/exGC.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: exGC.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:28 $ - Version: $Revision: 1.7 $ + Date: $Date: 2005/08/30 15:13:06 $ + 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 @@ -76,7 +76,7 @@ int main(int argc, char *argv[]) std::cout << argv[1] << std::endl; gdcm::File *f = new gdcm::File(); - f->SetLoadMode( GDCM_LD_ALL); + f->SetLoadMode( gdcm::LD_ALL); f->SetFileName( fileName ); bool res = f->Load(); diff --git a/Example/exImageLighten.cxx b/Example/exImageLighten.cxx index fed6a9d8..0b94d610 100644 --- a/Example/exImageLighten.cxx +++ b/Example/exImageLighten.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: exImageLighten.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:28 $ - Version: $Revision: 1.5 $ + Date: $Date: 2005/08/30 15:13:06 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) std::cout << argv[1] << std::endl; gdcm::File *f = new gdcm::File(); - f->SetLoadMode( GDCM_LD_ALL); + f->SetLoadMode( gdcm::LD_ALL); f->SetFileName( fileName ); bool res = f->Load(); diff --git a/Example/exOverlaysACR.cxx b/Example/exOverlaysACR.cxx index 01a0492a..3af7774c 100644 --- a/Example/exOverlaysACR.cxx +++ b/Example/exOverlaysACR.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: exOverlaysACR.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:28 $ - Version: $Revision: 1.6 $ + Date: $Date: 2005/08/30 15:13:06 $ + Version: $Revision: 1.7 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) f = new gdcm::File( ); - f->SetLoadMode(GDCM_LD_NOSEQ | GDCM_LD_NOSHADOW); + f->SetLoadMode(gdcm::LD_NOSEQ | gdcm::LD_NOSHADOW); f->SetFileName( fileName ); bool res = f->Load(); diff --git a/Example/exPrintWritePrint.cxx b/Example/exPrintWritePrint.cxx index 3bb545c3..8a6ea759 100644 --- a/Example/exPrintWritePrint.cxx +++ b/Example/exPrintWritePrint.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: exPrintWritePrint.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:28 $ - Version: $Revision: 1.3 $ + Date: $Date: 2005/08/30 15:13:06 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) std::string mode = argv[2]; f = new gdcm::File( ); - f->SetLoadMode( GDCM_LD_NOSEQ ); + f->SetLoadMode( gdcm::LD_NOSEQ ); f->SetFileName( fileName ); f->Load( ); diff --git a/Example/exSerieHelper.cxx b/Example/exSerieHelper.cxx index 41a98abd..8a1de409 100644 --- a/Example/exSerieHelper.cxx +++ b/Example/exSerieHelper.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: exSerieHelper.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:28 $ - Version: $Revision: 1.3 $ + Date: $Date: 2005/08/30 15:13:06 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) std::cout << "Dir Name :[" << dirName << "]" << std::endl; s = new gdcm::SerieHelper(); - s->SetLoadMode(GDCM_LD_ALL); // Load everything for each File + s->SetLoadMode(gdcm::LD_ALL); // Load everything for each File //s->AddRestriction(tagKey, valueToCheck); // Keep only files where // restriction is true s->SetDirectory(dirName, true); // true : recursive exploration diff --git a/Testing/TestAllPrint.cxx b/Testing/TestAllPrint.cxx index 833516ca..3962137b 100644 --- a/Testing/TestAllPrint.cxx +++ b/Testing/TestAllPrint.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestAllPrint.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:30 $ - Version: $Revision: 1.3 $ + Date: $Date: 2005/08/30 15:13:07 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -48,7 +48,7 @@ int TestAllPrint(int, char *[]) std::string filename = gdcmDataImages[i]; gdcm::File file; - file.SetLoadMode( GDCM_LD_NOSEQ ); + file.SetLoadMode( gdcm::LD_NOSEQ ); file.SetFileName( filename ); file.Load(); //file.Print( std::cout ); //just for debug diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx index 72ee3cc7..7a7ab5c6 100644 --- a/Testing/TestAllReadCompareDicom.cxx +++ b/Testing/TestAllReadCompareDicom.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestAllReadCompareDicom.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:30 $ - Version: $Revision: 1.46 $ + Date: $Date: 2005/08/30 15:13:07 $ + Version: $Revision: 1.47 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -399,7 +399,7 @@ int InternalTest(std::string const &filename, // new style gdcm::File *f = new gdcm::File(); - f->SetLoadMode ( GDCM_LD_ALL ); // Load everything + f->SetLoadMode ( gdcm::LD_ALL ); // Load everything f->SetFileName( filename ); f->Load(); diff --git a/Testing/TestMakeDicomDir.cxx b/Testing/TestMakeDicomDir.cxx index d42e8741..695e2307 100644 --- a/Testing/TestMakeDicomDir.cxx +++ b/Testing/TestMakeDicomDir.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestMakeDicomDir.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:30 $ - Version: $Revision: 1.7 $ + Date: $Date: 2005/08/30 15:13:07 $ + 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 @@ -64,9 +64,9 @@ int TestMakeDicomDir(int argc, char *argv[]) // new style (user is allowed no to load Sequences an/or Shadow Groups) dcmdir = new gdcm::DicomDir( ); - // dcmdir->SetLoadMode(GDCM_LD_NOSEQ | GDCM_LD_NOSHADOW); + // dcmdir->SetLoadMode(gdcm::LD_NOSEQ | gdcm::LD_NOSHADOW); // some images have a wrong length for element 0x0000 of private groups - dcmdir->SetLoadMode(GDCM_LD_NOSEQ); + dcmdir->SetLoadMode(gdcm::LD_NOSEQ); dcmdir->SetDirectoryName(dirName); dcmdir->Load( ); diff --git a/Testing/TestSerieHelper.cxx b/Testing/TestSerieHelper.cxx index 291d5c41..f3a101a0 100644 --- a/Testing/TestSerieHelper.cxx +++ b/Testing/TestSerieHelper.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestSerieHelper.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:30 $ - Version: $Revision: 1.7 $ + Date: $Date: 2005/08/30 15:13:07 $ + 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 @@ -39,7 +39,7 @@ int TestSerieHelper(int argc, char *argv[]) std::cout << "Dir Name :[" << dirName << "]" << std::endl; s = new gdcm::SerieHelper(); - s->SetLoadMode(GDCM_LD_ALL); // Load everything for each File + s->SetLoadMode(gdcm::LD_ALL); // Load everything for each File //s->AddRestriction(tagKey, valueToCheck); // Keep only files where // restriction is true s->SetDirectory(dirName, true); // true : recursive exploration diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx index 46f4e85b..47a0dcf3 100644 --- a/Testing/TestWriteSimple.cxx +++ b/Testing/TestWriteSimple.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestWriteSimple.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:30 $ - Version: $Revision: 1.35 $ + Date: $Date: 2005/08/30 15:13:07 $ + Version: $Revision: 1.36 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -250,11 +250,11 @@ int WriteSimple(Image &img) reread->SetFileName( fileName.str() ); reread->SetLoadMode(0); // Load everything // Other possible values are - // GDCM_LD_ALL, - // GDCM_LD_NOSEQ, - // GDCM_LD_NOSHADOW, - // GDCM_LD_NOSEQ|GDCM_LD_NOSHADOW, - // GDCM_LD_NOSHADOWSEQ + // gdcm::LD_ALL, + // gdcm::LD_NOSEQ, + // gdcm::LD_NOSHADOW, + // gdcm::LD_NOSEQ|gdcm::LD_NOSHADOW, + // gdcm::LD_NOSHADOWSEQ reread->Load(); if( !reread->GetFile()->IsReadable() ) diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index 6b0330cd..a6e031d4 100644 --- a/src/gdcmCommon.h +++ b/src/gdcmCommon.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmCommon.h,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:32 $ - Version: $Revision: 1.87 $ + Date: $Date: 2005/08/30 15:13:09 $ + Version: $Revision: 1.88 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -197,20 +197,15 @@ enum CompOperators { GDCM_LESSOREQUAL }; -// Loading mode -#define GDCM_LD_ALL 0x00000000 -#define GDCM_LD_NOSEQ 0x00000001 -#define GDCM_LD_NOSHADOW 0x00000002 -#define GDCM_LD_NOSHADOWSEQ 0x00000004 - +/// \brief Loading mode enum LodModeType { - LD_ALL = GDCM_LD_ALL, // Load all - LD_NOSEQ = GDCM_LD_NOSEQ, // Don't load odd groups - LD_NOSHADOW = GDCM_LD_NOSHADOW, // Don't load Sequences - LD_NOSHADOWSEQ = GDCM_LD_NOSHADOWSEQ // Don't load Sequences if they belong - // to an odd group - // (*exclusive* from LD_NOSEQ and LD_NOSHADOW) + LD_ALL = 0x00000000, // Load all + LD_NOSEQ = 0x00000001, // Don't load Sequences + LD_NOSHADOW = 0x00000002, // Don't load odd groups + LD_NOSHADOWSEQ = 0x00000004 // Don't load Sequences if they belong + // to an odd group + // (*exclusive* from LD_NOSEQ and LD_NOSHADOW) }; /** diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index 653a4744..a7132a90 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:33 $ - Version: $Revision: 1.156 $ + Date: $Date: 2005/08/30 15:13:09 $ + Version: $Revision: 1.157 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -148,7 +148,7 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ): // (nothing is cheked in Document constructor, to avoid overhead) ParseDir = parseDir; - SetLoadMode (GDCM_LD_ALL); // concerns only dicom files + SetLoadMode (LD_ALL); // concerns only dicom files SetFileName( fileName ); Load( ); } diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 51c8cbf8..5f40b723 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:33 $ - Version: $Revision: 1.272 $ + Date: $Date: 2005/08/30 15:13:09 $ + Version: $Revision: 1.273 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -63,7 +63,7 @@ Document::Document() Group0002Parsed = false; IsDocumentAlreadyLoaded = false; IsDocumentModified = true; - LoadMode = GDCM_LD_ALL; // default : load everything, later + LoadMode = LD_ALL; // default : load everything, later SetFileName(""); } @@ -81,7 +81,7 @@ Document::Document( std::string const &fileName ) SwapCode = 1234; Filetype = ExplicitVR; Group0002Parsed = false; - LoadMode = GDCM_LD_ALL; // Load everything, later + LoadMode = LD_ALL; // Load everything, later // Load will set it to true if sucessfull IsDocumentAlreadyLoaded = false; diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx index 51597358..bfad7be6 100644 --- a/vtk/vtkGdcmReader.cxx +++ b/vtk/vtkGdcmReader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkGdcmReader.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:35 $ - Version: $Revision: 1.77 $ + Date: $Date: 2005/08/30 15:13:10 $ + Version: $Revision: 1.78 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -69,7 +69,7 @@ #include #include -vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.77 $") +vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.78 $") vtkStandardNewMacro(vtkGdcmReader) //----------------------------------------------------------------------------- @@ -79,7 +79,7 @@ vtkGdcmReader::vtkGdcmReader() this->LookupTable = NULL; this->AllowLookupTable = false; this->AllowLightChecking = false; - this->LoadMode = GDCM_LD_ALL; // Load everything (possible values : + this->LoadMode = gdcm::LD_ALL; // Load everything (possible values : // - LD_NOSEQ, // - LD_NOSHADOW, // - LD_NOSHADOWSEQ) diff --git a/vtk/vtkgdcmSerieViewer.cxx b/vtk/vtkgdcmSerieViewer.cxx index d925c518..434d8c48 100644 --- a/vtk/vtkgdcmSerieViewer.cxx +++ b/vtk/vtkgdcmSerieViewer.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkgdcmSerieViewer.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:35 $ - Version: $Revision: 1.6 $ + Date: $Date: 2005/08/30 15:13:10 $ + Version: $Revision: 1.7 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -124,15 +124,15 @@ int main(int argc, char *argv[]) char *dirName = am->ArgMgrWantString("dirname",usage); - int loadMode = GDCM_LD_ALL; + int loadMode = gdcm::LD_ALL; if ( am->ArgMgrDefined("noshadowseq") ) - loadMode |= GDCM_LD_NOSHADOWSEQ; + loadMode |= gdcm::LD_NOSHADOWSEQ; else { if ( am->ArgMgrDefined("noshadow") ) - loadMode |= GDCM_LD_NOSHADOW; + loadMode |= gdcm::LD_NOSHADOW; if ( am->ArgMgrDefined("noseq") ) - loadMode |= GDCM_LD_NOSEQ; + loadMode |= gdcm::LD_NOSEQ; } int reverse = am->ArgMgrDefined("reverse"); diff --git a/vtk/vtkgdcmViewer.cxx b/vtk/vtkgdcmViewer.cxx index 334d0181..298747fc 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 14:40:35 $ - Version: $Revision: 1.27 $ + Date: $Date: 2005/08/30 15:13:10 $ + Version: $Revision: 1.28 $ 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::LD_NOSHADOWSEQ); reader->Update(); //print debug info: diff --git a/vtk/vtkgdcmViewer2.cxx b/vtk/vtkgdcmViewer2.cxx index 7ddc82f8..4c499166 100644 --- a/vtk/vtkgdcmViewer2.cxx +++ b/vtk/vtkgdcmViewer2.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkgdcmViewer2.cxx,v $ Language: C++ - Date: $Date: 2005/08/30 14:40:35 $ - Version: $Revision: 1.4 $ + Date: $Date: 2005/08/30 15:13:10 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -95,7 +95,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::LD_NOSHADOWSEQ); reader->Update(); //print debug info: -- 2.45.1