X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvImage.cxx;h=be2690a512a930b1d31e3b2905c1761feac637e7;hb=e0bfd8dc8b4063f757b7f3858d7c1efeadc17561;hp=77721079d57ad53d33bd3527910ae2883c460a7b;hpb=d1ce705178f497e18fe7bc2c4115001a0755106d;p=clitk.git

diff --git a/common/vvImage.cxx b/common/vvImage.cxx
index 7772107..be2690a 100644
--- a/common/vvImage.cxx
+++ b/common/vvImage.cxx
@@ -1,7 +1,7 @@
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Authors belong to: 
+  Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
   - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
@@ -19,81 +19,87 @@
 #define VVIMAGE_CXX
 #include "vvImage.h"
 #include "clitkCommon.h"
-
+#include <vtkTransform.h>
 #include <vtkImageData.h>
 #include <vtkImageReslice.h>
-
 #include <cassert>
 
 //--------------------------------------------------------------------
-vvImage::vvImage() {
-    Init();
+vvImage::vvImage()
+{
+  Init();
 }
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
-void vvImage::Init() {
-    mTimeSpacing = 1;
-    mTimeOrigin = 0;
-    if (CLITK_EXPERIMENTAL)
-    {
-        mVtkImageReslice = vtkSmartPointer<vtkImageReslice>::New();
-        mVtkImageReslice->SetInterpolationModeToLinear();
-        mVtkImageReslice->AutoCropOutputOn();
-    }
+void vvImage::Init()
+{
+  mTimeSpacing = 1;
+  mTimeOrigin = 0;
+
+  if (CLITK_EXPERIMENTAL)
+    mTransform = vtkSmartPointer<vtkTransform>::New();
 }
 //--------------------------------------------------------------------
 
-
 //--------------------------------------------------------------------
-vvImage::~vvImage() {
-    Reset();
+vvImage::~vvImage()
+{
+  Reset();
 }
 //--------------------------------------------------------------------
 
-
 //--------------------------------------------------------------------
-void vvImage::Reset() {
-    if (CLITK_EXPERIMENTAL)
-    {
-        for (unsigned int i = 0; i < mVtkImages.size(); i++)
-            mVtkImages[i] = (vtkImageData*)mVtkImageReslice->GetInput(i);
-        mVtkImageReslice->RemoveAllInputs();
-    }
+void vvImage::Reset()
+{
+  if (CLITK_EXPERIMENTAL)
     for (unsigned int i = 0; i < mVtkImages.size(); i++)
-        mVtkImages[i]->Delete();
-    mVtkImages.resize(0);
-    Init();
+      mVtkImageReslice[i]->GetInput(0)->Delete();
+  else
+    for (unsigned int i = 0; i < mVtkImages.size(); i++)
+      mVtkImages[i]->Delete();
+
+  mVtkImages.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::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->SetInput(mVtkImages.size(), image);
-        mVtkImageReslice->Update();
-        mVtkImages.push_back( mVtkImageReslice->GetOutput( mVtkImages.size() ) );
-    }
-    else
-        mVtkImages.push_back(image);
+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 vvImage::GetNumberOfSpatialDimensions()
+{
   int dim=GetNumberOfDimensions();
   if (IsTimeSequence())
     return dim-1;
@@ -101,44 +107,39 @@ int vvImage::GetNumberOfSpatialDimensions() {
     return dim;
 }
 //--------------------------------------------------------------------
-
-
+//
 //--------------------------------------------------------------------
-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;
-    }
+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;
+  }
   return 0;
 }
-//--------------------------------------------------------------------
-
-
 //--------------------------------------------------------------------
 void vvImage::GetScalarRange(double* range)
 {
   assert(mVtkImages.size());
   double * temp = mVtkImages[0]->GetScalarRange();
-  range[0]=temp[0];range[1]=temp[1];
-  for (unsigned int i=1;i<mVtkImages.size();i++)
-    {
-      temp = mVtkImages[i]->GetScalarRange();
-      if (temp[0] < range[0]) range[0]=temp[0];
-      if (temp[1] > range[1]) range[1]=temp[1];
-    }
+  range[0]=temp[0];
+  range[1]=temp[1];
+  for (unsigned int i=1; i<mVtkImages.size(); i++) {
+    temp = mVtkImages[i]->GetScalarRange();
+    if (temp[0] < range[0]) range[0]=temp[0];
+    if (temp[1] > range[1]) range[1]=temp[1];
+  }
 }
-//--------------------------------------------------------------------
-
 
 //--------------------------------------------------------------------
-std::string vvImage::GetScalarTypeAsString() {
+std::string vvImage::GetScalarTypeAsString()
+{
   // WARNING VTK pixel type different from ITK Pixel type
   std::string vtktype = mVtkImages[0]->GetScalarTypeAsString();
   if (vtktype == "unsigned char") return "unsigned_char";
@@ -148,71 +149,66 @@ std::string vvImage::GetScalarTypeAsString() {
 }
 //--------------------------------------------------------------------
 
-
 //--------------------------------------------------------------------
-int vvImage::GetNumberOfScalarComponents() {
+int vvImage::GetNumberOfScalarComponents()
+{
   return mVtkImages[0]->GetNumberOfScalarComponents();
 }
 //--------------------------------------------------------------------
 
-
 //--------------------------------------------------------------------
-int vvImage::GetScalarSize() {
+int vvImage::GetScalarSize()
+{
   return mVtkImages[0]->GetScalarSize();
 }
 //--------------------------------------------------------------------
 
-
 //--------------------------------------------------------------------
-std::vector<double> vvImage::GetSpacing() {
+std::vector<double> vvImage::GetSpacing()
+{
   std::vector<double> spacing;
   int dim = this->GetNumberOfDimensions();
-  for (int i = 0; i < dim; i++)
-    {
-      if (i == 3)
-        spacing.push_back(mTimeSpacing);
-      else
-        spacing.push_back(mVtkImages[0]->GetSpacing()[i]);
-    }
+  for (int i = 0; i < dim; i++) {
+    if (i == 3)
+      spacing.push_back(mTimeSpacing);
+    else
+      spacing.push_back(mVtkImages[0]->GetSpacing()[i]);
+  }
   return spacing;
 }
 //--------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------
-std::vector<double> vvImage::GetOrigin() const {
+std::vector<double> vvImage::GetOrigin() const
+{
   std::vector<double> origin;
   int dim = this->GetNumberOfDimensions();
-  for (int i = 0; i < dim; i++)
-    {
-      if (i == 3)
-        origin.push_back(mTimeOrigin);
-      else
-        origin.push_back(mVtkImages[0]->GetOrigin()[i]);
-    }
+  for (int i = 0; i < dim; i++) {
+    if (i == 3)
+      origin.push_back(mTimeOrigin);
+    else
+      origin.push_back(mVtkImages[0]->GetOrigin()[i]);
+  }
   return origin;
 }
 //--------------------------------------------------------------------
 
-
 //--------------------------------------------------------------------
-std::vector<int> vvImage::GetSize() {
+std::vector<int> vvImage::GetSize()
+{
   std::vector<int> size0;
   int dim = this->GetNumberOfDimensions();
-  for (int i = 0; i < dim; i++)
-    {
-      if (i == 3)
-        size0.push_back(mVtkImages.size());
-      else
-        size0.push_back(mVtkImages[0]->GetDimensions()[i]);
-    }
+  for (int i = 0; i < dim; i++) {
+    if (i == 3)
+      size0.push_back(mVtkImages.size());
+    else
+      size0.push_back(mVtkImages[0]->GetDimensions()[i]);
+  }
   return size0;
 }
 //--------------------------------------------------------------------
 
-
 //--------------------------------------------------------------------
-unsigned long vvImage::GetActualMemorySize() {
+unsigned long vvImage::GetActualMemorySize()
+{
   unsigned long size = 0;
   for (unsigned int i = 0; i < mVtkImages.size(); i++) {
     size += mVtkImages[i]->GetActualMemorySize();
@@ -223,37 +219,41 @@ unsigned long vvImage::GetActualMemorySize() {
 
 
 //--------------------------------------------------------------------
-bool vvImage::IsTimeSequence() {
+bool vvImage::IsTimeSequence()
+{
   return mVtkImages.size()>1;
 }
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
-const std::vector<vtkImageData*>& vvImage::GetVTKImages() {
+const std::vector<vtkImageData*>& vvImage::GetVTKImages()
+{
   return mVtkImages;
 }
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
-vtkImageData* vvImage::GetFirstVTKImageData() { 
-  return mVtkImages[0]; 
+vtkImageData* vvImage::GetFirstVTKImageData()
+{
+  return mVtkImages[0];
 }
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
-bool vvImage::IsScalarTypeInteger() {
+bool vvImage::IsScalarTypeInteger()
+{
   assert(mVtkImages.size()> 0);
   int t = mVtkImages[0]->GetScalarType();
   return IsScalarTypeInteger(t);
 }
 //--------------------------------------------------------------------
 
-
 //--------------------------------------------------------------------
-bool vvImage::IsScalarTypeInteger(int t) {
+bool vvImage::IsScalarTypeInteger(int t)
+{
   if ((t == VTK_BIT) ||
       (t == VTK_CHAR) ||
       (t == VTK_UNSIGNED_CHAR) ||
@@ -264,18 +264,39 @@ bool vvImage::IsScalarTypeInteger(int t) {
       (t == VTK_LONG) ||
       (t == VTK_UNSIGNED_LONG))    {
     return true;
-  }
-  else {
+  } else {
     return false;
   }
 }
+
+//--------------------------------------------------------------------
+
+//--------------------------------------------------------------------
+vtkSmartPointer<vtkTransform> vvImage::GetTransform()
+{
+  return mTransform;
+}
 //--------------------------------------------------------------------
 
+//--------------------------------------------------------------------
+void vvImage::SetTransform(vtkSmartPointer<vtkTransform> transform)
+{
+  mTransform = transform;
+  this->UpdateReslice();
+}
+//--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-void vvImage::SetTransform(vtkAbstractTransform  *transform)
+void vvImage::UpdateReslice()
 {
-  mVtkImageReslice->SetResliceTransform(transform);
+  for (unsigned int i=0; i<mVtkImageReslice.size(); i++) {
+    mVtkImageReslice[i]->UpdateInformation();
+    mVtkImageReslice[i]->UpdateWholeExtent();
+    mVtkImageReslice[i]->Update();
+    mVtkImageReslice[i]->UpdateInformation();
+    mVtkImageReslice[i]->UpdateWholeExtent();
+    mVtkImageReslice[i]->Update();
+  }
 }
 //--------------------------------------------------------------------