From: jpr Date: Thu, 31 Mar 2011 21:45:08 +0000 (+0000) Subject: comments X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=gdcm.git;a=commitdiff_plain;h=e7a642c06e4cdcfdbaf024090754283ccc564408 comments --- diff --git a/Example/exUnMosaic.cxx b/Example/exUnMosaic.cxx index 28126d94..5a1d780f 100755 --- a/Example/exUnMosaic.cxx +++ b/Example/exUnMosaic.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: exUnMosaic.cxx,v $ Language: C++ - Date: $Date: 2011/03/29 07:45:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2011/03/31 21:45:08 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -113,7 +113,7 @@ int main(int argc, char *argv[]) { std::cout << "outputdims[0] : " << outputdims[0] << " outputdims[1] : " << outputdims[1] << " numberOfImagesInMosaic : " << numberOfImagesInMosaic << " ( = " << outputdims[0] * outputdims[1] * outputdims[2] * 2 << " ) doesn't match with dataRawSize : " << dataRawSize << std::endl; - //exit(0); + //exit(0); } */ diff --git a/Example/exUnMosaic2.cxx b/Example/exUnMosaic2.cxx index 60bd1b07..c9b441c6 100755 --- a/Example/exUnMosaic2.cxx +++ b/Example/exUnMosaic2.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: exUnMosaic2.cxx,v $ Language: C++ - Date: $Date: 2011/03/29 07:45:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2011/03/31 21:45:08 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) { std::cout << "outputdims[0] : " << outputdims[0] << " outputdims[1] : " << outputdims[1] << " numberOfImagesInMosaic : " << numberOfImagesInMosaic << " ( = " << outputdims[0] * outputdims[1] * outputdims[2] * 2 << " ) doesn't match with dataRawSize : " << dataRawSize << std::endl; - //exit(0); + //exit(0); } */ diff --git a/Example/exUnMosaicStack.cxx b/Example/exUnMosaicStack.cxx index b065f469..9e2a39dd 100755 --- a/Example/exUnMosaicStack.cxx +++ b/Example/exUnMosaicStack.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: exUnMosaicStack.cxx,v $ Language: C++ - Date: $Date: 2011/03/29 07:45:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2011/03/31 21:45:08 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) { std::cout << "outputdims[0] : " << outputdims[0] << " outputdims[1] : " << outputdims[1] << " numberOfImagesInMosaic : " << numberOfImagesInMosaic << " ( = " << outputdims[0] * outputdims[1] * outputdims[2] * 2 << " ) doesn't match with dataRawSize : " << dataRawSize << std::endl; - //exit(0); + //exit(0); } */ diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx index 56aaaabc..86f1ec6f 100644 --- a/src/gdcmSerieHelper.cxx +++ b/src/gdcmSerieHelper.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSerieHelper.cxx,v $ Language: C++ - Date: $Date: 2011/03/29 07:36:00 $ - Version: $Revision: 1.71 $ + Date: $Date: 2011/03/31 21:45:11 $ + Version: $Revision: 1.72 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -301,7 +301,7 @@ void SerieHelper::OrderFileList(FileList *fileSet) if ( SerieHelper::UserLessThanFunction ) { - gdcmDebugMacro("Use UserLessThanFunction"); + gdcmDebugMacro("Use UserLessThanFunction"); UserOrdering( fileSet ); return; } @@ -656,7 +656,7 @@ XCoherentFileSetmap SerieHelper::SplitOnTagValueConvertToFloat(FileList *fileSet strTagValue = (*it)->GetEntryString(group,element); dTagValue = atof( strTagValue.c_str()); - iTagValue = dTagValue; + iTagValue = dTagValue*10000.; sprintf(cTagValue, "%010d", iTagValue); strTagValue = cTagValue; diff --git a/vtk/CMakeLists.txt b/vtk/CMakeLists.txt index 5816bcb1..892971ed 100644 --- a/vtk/CMakeLists.txt +++ b/vtk/CMakeLists.txt @@ -25,20 +25,19 @@ INCLUDE_DIRECTORIES( # Depending on VTK version build more stuff: IF("${VTK_MAJOR_VERSION}" GREATER 4) SET(VTKGDCM_LIB_SRCS - vtkGdcmReader.cxx - vtkGdcmWriter.cxx - vtkImageColorViewer.cxx - vtkImageMapToWindowLevelColors2.cxx - vtkGdcm4DSplitter.cxx + vtkGdcmReader.cxx + vtkGdcmWriter.cxx + vtkImageColorViewer.cxx + vtkImageMapToWindowLevelColors2.cxx + vtkGdcm4DSplitter.cxx ) ELSE("${VTK_MAJOR_VERSION}" GREATER 4) SET(VTKGDCM_LIB_SRCS - vtkGdcmReader.cxx - vtkGdcmWriter.cxx + vtkGdcmReader.cxx + vtkGdcmWriter.cxx ) ENDIF("${VTK_MAJOR_VERSION}" GREATER 4) - #----------------------------------------------------------------------------- # Create vtkgdcm library ADD_LIBRARY(vtkgdcm ${VTKGDCM_LIB_SRCS}) diff --git a/vtk/test4DSplitter.cxx b/vtk/test4DSplitter.cxx index 4fe34105..bab06418 100644 --- a/vtk/test4DSplitter.cxx +++ b/vtk/test4DSplitter.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: test4DSplitter.cxx,v $ Language: C++ - Date: $Date: 2011/03/31 16:12:33 $ - Version: $Revision: 1.2 $ + Date: $Date: 2011/03/31 21:45:12 $ + Version: $Revision: 1.3 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or diff --git a/vtk/vtkGdcm4DSplitter.h b/vtk/vtkGdcm4DSplitter.h index 9162f47b..908cbe79 100644 --- a/vtk/vtkGdcm4DSplitter.h +++ b/vtk/vtkGdcm4DSplitter.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkGdcm4DSplitter.h,v $ Language: C++ - Date: $Date: 2011/03/31 16:12:33 $ - Version: $Revision: 1.4 $ + Date: $Date: 2011/03/31 21:45:12 $ + 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 @@ -21,7 +21,7 @@ #include #include -#include "gdcmDirList.h" +#include "gdcmDirList.h" typedef bool (*FoncComp) (GDCM_NAME_SPACE::File *file1, GDCM_NAME_SPACE::File *file2); //typedef bool (vtkGdcm4DSplitter::*MembFoncComp)(GDCM_NAME_SPACE::File *file1, GDCM_NAME_SPACE::File *file2); @@ -31,7 +31,7 @@ typedef bool (*FoncComp) (GDCM_NAME_SPACE::File *file1, G //{ class vtkGdcm4DSplitter { public: - + vtkGdcm4DSplitter(); ~vtkGdcm4DSplitter(){}; bool setDirName(std::string &dirName); @@ -42,8 +42,8 @@ typedef bool (*FoncComp) (GDCM_NAME_SPACE::File *file1, G // ===== inline void setSplitOnPosition() {SplitOnPosition=true; SplitOnOrientation=false; SplitOnTag=false;} inline void setSplitOnOrientation(){SplitOnPosition=false; SplitOnOrientation=true; SplitOnTag=false;} - inline void setSplitOnTag(unsigned short int splitGroup, unsigned short int splitElem) - {SplitOnPosition=false; SplitOnOrientation=false; SplitOnTag=true; + inline void setSplitOnTag(unsigned short int splitGroup, unsigned short int splitElem) + {SplitOnPosition=false; SplitOnOrientation=false; SplitOnTag=true; SplitGroup=splitGroup; SplitElem=splitElem;} inline void setSplitConvertToFloat(bool conv) {SplitConvertToFloat=conv;} @@ -52,7 +52,7 @@ typedef bool (*FoncComp) (GDCM_NAME_SPACE::File *file1, G inline void setSortOnPosition() {SortOnPosition=true; SortOnOrientation=false; SortOnTag=false; SortOnFileName=false; SortOnUserFunction=false; SortOnPosition=true;} - inline void setSortOnTag(unsigned short int sortGroup, unsigned short int sortElem) + inline void setSortOnTag(unsigned short int sortGroup, unsigned short int sortElem) {SortOnPosition=false; SortOnOrientation=false; SortOnTag=true; SortOnFileName=false; SortOnUserFunction=false; SortGroup=sortGroup; SortElem=sortElem;} @@ -67,7 +67,7 @@ typedef bool (*FoncComp) (GDCM_NAME_SPACE::File *file1, G inline void setRecursive(bool recursive) { Recursive=recursive;} // SortOnOrientation : not yet made - //inline void setSortOnOrientation(){SortOnPosition=false; SortOnOrientation=true; SortOnTag=false; SortOnFileName=false; SortOnUserFunction=false;} + //inline void setSortOnOrientation(){SortOnPosition=false; SortOnOrientation=true; SortOnTag=false; SortOnFileName=false; SortOnUserFunction=false;} std::vector *GetImageDataVector(); vtkImageData *GetImageData(); @@ -77,7 +77,7 @@ typedef bool (*FoncComp) (GDCM_NAME_SPACE::File *file1, G protected: private: bool CompareOnSortTag (GDCM_NAME_SPACE::File *file1, GDCM_NAME_SPACE::File *file2); - bool CompareOnSortTagConvertToFloat(GDCM_NAME_SPACE::File *file1, GDCM_NAME_SPACE::File *file2); + bool CompareOnSortTagConvertToFloat(GDCM_NAME_SPACE::File *file1, GDCM_NAME_SPACE::File *file2); // Data // ---- @@ -98,7 +98,7 @@ typedef bool (*FoncComp) (GDCM_NAME_SPACE::File *file1, G bool SortOnPosition; bool SortOnOrientation; - bool SortOnTag; + bool SortOnTag; bool SortOnFileName; bool SortOnUserFunction;