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

diff --git a/itk/clitkAddRelativePositionConstraintToLabelImageFilter.txx b/itk/clitkAddRelativePositionConstraintToLabelImageFilter.txx
index a9f8a910893efd4049270c3dbfeb8bf2b794524e..54f431109728bd8b31b4bdbd8b5d09cc9679e441 100644 (file)
--- a/itk/clitkAddRelativePositionConstraintToLabelImageFilter.txx
+++ b/itk/clitkAddRelativePositionConstraintToLabelImageFilter.txx
@@ -32,7 +32,11 @@
 #include <itkBinaryErodeImageFilter.h>
 #include <itkBinaryBallStructuringElement.h>
 #include <itkAddImageFilter.h>
-#include <itkDivideByConstantImageFilter.h>
+#if ITK_VERSION_MAJOR >= 4
+  #include <itkDivideImageFilter.h>
+#else
+  #include <itkDivideByConstantImageFilter.h>
+#endif
 
 // itk [Bloch et al] 
 #include "RelativePositionPropImageFilter.h"
@@ -359,10 +363,16 @@ GenerateData()
 
   // Divide by the number of relpos
   if (GetNumberOfAngles() != 1) {
+#if ITK_VERSION_MAJOR >= 4
+    typedef itk::DivideImageFilter<FloatImageType, FloatImageType, FloatImageType> DivideFilter;
+    typename DivideFilter::Pointer divideFilter = DivideFilter::New();
+    divideFilter->SetConstant2(GetNumberOfAngles());
+#else
     typedef itk::DivideByConstantImageFilter<FloatImageType, float, FloatImageType> DivideFilter;
     typename DivideFilter::Pointer divideFilter = DivideFilter::New();
-    divideFilter->SetInput(m_FuzzyMap);
     divideFilter->SetConstant(GetNumberOfAngles());
+#endif
+    divideFilter->SetInput(m_FuzzyMap);
     divideFilter->Update();
     m_FuzzyMap = divideFilter->GetOutput();
   }

diff --git a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
index 81173be3393e2727a44f65c63d671cfd0eeef1b2..835123c34d9e78a38a826a677a3c8977d8156f5b 100644 (file)
--- a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
+++ b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
@@ -27,7 +27,6 @@
 #include "itkImageRegion.h"
 #include "itkSpatialObject.h"
 #include "itkPasteImageFilter.h"
-#include "itkMultiplyByConstantImageFilter.h"
 
 namespace clitk
 {

diff --git a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.txx b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.txx
index 5a4b9503cdf33cbba22f925e7f40bc5f20e04efe..ea50aa4d2d27b60918f42fada57225143f4cae4c 100644 (file)
--- a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.txx
+++ b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.txx
@@ -1037,7 +1037,6 @@ namespace clitk
     typedef itk::PasteImageFilter<CoefficientImageType, CoefficientImageType, CoefficientImageType> PasteImageFilterType;
     typedef clitk::ExtractImageFilter<CoefficientImageType, CoefficientImageType> ExtractImageFilterType;
     typedef clitk::LinearCombinationImageFilter<CoefficientImageType, CoefficientImageType> LinearCombinationFilterType;
-    typedef itk::MultiplyByConstantImageFilter<CoefficientImageType, double, CoefficientImageType> MultiplicationFilterType;
 
     // Regions
     typename   CoefficientImageType::RegionType sourceRegion=m_PaddedCoefficientImage->GetLargestPossibleRegion();

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index 21074a8ea71f4c58a6980411349f9ca1e4f78e13..303efebbaf8aafe2e41f76201f5eab18972c50cb 100644 (file)
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@ -1241,23 +1241,18 @@ void vvMainWindow::ShowHelpDialog()
 //------------------------------------------------------------------------------
 void vvMainWindow::ChangeViewMode()
 {
-  QListIterator<int> it0(splitter_3->sizes());
-  QListIterator<int> it1(splitter_3->sizes());
-  int max0 = 0;
-  int max1 = 1;
-  while (it0.hasNext()) {
-    max0 += it0.next();
-  }
-  while (it1.hasNext()) {
-    max1 += it1.next();
+  QListIterator<int> it(splitter_3->sizes());
+  int max_size = 0;
+  while (it.hasNext()) {
+    max_size += it.next();
   }
   QList<int> size0;
   QList<int> size1;
   if (viewMode == 1) {
     viewMode = 0;
-    size0.push_back(max0);
+    size0.push_back(max_size);
     size0.push_back(0);
-    size1.push_back(max1);
+    size1.push_back(max_size + 1);
     size1.push_back(0);
     splitter_3->setSizes(size0);
     OSplitter->setSizes(size1);
@@ -1266,10 +1261,10 @@ void vvMainWindow::ChangeViewMode()
     DataTree->setColumnHidden(4,1);
   } else {
     viewMode = 1;
-    size0.push_back(int(max0/2));
-    size0.push_back(int(max0/2));
-    size1.push_back(int(max1/2));
-    size1.push_back(int(max1/2));
+    size0.push_back(max_size / 2);
+    size0.push_back(max_size / 2);
+    size1.push_back((max_size + 1) / 2);
+    size1.push_back((max_size + 1) / 2);
     splitter_3->setSizes(size0);
     OSplitter->setSizes(size1);
     DataTree->setColumnHidden(2,0);