comments

diff --git a/Example/exUnMosaic.cxx b/Example/exUnMosaic.cxx
index 28126d9447bb7e5e3a0513196f422096ffd12030..5a1d780ffa55055721a63c72edde23786be46a3d 100755 (executable)
--- 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 60bd1b0752f5cb34eafeebc2950679ecf7c2e182..c9b441c6d72921eaed308cee5554d405b1587918 100755 (executable)
--- 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 b065f469d74861f8d888143558c91bc0e3ea870f..9e2a39dd8f3489969a09cfd46895730bbe331c4d 100755 (executable)
--- 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 56aaaabcb1533c75bd01f38caa9016193a715dd0..86f1ec6f499d0163d792b48600b1fefff057b587 100644 (file)
--- 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 5816bcb15b6eef1164915c8bf5167dc7c3b0340f..892971eddb89fda7162db538aa43428ad6a61e3d 100644 (file)
--- 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 4fe3410557cb7baf14e710ba0aa34e3bd4cd3a1b..bab06418d99001735df3241c82d490a37f535910 100644 (file)
--- 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 9162f47bc204f8397f59a7d371ce49b756c34690..908cbe790046725e76f5eddc836c060338f62107 100644 (file)
--- 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 <vector>
 #include <vtkImageData.h>
-#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<vtkImageData*> *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;