Ensure compatibility with newer version of VTK9

[clitk.git] / vv / vvToolHistogram.h

diff --git a/vv/vvToolHistogram.h b/vv/vvToolHistogram.h
index d81aee7d1bc558daacf22336bb94b1142daf0038..437e4e6e04ef5ba9bf7ea7ef6fef5cf941e9a82b 100644 (file)
--- a/vv/vvToolHistogram.h
+++ b/vv/vvToolHistogram.h
@@ -19,7 +19,11 @@
 #define VVTOOLHISTOGRAM_H
 
 #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"
@@ -30,6 +34,8 @@
 #include <vtkTable.h>
 #include <vtkContextView.h>
 #include <vtkContextScene.h>
+#include <vtkInteractorObserver.h>
+#include <vtkEventQtSlotConnect.h>
 
 //------------------------------------------------------------------------------
 class vvToolHistogram:
@@ -53,12 +59,20 @@ class vvToolHistogram:
   void computeMinMax();
   void SetPoints();
 
+  void displayHistogram();
+
+  QVTKWidget* GetHistogramWidget();
+
   //-----------------------------------------------------
   public slots:
   virtual void apply();
   virtual bool close();
   virtual void reject();
-  virtual void windowLevelChanged();
+
+  void windowLevelChanged();
+  void reduceWindow();
+  void expandWindow();
+  void translateWindow(double x);
 
   void SaveAs();
 
@@ -70,8 +84,15 @@ class vvToolHistogram:
 
   double mMinWindowLevel;
   double mMaxWindowLevel;
+  double originalWindow;
+  double originalLevel;
+  bool mModificationsDone;
 
   vtkSmartPointer<vtkContextView> mView;
+
+  vtkSmartPointer<vtkTable> mTableWindowLevel;
+  vtkSmartPointer<vtkTable> mTable;
+  //vtkSmartPointer<vtkContextView> mView;
   clitk::HistogramImageGenericFilter::Pointer mFilter;
   std::string mTextFileName;