MSVC++ complains that the exception is not used, put debugging message back

[clitk.git] / common / vvImage.cxx

diff --git a/common/vvImage.cxx b/common/vvImage.cxx
index a51f1e618236fdabcfeff65d747bb7c8dbcff95e..2db040b4bb89969e7cfac3b5c5079ff74e0eba53 100644 (file)
--- a/common/vvImage.cxx
+++ b/common/vvImage.cxx
@@ -32,8 +32,6 @@
 // std
 #include <cassert>
 
-#define NO_RESLICE 1
-
 //--------------------------------------------------------------------
 vvImage::vvImage():mTransform(vtkSmartPointer<vtkTransform>::New())
 {
@@ -54,7 +52,7 @@ void vvImage::Init()
 //--------------------------------------------------------------------
 vvImage::~vvImage()
 {
-  DD("vvImage got deleted!");
+  //  DD("vvImage got deleted!");
   Reset();
 }
 //--------------------------------------------------------------------
@@ -63,6 +61,7 @@ vvImage::~vvImage()
 void vvImage::Reset()
 {
   mVtkImages.resize(0);
+  mTransformedVtkImages.resize(0);
   mVtkImageReslice.resize(0);
 
   Init();
@@ -73,11 +72,6 @@ void vvImage::Reset()
 int vvImage::GetNumberOfSpatialDimensions()
 {
   return mImageDimension;
-  // int dim=GetNumberOfDimensions();
-  //   if (IsTimeSequence())
-  //     return dim+1;
-  //   else
-  //     return dim;
 }
 //--------------------------------------------------------------------
 
@@ -89,14 +83,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;
 }
@@ -213,6 +199,13 @@ const std::vector<vtkImageData*>& vvImage::GetVTKImages()
 }
 //--------------------------------------------------------------------
 
+//--------------------------------------------------------------------
+const std::vector<vtkImageData*>& vvImage::GetTransformedVTKImages()
+{
+  return mTransformedVtkImages;
+}
+//--------------------------------------------------------------------
+
 //--------------------------------------------------------------------
 vtkImageData* vvImage::GetFirstVTKImageData()
 {
@@ -256,6 +249,7 @@ vtkSmartPointer<vtkTransform> vvImage::GetTransform()
 }
 //--------------------------------------------------------------------
 
+
 //--------------------------------------------------------------------
 void vvImage::UpdateReslice()
 {
@@ -265,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