Corrected erroneous free when a real RECTILINEAR field is detected

[clitk.git] / common / vvImage.cxx

diff --git a/common/vvImage.cxx b/common/vvImage.cxx
index 821de16ebb35c34067b2488ba93be5161ba9599f..a51f1e618236fdabcfeff65d747bb7c8dbcff95e 100644 (file)
--- a/common/vvImage.cxx
+++ b/common/vvImage.cxx
@@ -17,23 +17,26 @@
 ======================================================================-====*/
 #ifndef VVIMAGE_CXX
 #define VVIMAGE_CXX
+
+// vv
 #include "vvImage.h"
+
+// clitk
 #include "clitkCommon.h"
+
+// vtk
 #include <vtkImageData.h>
 #include <vtkImageReslice.h>
+#include <vtkTransform.h>
+
+// std
 #include <cassert>
 
-#include <vtkGeneralTransform.h>
-#include <vtkTransform.h>
-#include <vtkGridTransform.h>
+#define NO_RESLICE 1
 
 //--------------------------------------------------------------------
-vvImage::vvImage():mGeneralTransform(vtkSmartPointer<vtkGeneralTransform>::New()),
-                  mTransform       (vtkSmartPointer<vtkTransform>::New()),
-                  mGridTransform   (vtkSmartPointer<vtkGridTransform>::New())
+vvImage::vvImage():mTransform(vtkSmartPointer<vtkTransform>::New())
 {
-  mGeneralTransform->Concatenate(mTransform);
-  mGeneralTransform->Concatenate(mGridTransform);
   Init();
 }
 //--------------------------------------------------------------------
@@ -44,6 +47,7 @@ void vvImage::Init()
 {
   mTimeSpacing = 1;
   mTimeOrigin = 0;
+  mImageDimension = 0;
 }
 //--------------------------------------------------------------------
 
@@ -58,9 +62,6 @@ vvImage::~vvImage()
 //--------------------------------------------------------------------
 void vvImage::Reset()
 {
-  for (unsigned int i = 0; i < mVtkImages.size(); i++)
-    mVtkImageReslice[i]->GetInput()->Delete();
-
   mVtkImages.resize(0);
   mVtkImageReslice.resize(0);
 
@@ -68,40 +69,15 @@ void vvImage::Reset()
 }
 //--------------------------------------------------------------------
 
-//--------------------------------------------------------------------
-void vvImage::SetImage(std::vector< vtkImageData* > images)
-{
-  Reset();
-  for (unsigned int i = 0; i < images.size(); i++)
-    AddImage(images[i]);
-}
-//--------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------
-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;
+  // int dim=GetNumberOfDimensions();
+  //   if (IsTimeSequence())
+  //     return dim+1;
+  //   else
+  //     return dim;
 }
 //--------------------------------------------------------------------
 
@@ -109,14 +85,18 @@ 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;
+    //   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;
 }
@@ -219,7 +199,7 @@ unsigned long vvImage::GetActualMemorySize()
 
 
 //--------------------------------------------------------------------
-bool vvImage::IsTimeSequence()
+bool vvImage::IsTimeSequence() const
 {
   return mVtkImages.size()>1;
 }
@@ -272,14 +252,7 @@ bool vvImage::IsScalarTypeInteger(int t)
 //--------------------------------------------------------------------
 vtkSmartPointer<vtkTransform> vvImage::GetTransform()
 {
-  return mTransform;
-}
-//--------------------------------------------------------------------
-
-//--------------------------------------------------------------------
-vtkSmartPointer<vtkGridTransform> vvImage::GetGridTransform()
-{
-  return mGridTransform;
+  return this->mTransform;
 }
 //--------------------------------------------------------------------
 
@@ -292,18 +265,4 @@ void vvImage::UpdateReslice()
 }
 //--------------------------------------------------------------------
 
-
-//--------------------------------------------------------------------
-vtkImageData * CopyAndCastToFloatFrom(vtkImageData * input)
-{
-  vtkSmartPointer<vtkImageData>  p = vtkSmartPointer<vtkImageData>::New();
-  p->SetExtent(input->GetExtent ()); // Only first ! could not be 4D
-  p->SetScalarTypeToFloat();
-  p->AllocateScalars();
-  p->CopyAndCastFrom(input, input->GetExtent());
-  return p;
-}
-//--------------------------------------------------------------------
-
-
 #endif // VVIMAGE_CXX