X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolBinarize.cxx;h=283428532cb666567c1c7ed11f3859108826e55c;hb=dfb1627eab468417ab2682a03a4a66cf6830b921;hp=343350ce2731a40dcf2c95ecabfbeff21c2566ea;hpb=1c8e61413a024c1f3a15f344dcceec45399911b5;p=clitk.git
diff --git a/vv/vvToolBinarize.cxx b/vv/vvToolBinarize.cxx
index 343350c..2834285 100644
--- a/vv/vvToolBinarize.cxx
+++ b/vv/vvToolBinarize.cxx
@@ -1,29 +1,20 @@
/*=========================================================================
+ Program: vv http://www.creatis.insa-lyon.fr/rio/vv
- Program: vv
- Module: $RCSfile: vvToolBinarize.cxx,v $
- Language: C++
- Date: $Date: 2010/03/17 11:22:18 $
- Version: $Revision: 1.12 $
- 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.
+ It is distributed under dual licence
- 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 .
-
- =========================================================================*/
+ - BSD See included LICENSE.txt file
+ - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+======================================================================-====*/
#include "vvToolBinarize.h"
#include "vvSlicerManager.h"
@@ -47,7 +38,7 @@ ADD_TOOL(vvToolBinarize);
void vvToolBinarize::Initialize() {
SetToolName("Binarize");
SetToolMenuName("Binarize");
- SetToolIconFilename(":/new/prefix1/icons/binarize.png");
+ SetToolIconFilename(":/common/icons/binarize.png");
SetToolTip("Image interactive binarization with thresholds.");
}
//------------------------------------------------------------------------------
@@ -79,7 +70,7 @@ vvToolBinarize::vvToolBinarize(vvMainWindowBase * parent, Qt::WindowFlags f)
mFilter = new clitk::BinarizeImageGenericFilter;
// Set how many inputs are needed for this tool
- AddInputSelector(mFilter);
+ AddInputSelector("Select one image", mFilter);
}
//------------------------------------------------------------------------------
@@ -131,7 +122,7 @@ bool vvToolBinarize::close() {
//------------------------------------------------------------------------------
void vvToolBinarize::reject() {
- DD("vvToolBinarize::reject");
+ // DD("vvToolBinarize::reject");
RemoveVTKObjects();
return vvToolWidgetBase::reject();
}
@@ -218,6 +209,7 @@ void vvToolBinarize::UpdateSlice(int slicer,int slices) {
if (!mInteractiveDisplayIsEnabled) return;
if (!mCurrentSlicerManager) close();
for(int i=0;iNumberOfSlicers(); i++) {
+ // DD(i);
mImageContour[i]->update(mThresholdSlider1->GetValue());
if (mRadioButtonLowerThan->isChecked())
mImageContourLower[i]->update(mThresholdSlider2->GetValue());
@@ -227,6 +219,7 @@ void vvToolBinarize::UpdateSlice(int slicer,int slices) {
}
//------------------------------------------------------------------------------
+
//------------------------------------------------------------------------------
void vvToolBinarize::GetArgsInfoFromGUI() {
@@ -295,8 +288,9 @@ void vvToolBinarize::apply() {
// Main filter
clitk::BinarizeImageGenericFilter::Pointer filter =
clitk::BinarizeImageGenericFilter::New();
- filter->SetArgsInfo(mArgsInfo);
filter->SetInputVVImage(mCurrentImage);
+ filter->SetArgsInfo(mArgsInfo);
+ filter->EnableReadOnDisk(false);
filter->Update();
// Output
@@ -319,7 +313,7 @@ void vvToolBinarize::valueChangedT2(double v) {
for(int i=0;iNumberOfSlicers(); i++) {
mImageContourLower[i]->update(v);
}
- mCurrentSlicerManager->Render();
+ // mCurrentSlicerManager->Render();
}
}
//------------------------------------------------------------------------------
@@ -335,6 +329,6 @@ void vvToolBinarize::valueChangedT1(double v) {
for(int i=0;iNumberOfSlicers(); i++) {
mImageContour[i]->update(v);
}
- mCurrentSlicerManager->Render();
+ // mCurrentSlicerManager->Render();
}
//------------------------------------------------------------------------------