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

diff --git a/common/vvImage.cxx b/common/vvImage.cxx
index 797fa3e..c5a3af7 100644
--- a/common/vvImage.cxx
+++ b/common/vvImage.cxx
@@ -19,13 +19,16 @@
 #define VVIMAGE_CXX
 #include "vvImage.h"
 #include "clitkCommon.h"
-#include <vtkTransform.h>
 #include <vtkImageData.h>
 #include <vtkImageReslice.h>
 #include <cassert>
 
+#include <vtkTransform.h>
+
+#define NO_RESLICE 1
+
 //--------------------------------------------------------------------
-vvImage::vvImage()
+vvImage::vvImage():mTransform(vtkSmartPointer<vtkTransform>::New())
 {
   Init();
 }
@@ -37,15 +40,13 @@ void vvImage::Init()
 {
   mTimeSpacing = 1;
   mTimeOrigin = 0;
-
-  if (CLITK_EXPERIMENTAL)
-    mTransform = vtkSmartPointer<vtkTransform>::New();
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
 vvImage::~vvImage()
 {
+  DD("vvImage got deleted!");
   Reset();
 }
 //--------------------------------------------------------------------
@@ -53,13 +54,6 @@ 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();
-
   mVtkImages.resize(0);
   mVtkImageReslice.resize(0);
 
@@ -67,36 +61,6 @@ void vvImage::Reset()
 }
 //--------------------------------------------------------------------
 
-
-//--------------------------------------------------------------------
-void vvImage::SetImage(std::vector< vtkImageData* > images)
-{
-  Reset();
-  for (unsigned int i = 0; i < images.size(); i++)
-    AddImage(images[i]);
-}
-//--------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------
-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);
-}
-//--------------------------------------------------------------------
-
 //--------------------------------------------------------------------
 int vvImage::GetNumberOfSpatialDimensions()
 {
@@ -107,7 +71,7 @@ int vvImage::GetNumberOfSpatialDimensions()
     return dim;
 }
 //--------------------------------------------------------------------
-//
+
 //--------------------------------------------------------------------
 int vvImage::GetNumberOfDimensions() const
 {
@@ -123,6 +87,8 @@ int vvImage::GetNumberOfDimensions() const
   }
   return 0;
 }
+//--------------------------------------------------------------------
+
 //--------------------------------------------------------------------
 void vvImage::GetScalarRange(double* range)
 {
@@ -136,6 +102,7 @@ void vvImage::GetScalarRange(double* range)
     if (temp[1] > range[1]) range[1]=temp[1];
   }
 }
+//--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
 std::string vvImage::GetScalarTypeAsITKString()
@@ -233,7 +200,6 @@ const std::vector<vtkImageData*>& vvImage::GetVTKImages()
 }
 //--------------------------------------------------------------------
 
-
 //--------------------------------------------------------------------
 vtkImageData* vvImage::GetFirstVTKImageData()
 {
@@ -241,7 +207,6 @@ vtkImageData* vvImage::GetFirstVTKImageData()
 }
 //--------------------------------------------------------------------
 
-
 //--------------------------------------------------------------------
 bool vvImage::IsScalarTypeInteger()
 {
@@ -274,15 +239,7 @@ bool vvImage::IsScalarTypeInteger(int t)
 //--------------------------------------------------------------------
 vtkSmartPointer<vtkTransform> vvImage::GetTransform()
 {
-  return mTransform;
-}
-//--------------------------------------------------------------------
-
-//--------------------------------------------------------------------
-void vvImage::SetTransform(vtkSmartPointer<vtkTransform> transform)
-{
-  mTransform = transform;
-  this->UpdateReslice();
+  return this->mTransform;
 }
 //--------------------------------------------------------------------
 
@@ -295,18 +252,4 @@ void vvImage::UpdateReslice()
 }
 //--------------------------------------------------------------------
 
-
-//--------------------------------------------------------------------
-vtkImageData * CopyAndCastToFloatFrom(vtkImageData * input)
-{
-  vtkImageData * p = vtkImageData::New();
-  p->SetExtent(input->GetExtent ()); // Only first ! could not be 4D
-  p->SetScalarTypeToFloat();
-  p->AllocateScalars();
-  p->CopyAndCastFrom(input, input->GetExtent());
-  return p;
-}
-//--------------------------------------------------------------------
-
-
 #endif // VVIMAGE_CXX