X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolBinarize.h;h=e6abdfeaed4ad4ac714a25f505940216223ef8a2;hb=34490f432219fe05c7ae19c4cf012b5529d784dc;hp=b40b267cfbc764cb33b05ec6893afd108027aae8;hpb=71d769c28f63906bc4872127e4d2d4b7b9f8e5ed;p=clitk.git

diff --git a/vv/vvToolBinarize.h b/vv/vvToolBinarize.h
index b40b267..e6abdfe 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/06 15:38:14 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2010/03/24 10:48:18 $
+  Version:   $Revision: 1.10 $
   Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
 
   Copyright (C) 2010
@@ -29,70 +29,48 @@
 #define VVTOOLBINARIZE_H
 
 #include <QtDesigner/QDesignerExportWidget>
-#include <QDialog>
 
 #include "vvToolBase.h"
+#include "vvToolWidgetBase.h"
+#include "vvImageContour.h"
 #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 QDialog, public vvToolBase<vvToolBinarize>, private Ui::vvToolBinarize 
+  public vvToolWidgetBase,
+  public vvToolBase<vvToolBinarize>, 
+  private Ui::vvToolBinarize 
 {
   Q_OBJECT
     public:
-  vvToolBinarize(QWidget * parent=0, Qt::WindowFlags f=0);
+  vvToolBinarize(vvMainWindowBase * parent=0, Qt::WindowFlags f=0);
   ~vvToolBinarize();
 
   //-----------------------------------------------------
-  typedef vvToolBinarize Self;
-
-  //-----------------------------------------------------
-  static void Initialize() {
-    SetToolName("Binarize");
-    SetToolMenuName("Binarize");
-    SetToolIconFilename(":/new/prefix1/icons/binarize.png");
-    SetToolTip("Image interactive binarization with thresholds.");
-  }
-
-  void InputIsSet(bool b);
+  static void Initialize();
   void GetArgsInfoFromGUI();
+  virtual void InputIsSelected(vvSlicerManager * m);
 
   //-----------------------------------------------------
- // public slots:
-//   void InputUpdate();
-
   public slots:
-  void apply();
-  // void InputChange(int index);
+  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();
   void enableLowerThan(bool b);
   void useFGBGtoggled(bool);
+  void InteractiveDisplayToggled(bool b);
 
  protected:
+  void RemoveVTKObjects();
   Ui::vvToolBinarize ui;
-  // std::vector<vvSlicerManager*> mSlicerManagers;
-//   std::vector<vvSlicerManager*> mSlicerManagersCompatible;
-//   vvImage::Pointer mCurrentImage;
-//   vvSlicerManager * mCurrentSliceManager;
   args_info_clitkBinarizeImage mArgsInfo;
-
-  vtkImageClip* mClipper;
-  vtkMarchingSquares* mSquares1;
-  vtkPolyDataMapper* mSquaresMapper1;
-  vtkActor* mSquaresActor1;
+  std::vector<vvImageContour*> mImageContour;
+  std::vector<vvImageContour*> mImageContourLower;
+  bool mInteractiveDisplayIsEnabled;
 
 }; // end class vvToolBinarize
 //------------------------------------------------------------------------------