X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvImage.cxx;h=47a0e3464bd1d6e995b8a3103bab742566a5459b;hb=749a10abf2b91f6cedc3d89addd3658044670714;hp=4675cf5b661453428bd561d81bbc623c75be092c;hpb=f673a2b0d4521e9ca1ad1a08e2dd3a6614553fe3;p=clitk.git

diff --git a/common/vvImage.cxx b/common/vvImage.cxx
index 4675cf5..47a0e34 100644
--- a/common/vvImage.cxx
+++ b/common/vvImage.cxx
@@ -3,7 +3,7 @@
 
   Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,26 +14,30 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef VVIMAGE_CXX
 #define VVIMAGE_CXX
+
+// vv
 #include "vvImage.h"
+
+// clitk
 #include "clitkCommon.h"
-#include <vtkImageData.h>
-#include <vtkImageReslice.h>
-#include <cassert>
 
-#include <vtkGeneralTransform.h>
+// vtk
+#include <vtkImageData.h>
 #include <vtkTransform.h>
-#include <vtkGridTransform.h>
+#include <vtkDataObject.h>
+#include <vtkStreamingDemandDrivenPipeline.h>
+#include <vtkInformation.h>
+#include <vtkVersion.h>
+
+// std
+#include <cassert>
 
 //--------------------------------------------------------------------
-vvImage::vvImage():mGeneralTransform(vtkSmartPointer<vtkGeneralTransform>::New()),
-		   mTransform       (vtkSmartPointer<vtkTransform>::New()),
-	           mGridTransform   (vtkSmartPointer<vtkGridTransform>::New())
+vvImage::vvImage()
 {
-  mGeneralTransform->Concatenate(mTransform);
-  mGeneralTransform->Concatenate(mGridTransform);
   Init();
 }
 //--------------------------------------------------------------------
@@ -44,13 +48,15 @@ void vvImage::Init()
 {
   mTimeSpacing = 1;
   mTimeOrigin = 0;
+  mImageDimension = 0;
+  mrange[0] = std::numeric_limits<int>::max();;//min
+  mrange[1] = std::numeric_limits<int>::min();;//max
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
 vvImage::~vvImage()
 {
-  DD("vvImage got deleted!");
   Reset();
 }
 //--------------------------------------------------------------------
@@ -58,50 +64,40 @@ vvImage::~vvImage()
 //--------------------------------------------------------------------
 void vvImage::Reset()
 {
-  for (unsigned int i = 0; i < mVtkImages.size(); i++)
-    mVtkImageReslice[i]->GetInput()->Delete();
-
-  mVtkImages.resize(0);
-  mVtkImageReslice.resize(0);
-
+  mVtkImages.clear();
   Init();
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-void vvImage::SetImage(std::vector< vtkImageData* > images)
+void vvImage::AddVtkImage(vtkImageData* input)
 {
-  Reset();
-  for (unsigned int i = 0; i < images.size(); i++)
-    AddImage(images[i]);
+  // RP: 20/12/2011
+  // Note that we're simply adding a new image to the vector.
+  // mItkToVtkConverters is therefore not being updated, but 
+  // up to here it's not being used anyway...
+  mImageDimension = 0;
+#if VTK_MAJOR_VERSION <= 5
+  int* extent = input->GetWholeExtent();
+#else
+  int* extent = input->GetInformation()->Get(vtkDataObject::DATA_EXTENT());
+#endif
+  if (extent[4] != extent[5])
+    mImageDimension = 3;
+  else if (extent[3] != extent[4])
+    mImageDimension = 2;
+  else if (extent[0] != extent[1])
+    mImageDimension = 1;
+  
+  mVtkImages.push_back(input);
 }
-//--------------------------------------------------------------------
-
 
-//--------------------------------------------------------------------
-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 +105,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;
 }
@@ -125,15 +117,8 @@ int vvImage::GetNumberOfDimensions() const
 //--------------------------------------------------------------------
 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]=mrange[0];
+  range[1]=mrange[1];
 }
 //--------------------------------------------------------------------
 
@@ -219,7 +204,7 @@ unsigned long vvImage::GetActualMemorySize()
 
 
 //--------------------------------------------------------------------
-bool vvImage::IsTimeSequence()
+bool vvImage::IsTimeSequence() const
 {
   return mVtkImages.size()>1;
 }
@@ -266,42 +251,30 @@ bool vvImage::IsScalarTypeInteger(int t)
     return false;
   }
 }
-
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-vtkSmartPointer<vtkTransform> vvImage::GetTransform()
+const std::vector< vtkSmartPointer<vtkTransform> >& vvImage::GetTransform()
 {
-  return mTransform;
+  return this->mTransform;
 }
 //--------------------------------------------------------------------
 
-//--------------------------------------------------------------------
-vtkSmartPointer<vtkGridTransform> vvImage::GetGridTransform()
-{
-  return mGridTransform;
-}
-//--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-void vvImage::UpdateReslice()
+bool vvImage::HaveSameSizeAndSpacingThan(vvImage * other)
 {
-  for (unsigned int i=0; i<mVtkImageReslice.size(); i++) {
-    mVtkImageReslice[i]->Update();
+  bool same = true;
+  for(int i=0; i<GetNumberOfDimensions(); i++) {
+    if ( GetSize()[i] != other->GetSize()[i]) same = false;
+    if ( GetSpacing()[i] != other->GetSpacing()[i]) same = false;
   }
+  return same;
 }
 //--------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------
-vtkImageData * CopyAndCastToFloatFrom(vtkImageData * input)
+itk::MetaDataDictionary* vvImage::GetFirstMetaDataDictionary()
 {
-  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;
+    return mDictionary[0];
 }
 //--------------------------------------------------------------------