Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/cpPlugins

[cpPlugins.git] / lib / cpExtensions / Interaction / SphereWidget.h

diff --git a/lib/cpExtensions/Interaction/SphereWidget.h b/lib/cpExtensions/Interaction/SphereWidget.h
index dd6a499a2e2551d0505fc62dbe736929a655e77c..9afae7c894be0b89f454a7efeef73b84d9f027cb 100644 (file)
--- a/lib/cpExtensions/Interaction/SphereWidget.h
+++ b/lib/cpExtensions/Interaction/SphereWidget.h
@@ -3,7 +3,7 @@
 
 #include <cpExtensions/cpExtensions_Export.h>
 #include <cpExtensions/Interaction/BaseInteractorStyle.h>
-#include <vtkSphereWidget2.h>
+#include <vtkSphereWidget.h>
 
 namespace cpExtensions
 {
@@ -12,11 +12,11 @@ namespace cpExtensions
     /**
      */
     class cpExtensions_EXPORT SphereWidget
-      : public vtkSphereWidget2
+      : public vtkSphereWidget
     {
     public:
       typedef SphereWidget Self;
-      vtkTypeMacro( SphereWidget, vtkSphereWidget2 );
+      vtkTypeMacro( SphereWidget, vtkSphereWidget );
 
       typedef cpExtensions::Interaction::BaseInteractorStyle TBaseStyle;
       typedef TBaseStyle::TMouseCommand TMouseCommand;
@@ -26,9 +26,10 @@ namespace cpExtensions
       static Self* New( );
 
       virtual void SetInteractor( vtkRenderWindowInteractor* rwi );
-
-      
-
+      void SetCenter(double* center);
+      void SetAxis(int axis);
+      int GetAxis();
+      double * GetPosition();
     protected:
       SphereWidget( );
       virtual ~SphereWidget( );
@@ -41,9 +42,21 @@ namespace cpExtensions
         void* data, const TBaseStyle::ButtonID& button,
         int* idx, double* pos, bool alt, bool ctr, bool sft
         );
+      static void _MouseMove(
+        void* data, const TBaseStyle::ButtonID& button,
+        int* idx, double* pos, bool alt, bool ctr, bool sft
+        );
+     
       static void _KeyPress(void* data, const char& key);
        
+      static void SetCenter(void* data, double* center);
+
+      static void SetAxis(void* data, int axis);
+      static int GetAxis(void* data);
+      static double * GetPosition(void* data);
     private:
+      int m_axis;
+
       // Purposely not implemented
       SphereWidget( const Self& );
       Self& operator=( const Self& );