X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=vv%2FvvToolRigidReg.h;h=be3cdeae305009d26654d494b68901273d093d71;hb=47f57b9b725839bfe9289aedcc6b54f4434a566b;hp=5d3dc59151e18cc9948460c550a941a82a2d52ed;hpb=60f172d9e418e6e262b2c896ab482fd4b5a715c7;p=clitk.git

diff --git a/vv/vvToolRigidReg.h b/vv/vvToolRigidReg.h
index 5d3dc59..be3cdea 100644
--- a/vv/vvToolRigidReg.h
+++ b/vv/vvToolRigidReg.h
@@ -1,3 +1,4 @@
+
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
@@ -25,6 +26,8 @@
 #include "vvMainWindowBase.h"
 #include "vvMainWindow.h"
 #include "ui_vvToolRigidReg.h"
+#include "vtkMatrix4x4.h"
+#include "clitkAffineRegistration_ggo.h"
 
 //------------------------------------------------------------------------------
 class vvToolRigidReg:
@@ -49,25 +52,38 @@ public slots:
     SetToolTip("Register Image.");
     SetToolExperimental(true);
   }
+  virtual void GetArgsInfoFromGUI();
+  void SetOverlay(vvImage::Pointer Image);
+  void RemoveOverlay();
   void SetXvalue();
   void SetYvalue();
   void SetZvalue();
-  void UpdateXtranslider();
-  void UpdateYtranslider();
-  void UpdateZtranslider();
-  void UpdateXrotslider();
-  void UpdateYrotslider();
-  void UpdateZrotslider();
-  void SetOverlay();
-protected:
+  void Render();
+  void UpdateTextEditor(vtkMatrix4x4 *matrix,QTextEdit *textEdit);
+  void UpdateTransform_sliders();
+  void UpdateTransform_sb();
+  void UpdateTransform(bool slider_enabled);  
+  void AutoRegister();
+  void SaveFile();
+  void ReadFile();
+  void ResetTransform();
+  void SetRotationCenter();
+  void SetSliderRanges();
+  void InitializeSliders(double xtrans,double ytrans, double ztrans, double xrot, double yrot, double zrot,bool sliders);
+  void InitializeComboBox();
+  protected:
   Ui::vvToolRigidReg ui;
   vvSlicerManager * mInput1;
   vvSlicerManager * mInput2;
   vvMainWindow * mWindow;
   bool mTwoInputs;
-  void SetTransform(double tX, double tY, double tZ, double aX, double aY, double aZ);
+  std::vector<int> mImageSize;
+  args_info_clitkAffineRegistration mArgsInfo;
+  double mInitialMatrix[16];
+  void SetTransform(double tX, double tY, double tZ, double aX, double aY, double aZ,bool update);
+  void SetTransform(vtkMatrix4x4 * matrix);
 }; // end class vvToolRigidReg
 //------------------------------------------------------------------------------
 
 #endif
-
+