Merge branch 'master' into extentSimon

[clitk.git] / common / vvImage.cxx

diff --git a/common/vvImage.cxx b/common/vvImage.cxx
index 1f5116849cb711a73cc80cfa19954c1bcfd7c6ab..47a0e3464bd1d6e995b8a3103bab742566a5459b 100644 (file)
--- 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,7 +14,7 @@
 
   - 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
 
@@ -26,14 +26,17 @@
 
 // vtk
 #include <vtkImageData.h>
-#include <vtkImageReslice.h>
 #include <vtkTransform.h>
+#include <vtkDataObject.h>
+#include <vtkStreamingDemandDrivenPipeline.h>
+#include <vtkInformation.h>
+#include <vtkVersion.h>
 
 // std
 #include <cassert>
 
 //--------------------------------------------------------------------
-vvImage::vvImage():mTransform(vtkSmartPointer<vtkTransform>::New())
+vvImage::vvImage()
 {
   Init();
 }
@@ -46,13 +49,14 @@ 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();
 }
 //--------------------------------------------------------------------
@@ -60,14 +64,36 @@ vvImage::~vvImage()
 //--------------------------------------------------------------------
 void vvImage::Reset()
 {
-  mVtkImages.resize(0);
-  mTransformedVtkImages.resize(0);
-  mVtkImageReslice.resize(0);
-
+  mVtkImages.clear();
   Init();
 }
 //--------------------------------------------------------------------
 
+//--------------------------------------------------------------------
+void vvImage::AddVtkImage(vtkImageData* input)
+{
+  // 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);
+}
+
+//--------------------------------------------------------------------
+
 //--------------------------------------------------------------------
 int vvImage::GetNumberOfSpatialDimensions()
 {
@@ -91,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];
 }
 //--------------------------------------------------------------------
 
@@ -199,13 +218,6 @@ const std::vector<vtkImageData*>& vvImage::GetVTKImages()
 }
 //--------------------------------------------------------------------
 
-//--------------------------------------------------------------------
-const std::vector<vtkImageData*>& vvImage::GetTransformedVTKImages()
-{
-  return mTransformedVtkImages;
-}
-//--------------------------------------------------------------------
-
 //--------------------------------------------------------------------
 vtkImageData* vvImage::GetFirstVTKImageData()
 {
@@ -239,23 +251,32 @@ bool vvImage::IsScalarTypeInteger(int t)
     return false;
   }
 }
-
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-vtkSmartPointer<vtkTransform> vvImage::GetTransform()
+const std::vector< vtkSmartPointer<vtkTransform> >& vvImage::GetTransform()
 {
   return this->mTransform;
 }
 //--------------------------------------------------------------------
 
+
 //--------------------------------------------------------------------
-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;
 }
 //--------------------------------------------------------------------
+itk::MetaDataDictionary* vvImage::GetFirstMetaDataDictionary()
+{
+    return mDictionary[0];
+}
+//--------------------------------------------------------------------
+
 
 #endif // VVIMAGE_CXX