X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolCropImage.cxx;h=74c1e4c43c53207ca6a281c0f594f3fa0a97203b;hb=dfb1627eab468417ab2682a03a4a66cf6830b921;hp=ba97489b8da372479c7c35aa9a8c755e5ab8331f;hpb=98bdb72d057c122863776f8c3fb74659e8c87beb;p=clitk.git

diff --git a/vv/vvToolCropImage.cxx b/vv/vvToolCropImage.cxx
index ba97489..74c1e4c 100644
--- a/vv/vvToolCropImage.cxx
+++ b/vv/vvToolCropImage.cxx
@@ -1,30 +1,20 @@
 /*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Program:   vv
-  Module:    $RCSfile: vvToolCropImage.cxx,v $
-  Language:  C++
-  Date:      $Date: 2010/03/01 15:38:09 $
-  Version:   $Revision: 1.3 $
-  Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
+  Authors belong to: 
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
-  Copyright (C) 2008
-  Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
-  CREATIS-LRMN http://www.creatis.insa-lyon.fr
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
 
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, version 3 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-  =========================================================================*/
+  It is distributed under dual licence
 
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+======================================================================-====*/
 #include "vvToolCropImage.h"
 #include <QComboBox>
 #include <QCursor>
@@ -51,6 +41,8 @@ vvToolCropImage::vvToolCropImage(vvMainWindowBase * parent, Qt::WindowFlags f):
   // GUI Initialization
   Ui_vvToolCropImage::setupUi(mToolWidget);
 
+  // Set how many inputs are needed for this tool
+  AddInputSelector("Select one image");
 }
 //------------------------------------------------------------------------------
 
@@ -64,7 +56,7 @@ vvToolCropImage::~vvToolCropImage() {
 
 //------------------------------------------------------------------------------
 bool vvToolCropImage::close() { 
-  for(int i=0; i<6; i++) mReducedExtent[i] = mInitialExtent[i];
+  for(int i=0; i<mExtentSize; i++) mReducedExtent[i] = mInitialExtent[i];
   UpdateExtent();
   return vvToolWidgetBase::close(); 
 }
@@ -73,7 +65,7 @@ bool vvToolCropImage::close() {
 
 //------------------------------------------------------------------------------
 void vvToolCropImage::reject() { 
-  for(int i=0; i<6; i++) mReducedExtent[i] = mInitialExtent[i];
+  for(int i=0; i<mExtentSize; i++) mReducedExtent[i] = mInitialExtent[i];
   UpdateExtent();
   return vvToolWidgetBase::reject(); 
 }
@@ -189,8 +181,11 @@ void vvToolCropImage::InputIsSelected(vvSlicerManager * slicer) {
   mReducedExtent = new int[mExtentSize];
   mInitialExtent = new int[mExtentSize];
   mReducedExtent = mCurrentSlicerManager->GetImage()->GetFirstVTKImageData()->GetWholeExtent();
-  for(int i=0; i<6; i++) mInitialExtent[i] = mReducedExtent[i];
+  for(int i=0; i<mExtentSize; i++) mInitialExtent[i] = mReducedExtent[i];
   for(int i=0; i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
+    //DD(i);
+    //DD(mReducedExtent[i]);
+    //DD(mInitialExtent[i]);
     mCurrentSlicerManager->GetSlicer(i)->EnableReducedExtent(true);
   }
   
@@ -251,6 +246,7 @@ void vvToolCropImage::InputIsSelected(vvSlicerManager * slicer) {
   // connect(tmaxSlider, SIGNAL(valueChanged(int)), this, SLOT(sliderTMaxValueChanged(int)));
   
   //  connect(mIntensitySlider, SIGNAL(valueChanged(double)), this, SLOT(autoCropValueChanged(double)));
+  UpdateExtent();
 }
 //------------------------------------------------------------------------------