X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolRigidReg.h;h=6dacdba3c9843b79f162318231d616c9b5093a38;hb=9dcfc70a568fda4cc6835eb55fc0e5f22b9e91d0;hp=0ed4e3d8e531061e645fa1ca65d1e19abee03d96;hpb=421793325fd0ca0570ad3db66c8d216116945472;p=clitk.git

diff --git a/vv/vvToolRigidReg.h b/vv/vvToolRigidReg.h
index 0ed4e3d..6dacdba 100644
--- a/vv/vvToolRigidReg.h
+++ b/vv/vvToolRigidReg.h
@@ -1,3 +1,4 @@
+
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
@@ -26,6 +27,7 @@
 #include "vvMainWindow.h"
 #include "ui_vvToolRigidReg.h"
 #include "vtkMatrix4x4.h"
+#include "clitkAffineRegistration_ggo.h"
 
 //------------------------------------------------------------------------------
 class vvToolRigidReg:
@@ -50,48 +52,50 @@ public slots:
     SetToolTip("Register Image.");
     SetToolExperimental(true);
   }
+  virtual void GetArgsInfoFromGUI();
+  void SetOverlay(vvImage::Pointer Image);
+  void RemoveOverlay();
   void SetXvalue();
   void SetYvalue();
   void SetZvalue();
-  void SetOrderXtrans();
-  void SetOrderYtrans();
-  void SetOrderZtrans();
-  void SetOrderXrot();
-  void SetOrderYrot();
-  void SetOrderZrot();
-  void UpdateXtranslider();
-  void UpdateXtransb();
-  void UpdateYtranslider();
-  void UpdateYtransb();
-  void UpdateZtranslider();
-  void UpdateZtransb();
-  void UpdateXrotslider();
-  void UpdateXrotsb();
-  void UpdateYrotslider();
-  void UpdateYrotsb(); 
-  void UpdateZrotslider();
-  void UpdateZrotsb();  
-  void SetOverlay();
+  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 ReadFile(bool matrix_given);
+  void LoadFile();
   void ResetTransform();
   void SetRotationCenter();
   void SetSliderRanges();
-  void UpdateTextEditor(vtkMatrix4x4 *matrix,QString SetOrder);
-  void InitializeSliders();
-  
+  void InitializeSliders(double xtrans,double ytrans, double ztrans, double xrot, double yrot, double zrot,bool sliders);
+  void TransformSelect();
+  void OptimizerSelect();
+  void InterpolatorSelect();
+  void MetricSelect();
+  void OutputSelect();
+  void SaveTextEdit();
+  void CmdlineParser(int override, int initialize);
+  void Presets();
+  void UpdateTextEditor2();
+  void CheckRigidReg(); //Deformable or Rigid
+  void CheckDeformableReg();
   protected:
   Ui::vvToolRigidReg ui;
   vvSlicerManager * mInput1;
   vvSlicerManager * mInput2;
   vvMainWindow * mWindow;
-  QString mOrder;
+  std::string mConfigFile;
   bool mTwoInputs;
   std::vector<int> mImageSize;
-  void SetTransform(double tX, double tY, double tZ, double aX, double aY, double aZ);
+  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
-
+