X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolBinarize.cxx;h=fa22daad122e54bb2337d1feb1700f40bbd152e0;hb=23b7035f329686b6f96ddc86bc0a2381f647900b;hp=d2f3c6a193bc7d743ae91f7699bab9f449e3c8a2;hpb=02c49e8faa4b59536cd391f9169a406d0adf90c2;p=clitk.git

diff --git a/vv/vvToolBinarize.cxx b/vv/vvToolBinarize.cxx
index d2f3c6a..fa22daa 100644
--- a/vv/vvToolBinarize.cxx
+++ b/vv/vvToolBinarize.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 "vvToolBinarize.h"
@@ -55,7 +55,6 @@ vvToolBinarize::vvToolBinarize(vvMainWindowBase * parent, Qt::WindowFlags f)
    vvToolBase<vvToolBinarize>(parent),
    Ui::vvToolBinarize()
 {
-  DD("Const binarize");
   // GUI Initialization
   Ui_vvToolBinarize::setupUi(mToolWidget);
   mInteractiveDisplayIsEnabled = mCheckBoxInteractiveDisplay->isChecked();
@@ -73,7 +72,7 @@ vvToolBinarize::vvToolBinarize(vvMainWindowBase * parent, Qt::WindowFlags f)
   mBGSlider->SetText("Background value");
 
   // Main filter
-  mFilter = new clitk::BinarizeImageGenericFilter;
+  mFilter = clitk::BinarizeImageGenericFilter::New();
 
   // Set how many inputs are needed for this tool
   AddInputSelector("Select one image", mFilter);
@@ -211,11 +210,11 @@ void vvToolBinarize::InputIsSelected(vvSlicerManager * m)
   mBGSlider->SetSingleStep(1);
 
   // VTK objects for interactive display
-  for(int i=0; i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
-    mImageContour.push_back(new vvImageContour);
+  for(int i=0; i<mCurrentSlicerManager->GetNumberOfSlicers(); i++) {
+    mImageContour.push_back(vvImageContour::New());
     mImageContour[i]->SetSlicer(mCurrentSlicerManager->GetSlicer(i));
     mImageContour[i]->SetColor(1.0, 0.0, 0.0);
-    mImageContourLower.push_back(new vvImageContour);
+    mImageContourLower.push_back(vvImageContour::New());
     mImageContourLower[i]->SetSlicer(mCurrentSlicerManager->GetSlicer(i));
     mImageContourLower[i]->SetColor(0.0, 0.0, 1.0);
   }
@@ -226,8 +225,12 @@ void vvToolBinarize::InputIsSelected(vvSlicerManager * m)
 
   connect(mCurrentSlicerManager,SIGNAL(UpdateSlice(int,int)),this,SLOT(UpdateSlice(int, int)));
   connect(mCurrentSlicerManager,SIGNAL(UpdateTSlice(int,int)),this,SLOT(UpdateSlice(int, int)));
+  
+  connect(mCurrentSlicerManager,SIGNAL(UpdateOrientation(int,int)),this,SLOT(UpdateOrientation(int, int)));
 
   //  connect(mCurrentSlicerManager, SIGNAL(LeftButtonReleaseSignal(int)), SLOT(LeftButtonReleaseEvent(int)));
+  
+  InteractiveDisplayToggled(mInteractiveDisplayIsEnabled);
 }
 //------------------------------------------------------------------------------
 
@@ -235,7 +238,7 @@ void vvToolBinarize::InputIsSelected(vvSlicerManager * m)
 //------------------------------------------------------------------------------
 // void vvToolBinarize::LeftButtonReleaseEvent(int slicer) {
 //   DD("LeftButtonReleaseEvent");
-//   for(int i=0; i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
+//   for(int i=0; i<mCurrentSlicerManager->GetNumberOfSlicers(); i++) {
 //     if (i == slicer);
 //     mCurrentSlicerManager->GetSlicer(i)->GetRenderWindow()->Render();
 //   }
@@ -243,8 +246,22 @@ void vvToolBinarize::InputIsSelected(vvSlicerManager * m)
 //------------------------------------------------------------------------------
 
 
+//------------------------------------------------------------------------------
+void vvToolBinarize::UpdateOrientation(int slicer,int orientation)
+{
+  Update(slicer);
+}
+//------------------------------------------------------------------------------
+
 //------------------------------------------------------------------------------
 void vvToolBinarize::UpdateSlice(int slicer,int slices)
+{
+  Update(slicer);
+}
+//------------------------------------------------------------------------------
+
+//------------------------------------------------------------------------------
+void vvToolBinarize::Update(int slicer)
 {
   if (!mInteractiveDisplayIsEnabled) return;
   if (!mCurrentSlicerManager) close();
@@ -254,7 +271,6 @@ void vvToolBinarize::UpdateSlice(int slicer,int slices)
 }
 //------------------------------------------------------------------------------
 
-
 //------------------------------------------------------------------------------
 void vvToolBinarize::GetArgsInfoFromGUI()
 {
@@ -342,7 +358,7 @@ void vvToolBinarize::valueChangedT2(double v)
   if (mRadioButtonLowerThan->isChecked()) {
     mThresholdSlider1->SetMaximum(v);
     if (!mInteractiveDisplayIsEnabled) return;
-    for(int i=0;i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
+    for(int i=0;i<mCurrentSlicerManager->GetNumberOfSlicers(); i++) {
       mImageContourLower[i]->Update(v);
     }
     mCurrentSlicerManager->Render();
@@ -359,7 +375,7 @@ void vvToolBinarize::valueChangedT1(double v)
   mThresholdSlider2->SetMinimum(v);
   //  int m1 = (int)lrint(v);
   if (!mInteractiveDisplayIsEnabled) return;
-  for(int i=0;i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
+  for(int i=0;i<mCurrentSlicerManager->GetNumberOfSlicers(); i++) {
     mImageContour[i]->Update(v);
   }
   mCurrentSlicerManager->Render();