X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolHistogram.h;h=84813782cf3b6de6098be44c7f4bcca0bd5818f6;hb=c99626f17e07dbde440eb40a25683ce441a49a6e;hp=d81aee7d1bc558daacf22336bb94b1142daf0038;hpb=e2e07b38fd3916b7e26991b19cb2ce7342408c73;p=clitk.git

diff --git a/vv/vvToolHistogram.h b/vv/vvToolHistogram.h
index d81aee7..8481378 100644
--- a/vv/vvToolHistogram.h
+++ b/vv/vvToolHistogram.h
@@ -19,17 +19,28 @@
 #define VVTOOLHISTOGRAM_H
 
 #include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtUiPlugin/QDesignerExportWidget>
+#else
 #include <QtDesigner/QDesignerExportWidget>
+#endif
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"
+#include <vtkVersion.h>
+#if (VTK_MAJOR_VERSION == 8 && VTK_MINOR_VERSION >= 2) || VTK_MAJOR_VERSION >= 9
 #include "ui_vvToolHistogram.h"
+#else
+#include "ui_vvToolHistogramVTK7.h"
+#endif
 
 #include "clitkHistogramImage_ggo.h"
 #include "clitkHistogramImageGenericFilter.h"
 #include <vtkTable.h>
 #include <vtkContextView.h>
 #include <vtkContextScene.h>
+#include <vtkInteractorObserver.h>
+#include <vtkEventQtSlotConnect.h>
 
 //------------------------------------------------------------------------------
 class vvToolHistogram:
@@ -53,12 +64,24 @@ class vvToolHistogram:
   void computeMinMax();
   void SetPoints();
 
+  void displayHistogram();
+
+#if (VTK_MAJOR_VERSION == 8 && VTK_MINOR_VERSION >= 2) || VTK_MAJOR_VERSION >= 9
+  QVTKOpenGLNativeWidget* GetHistogramWidget();
+#else
+  QVTKWidget* GetHistogramWidget();
+#endif
+
   //-----------------------------------------------------
   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 +93,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;