X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolRigidReg.h;h=f543ff5f4a0dcaa10db268e0269aed2bb05f24d8;hb=5a7da4aedae5c204bc55c187717193e5950f9a44;hp=5a2ac907e17d089e09a670090e742b51a5ed10db;hpb=0900d525322c73ec7738ff558266bb933e0233d5;p=clitk.git

diff --git a/vv/vvToolRigidReg.h b/vv/vvToolRigidReg.h
index 5a2ac90..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>
@@ -52,7 +53,7 @@ public slots:
     SetToolExperimental(true);
   }
   virtual void GetArgsInfoFromGUI();
-  void SetOverlay();
+  void SetOverlay(vvImage::Pointer Image);
   void RemoveOverlay();
   void SetXvalue();
   void SetYvalue();
@@ -64,16 +65,29 @@ public slots:
   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 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;
+  std::string mConfigFile;
   bool mTwoInputs;
   std::vector<int> mImageSize;
   args_info_clitkAffineRegistration mArgsInfo;