X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolBinarize.cxx;h=d2f3c6a193bc7d743ae91f7699bab9f449e3c8a2;hb=3a2e2acdcf35146a7016a9be56ff366208e0d4be;hp=afd07b12069c6b5d01dc8a8ad985c6eaa2572d9a;hpb=0d2c2b622e94b353cef04e5bd39d9f8de7b0d6a7;p=clitk.git

diff --git a/vv/vvToolBinarize.cxx b/vv/vvToolBinarize.cxx
index afd07b1..d2f3c6a 100644
--- a/vv/vvToolBinarize.cxx
+++ b/vv/vvToolBinarize.cxx
@@ -16,13 +16,16 @@
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
   ======================================================================-====*/
 
+// vv
 #include "vvToolBinarize.h"
 #include "vvSlicerManager.h"
 #include "vvSlicer.h"
 #include "vvToolInputSelectorWidget.h"
 
+// clitk
 #include "clitkBinarizeImageGenericFilter.h"
 
+// vtk
 #include <vtkImageActor.h>
 #include <vtkCamera.h>
 #include <vtkImageClip.h>
@@ -52,6 +55,7 @@ vvToolBinarize::vvToolBinarize(vvMainWindowBase * parent, Qt::WindowFlags f)
    vvToolBase<vvToolBinarize>(parent),
    Ui::vvToolBinarize()
 {
+  DD("Const binarize");
   // GUI Initialization
   Ui_vvToolBinarize::setupUi(mToolWidget);
   mInteractiveDisplayIsEnabled = mCheckBoxInteractiveDisplay->isChecked();
@@ -69,7 +73,7 @@ vvToolBinarize::vvToolBinarize(vvMainWindowBase * parent, Qt::WindowFlags f)
   mBGSlider->SetText("Background value");
 
   // Main filter
-  mFilter = new clitk::BinarizeImageGenericFilter<args_info_clitkBinarizeImage>;
+  mFilter = new clitk::BinarizeImageGenericFilter;
 
   // Set how many inputs are needed for this tool
   AddInputSelector("Select one image", mFilter);
@@ -119,12 +123,20 @@ void vvToolBinarize::RemoveVTKObjects()
 //------------------------------------------------------------------------------
 bool vvToolBinarize::close()
 {
-  RemoveVTKObjects();
+  // RemoveVTKObjects();
   return vvToolWidgetBase::close();
 }
 //------------------------------------------------------------------------------
 
 
+//------------------------------------------------------------------------------
+void vvToolBinarize::closeEvent(QCloseEvent *event) {
+  RemoveVTKObjects();
+  event->accept();
+}
+//------------------------------------------------------------------------------
+
+
 //------------------------------------------------------------------------------
 void vvToolBinarize::reject()
 {
@@ -239,7 +251,6 @@ void vvToolBinarize::UpdateSlice(int slicer,int slices)
   mImageContour[slicer]->Update(mThresholdSlider1->GetValue());
   if (mRadioButtonLowerThan->isChecked()) 
     mImageContourLower[slicer]->Update(mThresholdSlider2->GetValue());
-  //  mCurrentSlicerManager->GetSlicer(slicer)->Render(); 
 }
 //------------------------------------------------------------------------------
 
@@ -258,15 +269,11 @@ void vvToolBinarize::GetArgsInfoFromGUI()
      int good = cmdline_parser_ext(argc, argv, &args_info, &p);
      DD(good);
   */
-
-  mArgsInfo.imagetypes_flag = 0;
-  mArgsInfo.upper_given = 0;
-  mArgsInfo.lower_given = 0;
+  cmdline_parser_clitkBinarizeImage_init(&mArgsInfo); // Initialisation to default
   bool inverseBGandFG = false;
 
   mArgsInfo.lower_given = 1;
   mArgsInfo.lower_arg = mThresholdSlider1->GetValue();
-  // DD(mArgsInfo.lower_arg);
   if (mRadioButtonLowerThan->isChecked()) {
     mArgsInfo.upper_given = 1;
     mArgsInfo.upper_arg = mThresholdSlider2->GetValue();
@@ -293,12 +300,12 @@ void vvToolBinarize::GetArgsInfoFromGUI()
 
   mArgsInfo.verbose_flag = false;
 
-  // Required (even if not used)
-  mArgsInfo.input_given = 0;
-  mArgsInfo.output_given = 0;
+  // // Required (even if not used)
+  // mArgsInfo.input_given = 0;
+  // mArgsInfo.output_given = 0;
 
-  mArgsInfo.input_arg = new char;
-  mArgsInfo.output_arg = new char;
+  // mArgsInfo.input_arg = new char;
+  // mArgsInfo.output_arg = new char;
 }
 //------------------------------------------------------------------------------
 
@@ -311,11 +318,10 @@ void vvToolBinarize::apply()
   GetArgsInfoFromGUI();
 
   // Main filter
-  clitk::BinarizeImageGenericFilter<args_info_clitkBinarizeImage>::Pointer filter =
-    clitk::BinarizeImageGenericFilter<args_info_clitkBinarizeImage>::New();
+  clitk::BinarizeImageGenericFilter::Pointer filter =
+    clitk::BinarizeImageGenericFilter::New();
   filter->SetInputVVImage(mCurrentImage);
   filter->SetArgsInfo(mArgsInfo);
-  filter->EnableReadOnDisk(false);
   filter->Update();
 
   // Output
@@ -339,7 +345,7 @@ void vvToolBinarize::valueChangedT2(double v)
     for(int i=0;i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
       mImageContourLower[i]->Update(v);
     }
-    // mCurrentSlicerManager->Render();
+    mCurrentSlicerManager->Render();
   }
 }
 //------------------------------------------------------------------------------
@@ -356,6 +362,6 @@ void vvToolBinarize::valueChangedT1(double v)
   for(int i=0;i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
     mImageContour[i]->Update(v);
   }
-  // mCurrentSlicerManager->Render();
+  mCurrentSlicerManager->Render();
 }
 //------------------------------------------------------------------------------