X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FLayerImageBase.h;h=fec399ca43a180788f551dee20215bc3f69a024f;hb=63a0a21e6736a800c58442edd531c91d75e71694;hp=1781373de5a94f7360683f48c4ade828de891e75;hpb=e44e380ce1a1ba82e9fc6ecda35451e360c5f436;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
index 1781373..fec399c 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
@@ -42,6 +42,7 @@
 #include <vtkImageActor.h>
 #include <vtkImageData.h>
 #include "wxVtkBaseView.h"
+#include "vtkScalarBarActor.h"
 
 #include "InteractorStyleMaracas.h"
 
@@ -50,17 +51,20 @@
 //----------------------------------------------------------------------------------
 class LayerImageBase;
 
-class ColorLayerImageBasevtkInteractor : public InteractorStyleMaracas {
+class ColorLayerImageBasevtkInteractor : public InteractorStyleMaracas 
+{
 public:
 	ColorLayerImageBasevtkInteractor(LayerImageBase* layerImageBase);
 	virtual ~ColorLayerImageBasevtkInteractor();
 
-	virtual bool  OnMouseMove();
-	virtual bool  OnRightButtonDown();
-	virtual bool  OnRightButtonUp();
+	virtual bool OnChar(); 
+	virtual bool OnMouseMove();
+	virtual bool OnRightButtonDown();
+	virtual bool OnRightButtonUp();
 
 private:
-    bool		_state;
+    bool					_state;
+    bool 				_stateKey;
     LayerImageBase* 	_layerImageBase;
 
 protected:
@@ -75,7 +79,7 @@ protected:
 
 
 class LayerImageBase
-  {
+ {
   public:
 		LayerImageBase();
 		virtual ~LayerImageBase();
@@ -97,21 +101,23 @@ class LayerImageBase
 		virtual int GetX();
 		virtual int GetY();
 		virtual int GetZ();
+		bool GetActorPresent();
 
   private:
-		int			_X;
-		int			_Y;
-		int			_Z;
-		bool			_actorPresent;
-		vtkImageData		*_image;
+		int						_X;
+		int						_Y;
+		int						_Z;
+		bool						_actorPresent;
+		vtkImageData			*_image;
 		vtkImageReslice		*_imageReslicer;
-		vtkLookupTable		*_thresholdTable;
+		vtkLookupTable			*_thresholdTable;
 		vtkImageMapToColors	*_thresholdMapper;
-		vtkImageActor		*_thresholdActor;
-		wxVtkBaseView		*_baseView;
+		vtkImageActor			*_thresholdActor;
+		wxVtkBaseView			*_baseView;
 
-		virtual void ConfigLookupTable() = 0;
-		bool GetActorPresent();
+		vtkScalarBarActor		*_scalarbarActor;
+
+		virtual void ConfigLookupTable() = 0;		
 		void CleanXYZ(double &x, double &y, double &z);