Merge branch 'master' of /home/dsarrut/clitk3.server

diff --git a/itk/RelativePositionPropImageFilter.h b/itk/RelativePositionPropImageFilter.h
index 93a3aa303541299be87153742d1eb0c538a03f3e..11797e78d72ed449edddafc67d1873f7b2a1a3d1 100644 (file)
--- a/itk/RelativePositionPropImageFilter.h
+++ b/itk/RelativePositionPropImageFilter.h
@@ -80,11 +80,18 @@ namespace itk
    *   
    *   This filter is implemented using the propagation algorithm
    */
- 
+
+#if ITK_VERSION_MAJOR == 4
+  template <class TInputImage, class TOutputImage, class TtNorm=Functor::Minimum<
+                                                     typename TOutputImage::PixelType,
+                                                     typename TOutputImage::PixelType,
+                                                     typename TOutputImage::PixelType>  >
+#else
   template <class TInputImage, class TOutputImage, class TtNorm=Function::Minimum<
                                                      typename TOutputImage::PixelType,
                                                      typename TOutputImage::PixelType,
                                                      typename TOutputImage::PixelType>  >
+#endif
   class ITK_EXPORT RelativePositionPropImageFilter :
     public ImageToImageFilter< TInputImage, TOutputImage > 
   {

diff --git a/vv/scripts/create_sequence.sh b/vv/scripts/create_sequence.sh
index 73ff9a6aacdd21cd1815080422c59e25a0fdd526..339d3519612da79883bcab6b9e20b4d713a9f856 100755 (executable)
--- a/vv/scripts/create_sequence.sh
+++ b/vv/scripts/create_sequence.sh
@@ -12,4 +12,4 @@ do
     find "$i" -iname "*.dcm" | clitkDicom2Image --focal_origin -o "$filename" --std_input
 done
 
-create_mhd_4D.sh . "CT_4D.mhd"
+create_mhd_4D.sh .

diff --git a/vv/scripts/transfer_patients.sh b/vv/scripts/transfer_patients.sh
deleted file mode 100755 (executable)
index e683f7d..0000000
--- a/vv/scripts/transfer_patients.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-cd current
-echo -n "Patients before: "
-find . -type l | wc -l
-for i in /home/gauthier/Base_de_donnees_stereo_poumon/*; do [ -e "$i" ] || ln -s "$i" .; done
-echo -n "Patients after: "
-find . -type l | wc -l
-for i in $(find . -type l); do date; echo $i; irsync -rv "$i" "i:/rhone-alpes/home/clb/patients/$i" >> "$i"_$(date "+%H:%m-%d_%b%Y").log; done