X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolResample.h;h=2a4c427c5d3e4b78a5b07ac2fcc60d6ecdebfa7d;hb=b99fac059ebc47ce7b243dc9d802b23d730e7100;hp=b12e940a85f1b88bcda4ddca63b2f9bdb3cecead;hpb=5a80d16b4dc2ad2d825c443f39ae6276786e72e4;p=clitk.git

diff --git a/vv/vvToolResample.h b/vv/vvToolResample.h
index b12e940..2a4c427 100644
--- a/vv/vvToolResample.h
+++ b/vv/vvToolResample.h
@@ -3,7 +3,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
@@ -14,20 +14,28 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-  ======================================================================-====*/
+  ===========================================================================**/
 
 #ifndef _VVTOOLRESAMPLE_H
 #define _VVTOOLRESAMPLE_H
 
+// clitk
+//#include "clitkImageResampleGenericFilter.h"
+#include "clitkResampleImageGenericFilter.h"
+
+// vv
 #include "ui_vvToolResample.h"
-#include "clitkCommon.h"
-#include "clitkImageResampleGenericFilter.h"
 #include "vvImage.h"
 #include "vvSlicerManager.h"
 #include "vvToolWidgetBase.h"
 #include "vvToolBase.h"
 
+// qt
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 #include <QTreeWidget>
 
 //------------------------------------------------------------------------------
@@ -66,9 +74,9 @@ public slots:
 protected:
   Ui::vvToolResample ui;
   vvImage::Pointer mOutput;
-  clitk::ImageResampleGenericFilter::Pointer mFilter;
+  clitk::ResampleImageGenericFilter::Pointer mFilter;
 
-  vvSlicerManager* mCurrentSlicerManager;
+  //  vvSlicerManager* mCurrentSlicerManager;
   vvImage::Pointer mCurrentImage;
   int mCurrentIndex;