X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvImage.cxx;h=066aaada7d0aa80d4d5281628820217bc414b392;hb=3c39a5dd8f8eb8f8930ffb3d4fe34fd524559b6e;hp=797fa3e9dd35458d383850e6c388fcde946b9654;hpb=ef9b02c88f132a17f2292e84b4167c22e1b87f8d;p=clitk.git

diff --git a/common/vvImage.cxx b/common/vvImage.cxx
index 797fa3e..066aaad 100644
--- a/common/vvImage.cxx
+++ b/common/vvImage.cxx
@@ -19,14 +19,21 @@
 #define VVIMAGE_CXX
 #include "vvImage.h"
 #include "clitkCommon.h"
-#include <vtkTransform.h>
 #include <vtkImageData.h>
 #include <vtkImageReslice.h>
 #include <cassert>
 
+#include <vtkGeneralTransform.h>
+#include <vtkTransform.h>
+#include <vtkGridTransform.h>
+
 //--------------------------------------------------------------------
-vvImage::vvImage()
+vvImage::vvImage():mGeneralTransform(vtkSmartPointer<vtkGeneralTransform>::New()),
+		   mTransform       (vtkSmartPointer<vtkTransform>::New()),
+	           mGridTransform   (vtkSmartPointer<vtkGridTransform>::New())
 {
+  mGeneralTransform->Concatenate(mTransform);
+  mGeneralTransform->Concatenate(mGridTransform);
   Init();
 }
 //--------------------------------------------------------------------
@@ -37,15 +44,13 @@ void vvImage::Init()
 {
   mTimeSpacing = 1;
   mTimeOrigin = 0;
-
-  if (CLITK_EXPERIMENTAL)
-    mTransform = vtkSmartPointer<vtkTransform>::New();
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
 vvImage::~vvImage()
 {
+  DD("vvImage got deleted!");
   Reset();
 }
 //--------------------------------------------------------------------
@@ -53,12 +58,8 @@ vvImage::~vvImage()
 //--------------------------------------------------------------------
 void vvImage::Reset()
 {
-  if (CLITK_EXPERIMENTAL)
-    for (unsigned int i = 0; i < mVtkImages.size(); i++)
-      mVtkImageReslice[i]->GetInput(0)->Delete();
-  else
-    for (unsigned int i = 0; i < mVtkImages.size(); i++)
-      mVtkImages[i]->Delete();
+  for (unsigned int i = 0; i < mVtkImages.size(); i++)
+    mVtkImageReslice[i]->GetInput()->Delete();
 
   mVtkImages.resize(0);
   mVtkImageReslice.resize(0);
@@ -67,7 +68,6 @@ void vvImage::Reset()
 }
 //--------------------------------------------------------------------
 
-
 //--------------------------------------------------------------------
 void vvImage::SetImage(std::vector< vtkImageData* > images)
 {
@@ -81,19 +81,16 @@ void vvImage::SetImage(std::vector< vtkImageData* > images)
 //--------------------------------------------------------------------
 void vvImage::AddImage(vtkImageData* image)
 {
-  if (CLITK_EXPERIMENTAL) {
-    mVtkImageReslice.push_back(vtkSmartPointer<vtkImageReslice>::New());
-
-    mVtkImageReslice.back()->SetInterpolationModeToLinear();
-    mVtkImageReslice.back()->AutoCropOutputOn();
-    mVtkImageReslice.back()->SetBackgroundColor(-1000,-1000,-1000,1);
-    mVtkImageReslice.back()->SetResliceTransform(mTransform);
-    mVtkImageReslice.back()->SetInput(0, image);
-    mVtkImageReslice.back()->Update();
-
-    mVtkImages.push_back( mVtkImageReslice.back()->GetOutput(0) );
-  } else
-    mVtkImages.push_back(image);
+  mVtkImageReslice.push_back(vtkSmartPointer<vtkImageReslice>::New());
+
+  mVtkImageReslice.back()->SetInterpolationModeToLinear();
+  mVtkImageReslice.back()->AutoCropOutputOn();
+  mVtkImageReslice.back()->SetBackgroundColor(-1000,-1000,-1000,1);
+  mVtkImageReslice.back()->SetResliceTransform(mGeneralTransform);
+  mVtkImageReslice.back()->SetInput(0, image);
+  mVtkImageReslice.back()->Update();
+
+  mVtkImages.push_back( mVtkImageReslice.back()->GetOutput(0) );
 }
 //--------------------------------------------------------------------
 
@@ -107,7 +104,7 @@ int vvImage::GetNumberOfSpatialDimensions()
     return dim;
 }
 //--------------------------------------------------------------------
-//
+
 //--------------------------------------------------------------------
 int vvImage::GetNumberOfDimensions() const
 {
@@ -123,6 +120,8 @@ int vvImage::GetNumberOfDimensions() const
   }
   return 0;
 }
+//--------------------------------------------------------------------
+
 //--------------------------------------------------------------------
 void vvImage::GetScalarRange(double* range)
 {
@@ -136,6 +135,7 @@ void vvImage::GetScalarRange(double* range)
     if (temp[1] > range[1]) range[1]=temp[1];
   }
 }
+//--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
 std::string vvImage::GetScalarTypeAsITKString()
@@ -233,15 +233,13 @@ const std::vector<vtkImageData*>& vvImage::GetVTKImages()
 }
 //--------------------------------------------------------------------
 
-
 //--------------------------------------------------------------------
-vtkImageData* vvImage::GetFirstVTKImageData()
+vtkSmartPointer<vtkImageData> vvImage::GetFirstVTKImageData()
 {
   return mVtkImages[0];
 }
 //--------------------------------------------------------------------
 
-
 //--------------------------------------------------------------------
 bool vvImage::IsScalarTypeInteger()
 {
@@ -279,10 +277,9 @@ vtkSmartPointer<vtkTransform> vvImage::GetTransform()
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-void vvImage::SetTransform(vtkSmartPointer<vtkTransform> transform)
+vtkSmartPointer<vtkGridTransform> vvImage::GetGridTransform()
 {
-  mTransform = transform;
-  this->UpdateReslice();
+  return mGridTransform;
 }
 //--------------------------------------------------------------------
 
@@ -299,7 +296,7 @@ void vvImage::UpdateReslice()
 //--------------------------------------------------------------------
 vtkImageData * CopyAndCastToFloatFrom(vtkImageData * input)
 {
-  vtkImageData * p = vtkImageData::New();
+  vtkSmartPointer<vtkImageData>  p = vtkSmartPointer<vtkImageData>::New();
   p->SetExtent(input->GetExtent ()); // Only first ! could not be 4D
   p->SetScalarTypeToFloat();
   p->AllocateScalars();