X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolBinarize.h;h=fbc5a24ee5d841dec6b39e20cf02250bf2145d5f;hb=61d57d331b0459560f6714c0c6bb8298868a662e;hp=f29d1190367a797b46e1f5fdd53a366135f33843;hpb=0a85e47a06c7d046d06a4645b724c4e81b19998d;p=clitk.git

diff --git a/vv/vvToolBinarize.h b/vv/vvToolBinarize.h
index f29d119..fbc5a24 100644
--- a/vv/vvToolBinarize.h
+++ b/vv/vvToolBinarize.h
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: vvToolBinarize.h,v $
   Language:  C++
-  Date:      $Date: 2010/02/24 11:42:42 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2010/03/17 11:22:18 $
+  Version:   $Revision: 1.9 $
   Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
 
   Copyright (C) 2010
@@ -29,7 +29,6 @@
 #define VVTOOLBINARIZE_H
 
 #include <QtDesigner/QDesignerExportWidget>
-//#include <QDialog>
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"
@@ -37,15 +36,6 @@
 #include "ui_vvToolBinarize.h"
 #include "clitkBinarizeImage_ggo.h"
 
-#include "vtkMarchingSquares.h"
-#include "vtkImageClip.h"
-#include "vtkMarchingCubes.h"
-#include "vtkPolyData.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkActor.h"
-#include "vtkProperty.h"
-#include "vtkRenderer.h"
-
 //------------------------------------------------------------------------------
 class vvToolBinarize:
   public vvToolWidgetBase,
@@ -61,35 +51,28 @@ class vvToolBinarize:
   static void Initialize();
   void InputIsSet(bool b);
   void GetArgsInfoFromGUI();
+  virtual void InputIsSelected(vvSlicerManager * m);
+  //  virtual void InputIsSelected(std::vector<vvSlicerManager *> & m);
 
   //-----------------------------------------------------
   public slots:
-  void apply();
+  virtual void apply();
+  virtual bool close();
+  virtual void reject();
   void valueChangedT1(double v);
   void valueChangedT2(double v);
   void UpdateSlice(int slicer,int slices);
-  void InputIsSelected(vvSlicerManager * m);
   void enableLowerThan(bool b);
   void useFGBGtoggled(bool);
-  virtual bool close() { DD("vvToolBinarize::close"); 
-    for(unsigned int i=0; i<mImageContour.size(); i++)
-      mImageContour[i]->removeActors();
-    if (mCurrentSlicerManager)
-      mCurrentSlicerManager->Render();
-    return vvToolWidgetBase::close(); }
-
-  virtual void reject() { DD("vvToolBinarize::reject"); 
-    for(unsigned int i=0; i<mImageContour.size(); i++)
-      mImageContour[i]->removeActors();
-    if (mCurrentSlicerManager)
-      mCurrentSlicerManager->Render();
-    return vvToolWidgetBase::reject(); }
-
+  void InteractiveDisplayToggled(bool b);
 
  protected:
+  void RemoveVTKObjects();
   Ui::vvToolBinarize ui;
   args_info_clitkBinarizeImage mArgsInfo;
   std::vector<vvImageContour*> mImageContour;
+  std::vector<vvImageContour*> mImageContourLower;
+  bool mInteractiveDisplayIsEnabled;
 
 }; // end class vvToolBinarize
 //------------------------------------------------------------------------------