X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=common%2FvvImage.cxx;h=0bddb262cb7a4f8ce70d204d8be1750e3ae35f0c;hb=2e9a4d4f5a2057c62dc451e355d022025ae12a57;hp=a51f1e618236fdabcfeff65d747bb7c8dbcff95e;hpb=25e6b21607eea7d39428c109e4bc0ebe00f54ed9;p=clitk.git

diff --git a/common/vvImage.cxx b/common/vvImage.cxx
index a51f1e6..0bddb26 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,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,11 @@
 
 // vtk
 #include <vtkImageData.h>
-#include <vtkImageReslice.h>
 #include <vtkTransform.h>
 
 // std
 #include <cassert>
 
-#define NO_RESLICE 1
-
 //--------------------------------------------------------------------
 vvImage::vvImage():mTransform(vtkSmartPointer<vtkTransform>::New())
 {
@@ -54,7 +51,6 @@ void vvImage::Init()
 //--------------------------------------------------------------------
 vvImage::~vvImage()
 {
-  DD("vvImage got deleted!");
   Reset();
 }
 //--------------------------------------------------------------------
@@ -62,22 +58,36 @@ vvImage::~vvImage()
 //--------------------------------------------------------------------
 void vvImage::Reset()
 {
-  mVtkImages.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;
+  int* extent = input->GetWholeExtent();
+  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()
 {
   return mImageDimension;
-  // int dim=GetNumberOfDimensions();
-  //   if (IsTimeSequence())
-  //     return dim+1;
-  //   else
-  //     return dim;
 }
 //--------------------------------------------------------------------
 
@@ -89,14 +99,6 @@ int vvImage::GetNumberOfDimensions() const
       return mImageDimension+1;
     else
       return mImageDimension;
-    //   int dimension = 3;
-    //   int extent[6];
-    //   mVtkImages[0]->GetWholeExtent(extent);
-    //   if (extent[5] - extent[4] >= 1)
-    //     dimension++;
-    //   // if (mVtkImages.size() > 1)
-    //   //   dimension++;
-    //   return dimension;
   }
   return 0;
 }
@@ -246,7 +248,6 @@ bool vvImage::IsScalarTypeInteger(int t)
     return false;
   }
 }
-
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
@@ -256,13 +257,18 @@ vtkSmartPointer<vtkTransform> vvImage::GetTransform()
 }
 //--------------------------------------------------------------------
 
+
 //--------------------------------------------------------------------
-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;
 }
 //--------------------------------------------------------------------
 
+
 #endif // VVIMAGE_CXX