Merge branch 'master' into GammaIndex3D

[clitk.git] / vv / vvToolROIManager.h

diff --git a/vv/vvToolROIManager.h b/vv/vvToolROIManager.h
index 1f0f81ccf87b2be0471aa52a2bc477f03cf37353..9cb993ad6f57dac5ab5b6185c54e64189bf487b9 100644 (file)
--- a/vv/vvToolROIManager.h
+++ b/vv/vvToolROIManager.h
@@ -19,6 +19,7 @@
 #ifndef VVTOOLROIMANAGER_H
 #define VVTOOLROIMANAGER_H
 
+#include <QtGlobal>
 #include <QtDesigner/QDesignerExportWidget>
 #include <QSharedPointer>
 
@@ -43,7 +44,7 @@ class vvToolROIManager:
   static void Initialize();
   virtual void InputIsSelected(vvSlicerManager *m);
 
-  void AddImage(vvImage * binaryImage, std::string filename, double BG, bool m_modeBG=true);
+  void AddImage(vvImage * binaryImage, std::string name, std::string filename, double BG, bool m_modeBG=true);
   void UpdateAllContours();
   void UpdateAllROIStatus();
   virtual void SaveState(std::auto_ptr<QXmlStreamWriter> & m_XmlWriter);
@@ -52,9 +53,9 @@ class vvToolROIManager:
   public slots:
   void AnImageIsBeingClosed(vvSlicerManager *);
   void SelectedImageHasChanged(vvSlicerManager *);
-  void OpenBinaryImage();
+  void Open();
   void OpenBinaryImage(QStringList & filenames);
-  void OpenDicomImage();
+  void OpenDicomImage(std::string filaneme);
   void SelectedItemChangedInTree();
   void VisibleROIToggled(bool b);
   void VisibleContourROIToggled(bool b);
@@ -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;