X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=common%2FvvImage.cxx;h=1f5116849cb711a73cc80cfa19954c1bcfd7c6ab;hb=c13d024475699d94ed1018a1e3be7cce91f1de97;hp=cbcf7497cb80bcb878580ecb49e5679dba6a53e9;hpb=fac0ed982e49a7adde59d6e454b20bb846961bc7;p=clitk.git

diff --git a/common/vvImage.cxx b/common/vvImage.cxx
index cbcf749..1f51168 100644
--- a/common/vvImage.cxx
+++ b/common/vvImage.cxx
@@ -17,15 +17,23 @@
 ======================================================================-====*/
 #ifndef VVIMAGE_CXX
 #define VVIMAGE_CXX
+
+// vv
 #include "vvImage.h"
+
+// clitk
 #include "clitkCommon.h"
-#include <vtkTransform.h>
+
+// vtk
 #include <vtkImageData.h>
 #include <vtkImageReslice.h>
+#include <vtkTransform.h>
+
+// std
 #include <cassert>
 
 //--------------------------------------------------------------------
-vvImage::vvImage()
+vvImage::vvImage():mTransform(vtkSmartPointer<vtkTransform>::New())
 {
   Init();
 }
@@ -37,15 +45,14 @@ void vvImage::Init()
 {
   mTimeSpacing = 1;
   mTimeOrigin = 0;
-
-  if (CLITK_EXPERIMENTAL)
-    mTransform = vtkSmartPointer<vtkTransform>::New();
+  mImageDimension = 0;
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
 vvImage::~vvImage()
 {
+  //  DD("vvImage got deleted!");
   Reset();
 }
 //--------------------------------------------------------------------
@@ -53,76 +60,34 @@ 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);
+  mTransformedVtkImages.resize(0);
   mVtkImageReslice.resize(0);
 
   Init();
 }
 //--------------------------------------------------------------------
 
-
-//--------------------------------------------------------------------
-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()
 {
-  int dim=GetNumberOfDimensions();
-  if (IsTimeSequence())
-    return dim-1;
-  else
-    return dim;
+  return mImageDimension;
 }
 //--------------------------------------------------------------------
-//
+
 //--------------------------------------------------------------------
 int vvImage::GetNumberOfDimensions() const
 {
   if (mVtkImages.size()) {
-    int dimension = 2;
-    int extent[6];
-    mVtkImages[0]->GetWholeExtent(extent);
-    if (extent[5] - extent[4] >= 1)
-      dimension++;
-    if (mVtkImages.size() > 1)
-      dimension++;
-    return dimension;
+    if (IsTimeSequence())
+      return mImageDimension+1;
+    else
+      return mImageDimension;
   }
   return 0;
 }
+//--------------------------------------------------------------------
+
 //--------------------------------------------------------------------
 void vvImage::GetScalarRange(double* range)
 {
@@ -136,9 +101,10 @@ void vvImage::GetScalarRange(double* range)
     if (temp[1] > range[1]) range[1]=temp[1];
   }
 }
+//--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-std::string vvImage::GetScalarTypeAsString()
+std::string vvImage::GetScalarTypeAsITKString()
 {
   // WARNING VTK pixel type different from ITK Pixel type
   std::string vtktype = mVtkImages[0]->GetScalarTypeAsString();
@@ -219,7 +185,7 @@ unsigned long vvImage::GetActualMemorySize()
 
 
 //--------------------------------------------------------------------
-bool vvImage::IsTimeSequence()
+bool vvImage::IsTimeSequence() const
 {
   return mVtkImages.size()>1;
 }
@@ -233,6 +199,12 @@ const std::vector<vtkImageData*>& vvImage::GetVTKImages()
 }
 //--------------------------------------------------------------------
 
+//--------------------------------------------------------------------
+const std::vector<vtkImageData*>& vvImage::GetTransformedVTKImages()
+{
+  return mTransformedVtkImages;
+}
+//--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
 vtkImageData* vvImage::GetFirstVTKImageData()
@@ -241,7 +213,6 @@ vtkImageData* vvImage::GetFirstVTKImageData()
 }
 //--------------------------------------------------------------------
 
-
 //--------------------------------------------------------------------
 bool vvImage::IsScalarTypeInteger()
 {
@@ -274,15 +245,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;
 }
 //--------------------------------------------------------------------