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

diff --git a/vv/vvToolRigidReg.h b/vv/vvToolRigidReg.h
index be3cdea..f543ff5 100644
--- a/vv/vvToolRigidReg.h
+++ b/vv/vvToolRigidReg.h
@@ -4,7 +4,7 @@
 
   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
@@ -15,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>
@@ -65,17 +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 InitializeComboBox();
+  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;