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

diff --git a/vv/vvToolBinarize.h b/vv/vvToolBinarize.h
index f29d119..4cdaa85 100644
--- a/vv/vvToolBinarize.h
+++ b/vv/vvToolBinarize.h
@@ -1,50 +1,36 @@
 /*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Program:   vv
-  Module:    $RCSfile: vvToolBinarize.h,v $
-  Language:  C++
-  Date:      $Date: 2010/02/24 11:42:42 $
-  Version:   $Revision: 1.6 $
-  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://www.centreleonberard.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
-  Copyright (C) 2010
-  Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
-  CREATIS                   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.
-
-  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 <http://www.gnu.org/licenses/>.
-
-  =========================================================================*/
+  It is distributed under dual licence
 
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+===========================================================================**/
 #ifndef VVTOOLBINARIZE_H
 #define VVTOOLBINARIZE_H
 
+#include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
-//#include <QDialog>
+#endif
 
 #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"
+#include "clitkBinarizeImage_ggo.h"
 
 //------------------------------------------------------------------------------
 class vvToolBinarize:
@@ -59,37 +45,33 @@ class vvToolBinarize:
 
   //-----------------------------------------------------
   static void Initialize();
-  void InputIsSet(bool b);
   void GetArgsInfoFromGUI();
+  virtual void InputIsSelected(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 UpdateOrientation(int slicer, int orientation);
+  void UpdateSlice(int slicer,int slices, int code=0);
   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);
+  //  void LeftButtonReleaseEvent(int slicer);
 
  protected:
+  void RemoveVTKObjects();
+  virtual void closeEvent(QCloseEvent *event);
   Ui::vvToolBinarize ui;
   args_info_clitkBinarizeImage mArgsInfo;
-  std::vector<vvImageContour*> mImageContour;
+  std::vector<vvImageContour::Pointer> mImageContour;
+  std::vector<vvImageContour::Pointer> mImageContourLower;
+  bool mInteractiveDisplayIsEnabled;
+  
+  void Update(int slicer);
 
 }; // end class vvToolBinarize
 //------------------------------------------------------------------------------