X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FvvImage.cxx;h=2db040b4bb89969e7cfac3b5c5079ff74e0eba53;hb=c93a32f96e61514b8b945d515ffcf11c2a12ae66;hp=c5a3af73d2349604f63c935952fdc075f71ab770;hpb=f181e8fc01dec00bc6b0c82e0e273e1bb0d292c5;p=clitk.git

diff --git a/common/vvImage.cxx b/common/vvImage.cxx
index c5a3af7..2db040b 100644
--- a/common/vvImage.cxx
+++ b/common/vvImage.cxx
@@ -17,15 +17,20 @@
 ======================================================================-====*/
 #ifndef VVIMAGE_CXX
 #define VVIMAGE_CXX
+
+// vv
 #include "vvImage.h"
+
+// clitk
 #include "clitkCommon.h"
+
+// vtk
 #include <vtkImageData.h>
 #include <vtkImageReslice.h>
-#include <cassert>
-
 #include <vtkTransform.h>
 
-#define NO_RESLICE 1
+// std
+#include <cassert>
 
 //--------------------------------------------------------------------
 vvImage::vvImage():mTransform(vtkSmartPointer<vtkTransform>::New())
@@ -40,13 +45,14 @@ void vvImage::Init()
 {
   mTimeSpacing = 1;
   mTimeOrigin = 0;
+  mImageDimension = 0;
 }
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
 vvImage::~vvImage()
 {
-  DD("vvImage got deleted!");
+  //  DD("vvImage got deleted!");
   Reset();
 }
 //--------------------------------------------------------------------
@@ -55,6 +61,7 @@ vvImage::~vvImage()
 void vvImage::Reset()
 {
   mVtkImages.resize(0);
+  mTransformedVtkImages.resize(0);
   mVtkImageReslice.resize(0);
 
   Init();
@@ -64,11 +71,7 @@ void vvImage::Reset()
 //--------------------------------------------------------------------
 int vvImage::GetNumberOfSpatialDimensions()
 {
-  int dim=GetNumberOfDimensions();
-  if (IsTimeSequence())
-    return dim-1;
-  else
-    return dim;
+  return mImageDimension;
 }
 //--------------------------------------------------------------------
 
@@ -76,14 +79,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;
 }
@@ -186,7 +185,7 @@ unsigned long vvImage::GetActualMemorySize()
 
 
 //--------------------------------------------------------------------
-bool vvImage::IsTimeSequence()
+bool vvImage::IsTimeSequence() const
 {
   return mVtkImages.size()>1;
 }
@@ -200,6 +199,13 @@ const std::vector<vtkImageData*>& vvImage::GetVTKImages()
 }
 //--------------------------------------------------------------------
 
+//--------------------------------------------------------------------
+const std::vector<vtkImageData*>& vvImage::GetTransformedVTKImages()
+{
+  return mTransformedVtkImages;
+}
+//--------------------------------------------------------------------
+
 //--------------------------------------------------------------------
 vtkImageData* vvImage::GetFirstVTKImageData()
 {
@@ -243,6 +249,7 @@ vtkSmartPointer<vtkTransform> vvImage::GetTransform()
 }
 //--------------------------------------------------------------------
 
+
 //--------------------------------------------------------------------
 void vvImage::UpdateReslice()
 {
@@ -252,4 +259,18 @@ void vvImage::UpdateReslice()
 }
 //--------------------------------------------------------------------
 
+
+//--------------------------------------------------------------------
+bool vvImage::HaveSameSizeAndSpacingThan(vvImage * other)
+{
+  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