X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FLayerImageBase.h;h=f5abbb6b61cc6add81fd915486288db483203e15;hb=ca35b13e046343c8b50cbd6b833828b06c9d1608;hp=b6ad1e1dfd4e02209616220a6b2871d92489b4d3;hpb=0780b53e8b105636030b2c9fcbbc423d8ed48c30;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 b6ad1e1..f5abbb6 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"
 
-
 //----------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------
@@ -85,13 +84,15 @@ class LayerImageBase
   public:
 		LayerImageBase();
 		virtual ~LayerImageBase();
-		void SetX(int x);
-		void SetY(int y);
-		void SetZ(int z);
-		void SetImage(vtkImageData* image);
-		void SetRangeForColorBar(std::vector<double> &range);
-		void GetRangeForColorBar(double &minRange, double &maxRange);
-		void SetwxVtkBaseView(wxVtkBaseView *baseview);
+		void 			SetX(int x);
+		void 			SetY(int y);
+		void 			SetZ(int z);
+		void 			SetImage(vtkImageData* image);
+		vtkImageData* 	GetImage();
+		void 			SetRangeForColorBar(std::vector<double> &range);
+		void 			GetRangeForColorBar(double &minRange, double &maxRange);
+		void 			SetColorBarPosition(std::vector<int> &colorbarposition);
+		void 			SetwxVtkBaseView(wxVtkBaseView *baseview);
 
 		void onThreshold();
 		void onThresholdChange();
@@ -100,7 +101,8 @@ class LayerImageBase
 		void onThresholdRemove();
 		wxVtkBaseView *GetwxVtkBaseView();
 		void Refresh();
-		vtkLookupTable *GetvtkLookupTable();
+		vtkLookupTable *GetThresholdTable();
+
 		vtkImageReslice *GetvtkImageReslice();
 		virtual int GetX();
 		virtual int GetY();
@@ -117,7 +119,7 @@ class LayerImageBase
 		void GetDimensionBase(int *dim);
 		void GetSpcOriginalLayer(double *spc);
 		void GetSpcBase(double *spc);
-
+		vtkScalarsToColors* GetLookupTable();
 
   private:
 		int							_X;
@@ -129,8 +131,7 @@ class LayerImageBase
 		double 						_newSpcLayer[3];
 		int 						_dimBase[3];
 		double 						_spcBase[3];
-
-		
+		double 						_opacity;
 
 		vtkImageData				*_image;
 		vtkImageChangeInformation	*_imageChangeInformation;
@@ -139,18 +140,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();
-		vtkImageData				*GetImage();
 	  	double 						_range[2];
 	  	std::vector<double> 		_rangeForColorBar;
+	  	std::vector<int> 			_colorBarPosition;
  };