X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvImage.cxx;h=1f5116849cb711a73cc80cfa19954c1bcfd7c6ab;hb=24fb0576a860ea843722b1d84561186542b62fd5;hp=066aaada7d0aa80d4d5281628820217bc414b392;hpb=bb5cabe4ab06b63743fceaa76aaf4b40c54110c2;p=clitk.git

diff --git a/common/vvImage.cxx b/common/vvImage.cxx
index 066aaad..1f51168 100644
--- a/common/vvImage.cxx
+++ b/common/vvImage.cxx
@@ -17,23 +17,24 @@
 ======================================================================-====*/
 #ifndef VVIMAGE_CXX
 #define VVIMAGE_CXX
+
+// vv
 #include "vvImage.h"
+
+// clitk
 #include "clitkCommon.h"
+
+// vtk
 #include <vtkImageData.h>
 #include <vtkImageReslice.h>
-#include <cassert>
-
-#include <vtkGeneralTransform.h>
 #include <vtkTransform.h>
-#include <vtkGridTransform.h>
+
+// std
+#include <cassert>
 
 //--------------------------------------------------------------------
-vvImage::vvImage():mGeneralTransform(vtkSmartPointer<vtkGeneralTransform>::New()),
-		   mTransform       (vtkSmartPointer<vtkTransform>::New()),
-	           mGridTransform   (vtkSmartPointer<vtkGridTransform>::New())
+vvImage::vvImage():mTransform(vtkSmartPointer<vtkTransform>::New())
 {
-  mGeneralTransform->Concatenate(mTransform);
-  mGeneralTransform->Concatenate(mGridTransform);
   Init();
 }
 //--------------------------------------------------------------------
@@ -44,13 +45,14 @@ void vvImage::Init()
 {
   mTimeSpacing = 1;
   mTimeOrigin = 0;
+  mImageDimension = 0;
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
 vvImage::~vvImage()
 {
-  DD("vvImage got deleted!");
+  //  DD("vvImage got deleted!");
   Reset();
 }
 //--------------------------------------------------------------------
@@ -58,50 +60,18 @@ vvImage::~vvImage()
 //--------------------------------------------------------------------
 void vvImage::Reset()
 {
-  for (unsigned int i = 0; i < mVtkImages.size(); i++)
-    mVtkImageReslice[i]->GetInput()->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)
-{
-  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) );
-}
-//--------------------------------------------------------------------
-
 //--------------------------------------------------------------------
 int vvImage::GetNumberOfSpatialDimensions()
 {
-  int dim=GetNumberOfDimensions();
-  if (IsTimeSequence())
-    return dim-1;
-  else
-    return dim;
+  return mImageDimension;
 }
 //--------------------------------------------------------------------
 
@@ -109,14 +79,10 @@ int vvImage::GetNumberOfSpatialDimensions()
 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;
 }
@@ -219,7 +185,7 @@ unsigned long vvImage::GetActualMemorySize()
 
 
 //--------------------------------------------------------------------
-bool vvImage::IsTimeSequence()
+bool vvImage::IsTimeSequence() const
 {
   return mVtkImages.size()>1;
 }
@@ -234,7 +200,14 @@ const std::vector<vtkImageData*>& vvImage::GetVTKImages()
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-vtkSmartPointer<vtkImageData> vvImage::GetFirstVTKImageData()
+const std::vector<vtkImageData*>& vvImage::GetTransformedVTKImages()
+{
+  return mTransformedVtkImages;
+}
+//--------------------------------------------------------------------
+
+//--------------------------------------------------------------------
+vtkImageData* vvImage::GetFirstVTKImageData()
 {
   return mVtkImages[0];
 }
@@ -272,14 +245,7 @@ bool vvImage::IsScalarTypeInteger(int t)
 //--------------------------------------------------------------------
 vtkSmartPointer<vtkTransform> vvImage::GetTransform()
 {
-  return mTransform;
-}
-//--------------------------------------------------------------------
-
-//--------------------------------------------------------------------
-vtkSmartPointer<vtkGridTransform> vvImage::GetGridTransform()
-{
-  return mGridTransform;
+  return this->mTransform;
 }
 //--------------------------------------------------------------------
 
@@ -292,18 +258,4 @@ void vvImage::UpdateReslice()
 }
 //--------------------------------------------------------------------
 
-
-//--------------------------------------------------------------------
-vtkImageData * CopyAndCastToFloatFrom(vtkImageData * input)
-{
-  vtkSmartPointer<vtkImageData>  p = vtkSmartPointer<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