Merge branch 'master' of /home/dsarrut/clitk3.server

[clitk.git] / vv / vvToolCropImage.cxx

diff --git a/vv/vvToolCropImage.cxx b/vv/vvToolCropImage.cxx
index 5190c28717e3749483d17b42f322e8ccf8923b20..58117561f5e0f3cb40d4637f97eea6b273cd4c95 100644 (file)
--- a/vv/vvToolCropImage.cxx
+++ b/vv/vvToolCropImage.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
-======================================================================-====*/
+===========================================================================**/
 
 // vv
 #include "vvToolCropImage.h"
@@ -191,7 +191,7 @@ void vvToolCropImage::sliderTMaxValueChanged(int s) {
 //------------------------------------------------------------------------------
 void vvToolCropImage::UpdateExtent()
 {
-  for(int i=0; i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
+  for(int i=0; i<mCurrentSlicerManager->GetNumberOfSlicers(); i++) {
     mCurrentSlicerManager->GetSlicer(i)->SetReducedExtent(mReducedExtent);
     mCurrentSlicerManager->GetSlicer(i)->ForceUpdateDisplayExtent();
     mCurrentSlicerManager->GetSlicer(i)->Render();
@@ -229,7 +229,7 @@ void vvToolCropImage::InputIsSelected(vvSlicerManager * slicer)
   mInitialExtent = new int[mExtentSize];
   mReducedExtent = mCurrentSlicerManager->GetImage()->GetFirstVTKImageData()->GetWholeExtent();
   for(int i=0; i<mExtentSize; i++) mInitialExtent[i] = mReducedExtent[i];
-  for(int i=0; i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
+  for(int i=0; i<mCurrentSlicerManager->GetNumberOfSlicers(); i++) {
     mCurrentSlicerManager->GetSlicer(i)->EnableReducedExtent(true);
   }
 
@@ -310,7 +310,7 @@ void vvToolCropImage::apply()
 
   // Typedef 
   typedef args_info_clitkCropImage ArgsInfoType;
-  typedef clitk::CropImageGenericFilter<ArgsInfoType> CropFilterType;
+  typedef clitk::CropImageGenericFilter CropFilterType;
   
   // Get options
   ArgsInfoType mArgsInfo;
@@ -338,7 +338,7 @@ void vvToolCropImage::apply()
   // filter to retrieve the correct image size
   for(int i=0; i<mExtentSize; i++) {
     mReducedExtent[i] = mInitialExtent[i];
-    DD(mArgsInfo.boundingBox_arg[i]);
+    // DD(mArgsInfo.boundingBox_arg[i]);
   }
   UpdateExtent();
 
@@ -360,7 +360,7 @@ void vvToolCropImage::apply()
   // Retrieve result and display it
   vvImage::Pointer output = filter->GetOutputVVImage();
   std::ostringstream osstream;
-  osstream << "Croped_" << mCurrentSlicerManager->GetSlicer(0)->GetFileName() << ".mhd";
+  osstream << "Cropped_" << mCurrentSlicerManager->GetSlicer(0)->GetFileName() << ".mhd";
   AddImage(output,osstream.str());
 
   // End