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

diff --git a/vv/vvToolRigidReg.h b/vv/vvToolRigidReg.h
index 0ed4e3d..f543ff5 100644
--- a/vv/vvToolRigidReg.h
+++ b/vv/vvToolRigidReg.h
@@ -1,9 +1,10 @@
+
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
   Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +15,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef VVTOOLRIGIDREG_H
 #define VVTOOLRIGIDREG_H
 #include <QtDesigner/QDesignerExportWidget>
@@ -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
-
+