itkv4 migration:

[clitk.git] / vv / vvToolRigidReg.cxx

diff --git a/vv/vvToolRigidReg.cxx b/vv/vvToolRigidReg.cxx
index a9fd2b5c78b899e276f1cb94910966adfe9401e0..26c53ca92aa3ae241d0735e8b3b6b00d32fb0149 100644 (file)
--- a/vv/vvToolRigidReg.cxx
+++ b/vv/vvToolRigidReg.cxx
@@ -56,7 +56,6 @@ vvToolRigidReg::vvToolRigidReg(vvMainWindowBase * parent, Qt::WindowFlags f):
 //    qsize.setWidth(850);
 //    mToolWidget->setFixedSize(qsize);
   // Set how many inputs are needed for this tool
-  mFilter = new clitk::AffineRegistrationGenericFilter;
   cb_transform->hide();
   cb_interpolator->hide();
   cb_optimizer->hide();
@@ -72,8 +71,8 @@ vvToolRigidReg::vvToolRigidReg(vvMainWindowBase * parent, Qt::WindowFlags f):
   
   
   // Set how many inputs are needed for this tool
- AddInputSelector("Select moving image",mFilter);
- AddInputSelector("Select fixed image",mFilter);
+  AddInputSelector("Select moving image");
+  AddInputSelector("Select fixed image");
 }
 //------------------------------------------------------------------------------
 
@@ -830,7 +829,7 @@ void vvToolRigidReg::CheckDeformableReg()
 //------------------------------------------------------------------------------
 void vvToolRigidReg::SetOverlay(vvImage::Pointer Image)
 {
-    for (int i =0; i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
+    for (int i =0; i<mCurrentSlicerManager->GetNumberOfSlicers(); i++) {
    mCurrentSlicerManager->GetSlicer(i)->SetOverlay(Image);
    mCurrentSlicerManager->GetSlicer(i)->SetActorVisibility("overlay",0,true);
    mCurrentSlicerManager->SetColorMap();
@@ -842,7 +841,7 @@ void vvToolRigidReg::SetOverlay(vvImage::Pointer Image)
 //------------------------------------------------------------------------------
 void vvToolRigidReg::RemoveOverlay()
 {
-   for(int i=0;i<mCurrentSlicerManager->NumberOfSlicers();i++)
+   for(int i=0;i<mCurrentSlicerManager->GetNumberOfSlicers();i++)
   {
      mInput1->RemoveActor("overlay",0);
      mInput1->SetColorMap(0);
@@ -892,7 +891,9 @@ void vvToolRigidReg::SetTransform(double tX, double tY, double tZ, double aX, do
   }
   //Translations
   if (tX!=0||tY!=0||tZ!=0)
-    transform->Translate(tX*mInput1->GetImage()->GetSpacing()[0],tY*mInput1->GetImage()->GetSpacing()[1],tZ*mInput1->GetImage()->GetSpacing()[2]);
+    transform->Translate(tX*mInput1->GetImage()->GetSpacing()[0],
+                         tY*mInput1->GetImage()->GetSpacing()[1],
+                         tZ*mInput1->GetImage()->GetSpacing()[2]);
 }
 //------------------------------------------------------------------------------
 
@@ -918,7 +919,7 @@ void vvToolRigidReg::LoadFile()
 //------------------------------------------------------------------------------
 void vvToolRigidReg::Render()
 {
-  for (int i=0; i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
+  for (int i=0; i<mCurrentSlicerManager->GetNumberOfSlicers(); i++) {
        mCurrentSlicerManager->GetSlicer(i)->ForceUpdateDisplayExtent();
        mCurrentSlicerManager->GetSlicer(i)->Render();
       }