X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkgdcmSerieViewer.cxx;h=f081e02bf76433b72dd9fa739cc383a5dcd59d67;hb=fb1db702e2e94adb9c04387604dbe635726db898;hp=9c18792a062bf4aa57b82697acb3f06fb3910341;hpb=ab1ee4ff1d58029e25ecb86525ca2976f0f5ada2;p=gdcm.git diff --git a/vtk/vtkgdcmSerieViewer.cxx b/vtk/vtkgdcmSerieViewer.cxx index 9c18792a..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: 2005/10/20 14:46:29 $ - Version: $Revision: 1.13 $ + 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 @@ -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"); @@ -171,12 +171,12 @@ int main(int argc, char *argv[]) int check = am->ArgMgrDefined("check"); // This is so ugly, a cstring is NOT a char * (god damit!) - bool bname = ( strcmp(am->ArgMgrGetString("order", (char*)"not found"),"name")==0 ); + bool bname = ( strcmp(am->ArgMgrGetString("order", "not found"),"name")==0 ); if (bname) 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 = new gdcm::SerieHelper(); + GDCM_NAME_SPACE::SerieHelper *sh = GDCM_NAME_SPACE::SerieHelper::New(); sh->SetLoadMode(loadMode); if (reverse) sh->SetSortOrderToReverse(); @@ -199,8 +199,8 @@ int main(int argc, char *argv[]) // Just to see int nbFiles; - // For all the 'Single Serie UID' FileSets of the gdcm::Serie - gdcm::FileList *l = sh->GetFirstSingleSerieUIDFileSet(); + // For all the 'Single Serie UID' FileSets of the GDCM_NAME_SPACE::Serie + GDCM_NAME_SPACE::FileList *l = sh->GetFirstSingleSerieUIDFileSet(); if (l == 0 ) { std::cout << "Oops! No 'Single Serie UID' FileSet found ?!?" << std::endl; @@ -234,7 +234,7 @@ int main(int argc, char *argv[]) if ( !sh->IsCoherent(l) ) // just be sure (?) { std::cout << "Files are not coherent. Stop everything " << std::endl; - delete sh; + sh->Delete(); return 0; } } @@ -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,22 +449,22 @@ 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; rigdcm::Document::GetDataEntry( elemsToOrderOn[2*ri], - elemsToOrderOn[2*ri+1]); + e1= f1->GetDataEntry( elemsToOrderOn[2*ri], + elemsToOrderOn[2*ri+1]); - e2= f2->gdcm::Document::GetDataEntry( elemsToOrderOn[2*ri], + e2= f2->GetDataEntry( elemsToOrderOn[2*ri], elemsToOrderOn[2*ri+1]); if(!e2 || !e2) { @@ -494,7 +494,7 @@ bool userSuppliedLessThanFunction(gdcm::File *f1, gdcm::File *f2) // Warning : it's up to 'vtkgdcmSerieViewer' user to find a suitable data set ! // -------------------------------------------------------- -bool userSuppliedLessThanFunction2(gdcm::File *f1, gdcm::File *f2) +bool userSuppliedLessThanFunction2(GDCM_NAME_SPACE::File *f1, GDCM_NAME_SPACE::File *f2) { std::cout << "[" << f1->GetFileName() << "] vs [" << f2->GetFileName() << "]" << std::endl;