X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FLayerImageBase.h;h=482b6fa725531671a3966a176781136b4ad862df;hb=659bcd2c2a608cfb8c5854ffe84e9248871df9a1;hp=0a9f0c0327505c44dac943cbeeb2dcbea726e64c;hpb=d1de4d9e4121e4602daf11142cbc4b03c386d98a;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 0a9f0c0..482b6fa 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
@@ -47,7 +47,6 @@
 #include "InteractorStyleMaracas.h"
 #include "vtkImageChangeInformation.h"
 
-
 //----------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------
@@ -92,6 +91,8 @@ class LayerImageBase
 		vtkImageData* 	GetImage();
 		void 			SetRangeForColorBar(std::vector<double> &range);
 		void 			GetRangeForColorBar(double &minRange, double &maxRange);
+		void 			SetColorBarPosition(std::vector<int> &colorbarposition);
+		void 			UpdateColorBarPosition();
 		void 			SetwxVtkBaseView(wxVtkBaseView *baseview);
 
 		void onThreshold();
@@ -101,7 +102,8 @@ class LayerImageBase
 		void onThresholdRemove();
 		wxVtkBaseView *GetwxVtkBaseView();
 		void Refresh();
-		vtkLookupTable *GetvtkLookupTable();
+		vtkLookupTable *GetThresholdTable();
+
 		vtkImageReslice *GetvtkImageReslice();
 		virtual int GetX();
 		virtual int GetY();
@@ -118,7 +120,7 @@ class LayerImageBase
 		void GetDimensionBase(int *dim);
 		void GetSpcOriginalLayer(double *spc);
 		void GetSpcBase(double *spc);
-
+		vtkScalarsToColors* GetLookupTable();
 
   private:
 		int							_X;
@@ -130,8 +132,7 @@ class LayerImageBase
 		double 						_newSpcLayer[3];
 		int 						_dimBase[3];
 		double 						_spcBase[3];
-
-		
+		double 						_opacity;
 
 		vtkImageData				*_image;
 		vtkImageChangeInformation	*_imageChangeInformation;
@@ -140,17 +141,14 @@ class LayerImageBase
 		vtkImageMapToColors			*_thresholdMapper;
 		vtkImageActor				*_thresholdActor;
 		wxVtkBaseView				*_baseView;
-
 		vtkScalarBarActor			*_scalarbarActor;
-
 		virtual void 				ConfigLookupTable() = 0;		
 		void		 				CleanXYZ(double &x, double &y, double &z);
 
-
   protected:
-		vtkLookupTable				*GetThresholdTable();
 	  	double 						_range[2];
 	  	std::vector<double> 		_rangeForColorBar;
+	  	std::vector<int> 			_colorBarPosition;
  };