X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvImage.cxx;h=4675cf5b661453428bd561d81bbc623c75be092c;hb=dd629343e9209aa7a536b205f390f59f00247049;hp=2a47a99d6463989ff9157009aa6057f87f509b0a;hpb=48d8569538b93bf923de2f8d5c4b9db51640978f;p=clitk.git

diff --git a/common/vvImage.cxx b/common/vvImage.cxx
index 2a47a99..4675cf5 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,223 +19,230 @@
 #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();
 }
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
-void vvImage::Init() {
-    mTimeSpacing = 1;
-    mTimeOrigin = 0;
-    
-    if (CLITK_EXPERIMENTAL)
-    {
-        mVtkImageReslice = vtkSmartPointer<vtkImageReslice>::New();
-	transform = vtkSmartPointer<vtkTransform>::New();  
-        mVtkImageReslice->SetInterpolationModeToLinear();
-        mVtkImageReslice->AutoCropOutputOn();
-	mVtkImageReslice->SetBackgroundColor(-1000,-1000,-1000,1);
-	mVtkImageReslice->SetResliceTransform(transform);
-    }
+void vvImage::Init()
+{
+  mTimeSpacing = 1;
+  mTimeOrigin = 0;
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-vvImage::~vvImage() {
-    Reset();
+vvImage::~vvImage()
+{
+  DD("vvImage got deleted!");
+  Reset();
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-void vvImage::Reset() {
-    if (CLITK_EXPERIMENTAL)
-    {
-        for (unsigned int i = 0; i < mVtkImages.size(); i++)
-            mVtkImages[i] = (vtkImageData*)mVtkImageReslice->GetInput(i);
-        mVtkImageReslice->RemoveAllInputs();
-    }
-    for (unsigned int i = 0; i < mVtkImages.size(); i++)
-        mVtkImages[i]->Delete();
-    mVtkImages.resize(0);
-    Init();
+void vvImage::Reset()
+{
+  for (unsigned int i = 0; i < mVtkImages.size(); i++)
+    mVtkImageReslice[i]->GetInput()->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)
+{
+  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;
+int vvImage::GetNumberOfSpatialDimensions()
+{
+  int dim=GetNumberOfDimensions();
+  if (IsTimeSequence())
+    return dim-1;
+  else
+    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;
-    }
-    return 0;
-}
+
 //--------------------------------------------------------------------
-void vvImage::GetScalarRange(double* range)
+int vvImage::GetNumberOfDimensions() const
 {
-    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];
-    }
+  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;
 }
+//--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-std::string vvImage::GetScalarTypeAsString() {
-    return mVtkImages[0]->GetScalarTypeAsString();
+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];
+  }
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-int vvImage::GetNumberOfScalarComponents() {
-    return mVtkImages[0]->GetNumberOfScalarComponents();
+std::string vvImage::GetScalarTypeAsITKString()
+{
+  // WARNING VTK pixel type different from ITK Pixel type
+  std::string vtktype = mVtkImages[0]->GetScalarTypeAsString();
+  if (vtktype == "unsigned char") return "unsigned_char";
+  if (vtktype == "unsigned short") return "unsigned_short";
+  if (vtktype == "unsigned int") return "unsigned_int";
+  return vtktype;
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-int vvImage::GetScalarSize() {
-    return mVtkImages[0]->GetScalarSize();
+int vvImage::GetNumberOfScalarComponents()
+{
+  return mVtkImages[0]->GetNumberOfScalarComponents();
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-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(1);
-        else
-            spacing.push_back(mVtkImages[0]->GetSpacing()[i]);
-      if (i == 3)
-        spacing.push_back(mTimeSpacing);
-      else
-        spacing.push_back(mVtkImages[0]->GetSpacing()[i]);
-    }
-    return spacing;
+int vvImage::GetScalarSize()
+{
+  return mVtkImages[0]->GetScalarSize();
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-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(0);
-        else
-            origin.push_back(mVtkImages[0]->GetOrigin()[i]);
-      if (i == 3)
-        origin.push_back(mTimeOrigin);
-      else
-        origin.push_back(mVtkImages[0]->GetOrigin()[i]);
-    }
-    return origin;
+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]);
+  }
+  return spacing;
+}
+//--------------------------------------------------------------------
+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]);
+  }
+  return origin;
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-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]);
-    }
-    return size0;
+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]);
+  }
+  return size0;
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-unsigned long vvImage::GetActualMemorySize() {
-    unsigned long size = 0;
-    for (unsigned int i = 0; i < mVtkImages.size(); i++) {
-        size += mVtkImages[i]->GetActualMemorySize();
-    }
-    return size;
+unsigned long vvImage::GetActualMemorySize()
+{
+  unsigned long size = 0;
+  for (unsigned int i = 0; i < mVtkImages.size(); i++) {
+    size += mVtkImages[i]->GetActualMemorySize();
+  }
+  return size;
 }
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
-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);
@@ -243,7 +250,8 @@ bool vvImage::IsScalarTypeInteger() {
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-bool vvImage::IsScalarTypeInteger(int t) {
+bool vvImage::IsScalarTypeInteger(int t)
+{
   if ((t == VTK_BIT) ||
       (t == VTK_CHAR) ||
       (t == VTK_UNSIGNED_CHAR) ||
@@ -254,8 +262,7 @@ bool vvImage::IsScalarTypeInteger(int t) {
       (t == VTK_LONG) ||
       (t == VTK_UNSIGNED_LONG))    {
     return true;
-  }
-  else {
+  } else {
     return false;
   }
 }
@@ -263,94 +270,40 @@ bool vvImage::IsScalarTypeInteger(int t) {
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-
-void vvImage::SetVTKImageReslice(vtkImageReslice* reslice) {
-   mVtkImageReslice=reslice;
-    
-}
-//--------------------------------------------------------------------
-
-//--------------------------------------------------------------------
-vtkAbstractTransform * vvImage::GetTransform()
+vtkSmartPointer<vtkTransform> vvImage::GetTransform()
 {
-    return mVtkImageReslice->GetResliceTransform();
+  return mTransform;
 }
 //--------------------------------------------------------------------
 
-//-------------------------------------------------------------------
-void vvImage::SetRotateX(int xvalue)
-{
-    transform->PostMultiply();
-    transform->Translate(-origin[0],-origin[1],-origin[2]);
-    transform->RotateX(xvalue);
-    transform->Translate(origin[0],origin[1],origin[2]);
-     mVtkImageReslice->Update();
-}
-
 //--------------------------------------------------------------------
-
-//-------------------------------------------------------------------
-void vvImage::SetRotateY(int yvalue)
+vtkSmartPointer<vtkGridTransform> vvImage::GetGridTransform()
 {
-    transform->PostMultiply();
-    transform->Translate(-origin[0],-origin[1],-origin[2]);
-    transform->RotateY(yvalue);
-    transform->Translate(origin[0],origin[1],origin[2]);
-     mVtkImageReslice->Update();
+  return mGridTransform;
 }
 //--------------------------------------------------------------------
 
-//-------------------------------------------------------------------
-void vvImage::SetRotateZ(int zvalue)
-{
-    transform->PostMultiply();
-    transform->Translate(-origin[0],-origin[1],-origin[2]);
-    transform->RotateZ(zvalue);
-    transform->Translate(origin[0],origin[1],origin[2]);
-     mVtkImageReslice->Update();
-}
 //--------------------------------------------------------------------
-
-//-------------------------------------------------------------------
-void vvImage::SetTranslationX(int xvalue)
-{ 
-    transform->Translate(xvalue,0,0);
-     mVtkImageReslice->Update();
-}
-//--------------------------------------------------------------------
-
-//-------------------------------------------------------------------
-
-void vvImage::SetTranslationY(int yvalue)
-{ 
-    transform->Translate(0,yvalue,0);
-     mVtkImageReslice->Update();
+void vvImage::UpdateReslice()
+{
+  for (unsigned int i=0; i<mVtkImageReslice.size(); i++) {
+    mVtkImageReslice[i]->Update();
+  }
 }
 //--------------------------------------------------------------------
 
-//-------------------------------------------------------------------
-void vvImage::SetTranslationZ(int zvalue)
-{ 
-    transform->Translate(0,0,zvalue);
-     mVtkImageReslice->Update();
-}
-//-------------------------------------------------------------------
-
-//-------------------------------------------------------------------
-void vvImage::SetOrigin(double value[3])
-{  
-  origin=new double[mVtkImageReslice->GetOutputDimensionality()];
-  origin[0]=value[0];
-  origin[1]=value[1];
-  origin[2]=value[2];
-}
 
 //--------------------------------------------------------------------
-void vvImage::SetTransform(vtkAbstractTransform  *transform)
+vtkImageData * CopyAndCastToFloatFrom(vtkImageData * input)
 {
-  mVtkImageReslice->SetResliceTransform(transform);
-  mVtkImageReslice->Update();
+  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