Merge branch 'master' into GammaIndex3D

[clitk.git] / vv / vvToolROIManager.h

diff --git a/vv/vvToolROIManager.h b/vv/vvToolROIManager.h
index c69dc363cff92e5cafeb13d49822bb6838a486b9..9cb993ad6f57dac5ab5b6185c54e64189bf487b9 100644 (file)
--- a/vv/vvToolROIManager.h
+++ b/vv/vvToolROIManager.h
@@ -19,7 +19,8 @@
 #ifndef VVTOOLROIMANAGER_H
 #define VVTOOLROIMANAGER_H
 
-#include <QtUiPlugin/QDesignerExportWidget>
+#include <QtGlobal>
+#include <QtDesigner/QDesignerExportWidget>
 #include <QSharedPointer>
 
 #include "vvToolBase.h"
@@ -64,9 +65,10 @@ class vvToolROIManager:
   void ChangeContourWidth(int n);
   void ChangeDepth(int n);
   void AllVisibleROIToggled(int b);
-  void AllVisibleContourROIToggled(bool b);
+  void AllVisibleContourROIToggled(int b);
   void ReloadCurrentROI();  
   void close();
+  void RemoveROI();
   vvSlicerManager * GetCurrentSlicerManager() { return mCurrentSlicerManager; }
 
 protected:
@@ -79,6 +81,7 @@ protected:
   
   int mNumberOfVisibleROI;
   int mNumberOfVisibleContourROI;
+  static int nbTotalROI;
 
   vtkSmartPointer<vtkLookupTable> mDefaultLUTColor;