X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvImageWarp.cxx;h=2890ec8188efd8e22a98da6b5e6c0527bcac0272;hb=58f6f4201ec9091b5150f6576da25bfedeabbdce;hp=1fd6778bcfe5d8252cb9ad1fc3816cbeaa72f60d;hpb=1e034c70105f0926939acaaa27ddb46e904ae8bf;p=clitk.git

diff --git a/vv/vvImageWarp.cxx b/vv/vvImageWarp.cxx
index 1fd6778..2890ec8 100644
--- a/vv/vvImageWarp.cxx
+++ b/vv/vvImageWarp.cxx
@@ -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,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #include <QProgressDialog>
 #include <QWidget>
 #include <itkImage.h>
@@ -43,7 +43,7 @@ template<unsigned int Dim>
 void vvImageWarp::Update_WithDim()
 {
 #define TRY_TYPE(TYPE)							\
-  if (clitk::IsSameType<TYPE>(mInputImage->GetScalarTypeAsString())) { this->Update_WithDimAndPixelType<Dim, TYPE>(); return; }
+  if (clitk::IsSameType<TYPE>(mInputImage->GetScalarTypeAsITKString())) { this->Update_WithDimAndPixelType<Dim, TYPE>(); return; }
 //  TRY_TYPE(signed char);
 //  TRY_TYPE(uchar);
   TRY_TYPE(short);
@@ -54,7 +54,7 @@ void vvImageWarp::Update_WithDim()
 #undef TRY_TYPE
 
   std::string list = clitk::CreateListOfTypes<char, clitk::uchar, short, ushort, int, float, double>();
-  std::cerr << "Error, I don't know the type '" << mInputImage->GetScalarTypeAsString() << "' for the input image. "
+  std::cerr << "Error, I don't know the type '" << mInputImage->GetScalarTypeAsITKString() << "' for the input image. "
             << std::endl << "Known types are " << list << std::endl;
   exit(0);
 }
@@ -101,7 +101,7 @@ void vvImageWarp::Update_WithDimAndPixelType()
     jacobian_filter->SetUseImageSpacingOn();
     vf_connector->SetInput(mVF->GetVTKImages()[num]);
     warp_filter->SetInput(input[num]);
-    warp_filter->SetDeformationField(vf_connector->GetOutput());
+    warp_filter->SetDisplacementField(vf_connector->GetOutput());
     jacobian_filter->SetInput(vf_connector->GetOutput());
     warp_filter->SetOutputSpacing(input[num]->GetSpacing());
     warp_filter->SetOutputOrigin(input[num]->GetOrigin());