X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolProfile.h;h=0f94ff3a9177c52b81afa0e25eaedfc865d2ea3c;hb=75719c377dd8aa759f32dd277cfd7b2f914ebfa8;hp=baaf4a9e66f846f15dbb6df97a9980ec9f35c074;hpb=ebc1acee802a4dd54c3ff05662d3c7087c7aa882;p=clitk.git

diff --git a/vv/vvToolProfile.h b/vv/vvToolProfile.h
index baaf4a9..0f94ff3 100644
--- a/vv/vvToolProfile.h
+++ b/vv/vvToolProfile.h
@@ -18,14 +18,31 @@
 #ifndef VVTOOLPROFILE_H
 #define VVTOOLPROFILE_H
 
+#include <QtGlobal>
+#if QT_VERSION >= 0x050000
 #include <QtUiPlugin/QDesignerExportWidget>
+#else
+#include <QtDesigner/QDesignerExportWidget>
+#endif
 
 #include "vvToolBase.h"
 #include "vvToolWidgetBase.h"
 #include "vvImageContour.h"
+#include "vvLandmarks.h"
+#include <vtkVersion.h>
+#if (VTK_MAJOR_VERSION == 8 && VTK_MINOR_VERSION >= 1) || VTK_MAJOR_VERSION >= 9
 #include "ui_vvToolProfile.h"
+#else
+#include "ui_vvToolProfileVTK7.h"
+#endif
+#include "vvBinaryImageOverlayActor.h"
 
 #include "clitkProfileImage_ggo.h"
+#include "clitkProfileImageGenericFilter.h"
+#include <vtkTable.h>
+#include <vtkContextView.h>
+#include <vtkContextScene.h>
+#include <vtkTransformPolyDataFilter.h>
 
 //------------------------------------------------------------------------------
 class vvToolProfile:
@@ -40,33 +57,44 @@ class vvToolProfile:
 
   //-----------------------------------------------------
   static void Initialize();
+  void InitializeLine();
   void GetArgsInfoFromGUI();
   virtual void InputIsSelected(vvSlicerManager * m);
 
+  bool isPointsSelected();
+  void computeProfile();
+  void SetPoints();
+
   //-----------------------------------------------------
   public slots:
   virtual void apply();
   virtual bool close();
   virtual void reject();
-  void valueChangedT1(double v);
-  void valueChangedT2(double v);
-  void UpdateOrientation(int slicer, int orientation);
-  void UpdateSlice(int slicer,int slices);
-  void enableLowerThan(bool b);
-  void useFGBGtoggled(bool);
-  void InteractiveDisplayToggled(bool b);
-  //  void LeftButtonReleaseEvent(int slicer);
+  
+  void selectPoint1();
+  void selectPoint2();
+  void cancelPoints();
+  void SaveAs();
+  void DisplayLine(int);
+  void DeleteLine(int);
 
  protected:
   void RemoveVTKObjects();
   virtual void closeEvent(QCloseEvent *event);
   Ui::vvToolProfile ui;
   args_info_clitkProfileImage mArgsInfo;
-  std::vector<vvImageContour::Pointer> mImageContour;
-  std::vector<vvImageContour::Pointer> mImageContourLower;
-  bool mInteractiveDisplayIsEnabled;
   
-  void Update(int slicer);
+  double* mPoint1;
+  double* mPoint2;
+  bool mPoint1Selected;
+  bool mPoint2Selected;
+  vtkSmartPointer<vtkContextView> mView;
+  clitk::ProfileImageGenericFilter::Pointer mFilter;
+  std::string mTextFileName;
+  std::vector<vtkSmartPointer<vtkActor> > mLineActors;
+  vtkSmartPointer<vtkPolyData> mLinesPolyData;
+  vtkSmartPointer<vtkTransformPolyDataFilter> mLineTransform;
+
 
 }; // end class vvToolProfile
 //------------------------------------------------------------------------------