Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 078c5a4de21d50e1839019a5e469c3bf8789d4f6..74eab21a1f1f2d9e9801022ad12641ce729fe4bb 100644 (file)
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -23,6 +23,7 @@ IF(VTK_FOUND)
       vtkWidgets
       vtkImaging
       vtkHybrid
+      vtkQVTK
       )
   ENDIF(VTK_VERSION VERSION_LESS 5.8.0)
 ELSE(VTK_FOUND)

diff --git a/tools/clitkImageArithmGenericFilter.cxx b/tools/clitkImageArithmGenericFilter.cxx
index 964607eb52a036e361c9cad3520c3502204325cb..71da90e44d7308060b10667ae4d2c50c66e75b2f 100644 (file)
--- a/tools/clitkImageArithmGenericFilter.cxx
+++ b/tools/clitkImageArithmGenericFilter.cxx
@@ -32,14 +32,14 @@ namespace clitk {
     typedef itk::Image< itk::Vector<float, 3u>, 3u > ImageType;
     
     // Read input1
-    typename ImageType::Pointer input1 = this->GetInput<ImageType>(0);
+    ImageType::Pointer input1 = this->GetInput<ImageType>(0);
 
     // Set input image iterator
     typedef itk::ImageRegionIterator<ImageType> IteratorType;
     IteratorType it(input1, input1->GetLargestPossibleRegion());
 
     // typedef input2
-    typename ImageType::Pointer input2 = NULL;
+    ImageType::Pointer input2 = NULL;
     IteratorType it2;
 
     /*
@@ -106,7 +106,7 @@ namespace clitk {
       } else*/ {
         // Create output image
         typedef ImageType OutputImageType;
-        typename OutputImageType::Pointer output = OutputImageType::New();
+        OutputImageType::Pointer output = OutputImageType::New();
         output->SetRegions(input1->GetLargestPossibleRegion());
         output->SetOrigin(input1->GetOrigin());
         output->SetSpacing(input1->GetSpacing());
@@ -134,7 +134,7 @@ namespace clitk {
     ito.GoToBegin();
     it.GoToBegin();
     
-    typedef typename Iter2::PixelType PixelType;
+    typedef Iter2::PixelType PixelType;
 
     PixelType scalar_vector;
     scalar_vector.Fill(mScalar);
@@ -265,7 +265,7 @@ namespace clitk {
     it1.GoToBegin();
     it2.GoToBegin();
     ito.GoToBegin();
-    typedef typename Iter3::PixelType PixelType;
+    typedef Iter3::PixelType PixelType;
 
     switch (mTypeOfOperation) {
     case 0: // Addition

diff --git a/vv/qt_ui/vvToolRigidReg.ui b/vv/qt_ui/vvToolRigidReg.ui
index 10e77d6d613ec91abb6b54eadbec4dcdff65085b..02eb98ebef369a824b42c3c6661fd14a5607fc02 100644 (file)
--- a/vv/qt_ui/vvToolRigidReg.ui
+++ b/vv/qt_ui/vvToolRigidReg.ui
@@ -369,13 +369,13 @@ p, li { white-space: pre-wrap; }
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <item>
-          <widget class="QLineEdit" name="Zval"/>
+          <widget class="QLineEdit" name="Xval"/>
          </item>
          <item>
           <widget class="QLineEdit" name="Yval"/>
          </item>
          <item>
-          <widget class="QLineEdit" name="Xval"/>
+          <widget class="QLineEdit" name="Zval"/>
          </item>
         </layout>
        </item>

diff --git a/vv/vvToolRigidReg.cxx b/vv/vvToolRigidReg.cxx
index 57d7bcb085329ba1d4d004fd8c5887824be80fe4..28591ba05ed1b6c6cc8af79af440ef5eaea6eb37 100644 (file)
--- a/vv/vvToolRigidReg.cxx
+++ b/vv/vvToolRigidReg.cxx
@@ -108,9 +108,9 @@ void vvToolRigidReg::InputIsSelected(vvSlicerManager *input)
   imageorigin=mInput->GetImage()->GetOrigin();
   std::vector<int> imageSize = mInput->GetImage()->GetSize();
   std::vector<double> imageSpacing = mInput->GetImage()->GetSpacing();
-  xcord=xcord.setNum(imageorigin[0]+imageSize[0]*imageSpacing[0]/2, 'g', 3);
-  ycord=ycord.setNum(imageorigin[1]+imageSize[1]*imageSpacing[1]/2, 'g', 3);
-  zcord=zcord.setNum(imageorigin[2]+imageSize[2]*imageSpacing[2]/2, 'g', 3);
+  xcord=xcord.setNum(imageorigin[0]+(imageSize[0]-1)*imageSpacing[0]*0.5, 'g', 3);
+  ycord=ycord.setNum(imageorigin[1]+(imageSize[1]-1)*imageSpacing[1]*0.5, 'g', 3);
+  zcord=zcord.setNum(imageorigin[2]+(imageSize[2]-1)*imageSpacing[2]*0.5, 'g', 3);
   Xval->setText(xcord);
   Yval->setText(ycord);
   Zval->setText(zcord);
@@ -370,7 +370,6 @@ void vvToolRigidReg::SetTransform(vtkMatrix4x4 *matrix)
   euler->SetMatrix(rotMat);
   euler->SetOffset(transVec);
 
-
   // Modify GUI according to the new parameters
   std::vector<QSlider *> transSliders, rotSliders;
   std::vector<QDoubleSpinBox *> transSBs, rotSBs;