From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Tue, 14 Feb 2012 18:44:01 +0000 (+0100)
Subject: Keep displayed angles in [-360,360] instead of [-180,180]
X-Git-Tag: v1.3.0~98^2~1
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1753519ccc5895a24e2bb5853bf6e9d33050ba12;p=clitk.git

Keep displayed angles in [-360,360] instead of [-180,180]
---

diff --git a/vv/vvToolRigidReg.cxx b/vv/vvToolRigidReg.cxx
index 78e0d66..57d7bcb 100644
--- a/vv/vvToolRigidReg.cxx
+++ b/vv/vvToolRigidReg.cxx
@@ -376,19 +376,29 @@ void vvToolRigidReg::SetTransform(vtkMatrix4x4 *matrix)
   std::vector<QDoubleSpinBox *> transSBs, rotSBs;
   GetSlidersAndSpinBoxes(transSliders, rotSliders, transSBs, rotSBs);
   for(int i=0; i<3; i++) {
+    // Translations
     transSBs[i]->blockSignals(true);
     transSBs[i]->setValue( euler->GetParameters()[i+3] );
     transSBs[i]->blockSignals(false);
     transSliders[i]->blockSignals(true);
     transSliders[i]->setValue( itk::Math::Round<double,double>(euler->GetParameters()[i+3]) );
     transSliders[i]->blockSignals(false);
+
+    // Rotations
     double rad = (checkBoxDegrees->checkState()==Qt::Checked)?180./itk::Math::pi:1.;
-    rotSBs[i]->blockSignals(true);
-    rotSBs[i]->setValue( euler->GetParameters()[i]*rad );
-    rotSBs[i]->blockSignals(false);
-    rotSliders[i]->blockSignals(true);
-    rotSliders[i]->setValue( itk::Math::Round<double,double>(euler->GetParameters()[i]*180./itk::Math::pi) );
-    rotSliders[i]->blockSignals(false);
+    double angleDiff = euler->GetParameters()[i]-rotSBs[i]->value()/rad+2*itk::Math::pi;
+    angleDiff = angleDiff - 2*itk::Math::pi*itk::Math::Round<double,double>(angleDiff/(2*itk::Math::pi));
+    if(angleDiff>1.e-4) {
+      rotSBs[i]->blockSignals(true);
+      rotSBs[i]->setValue( euler->GetParameters()[i]*rad );
+      rotSBs[i]->blockSignals(false);
+    }
+    int iAngle = itk::Math::Round<int,double>(euler->GetParameters()[i]*180./itk::Math::pi);
+    if((iAngle-rotSliders[i]->value()+360)%360!=0) {
+      rotSliders[i]->blockSignals(true);
+      rotSliders[i]->setValue(iAngle);
+      rotSliders[i]->blockSignals(false);
+    }
   }
 }
 //------------------------------------------------------------------------------