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=e9eec4326fb1accd52bf854fb4da8b5fe686ee7f;hb=8cb2e736dbd160649089afd44928db6d26febcca;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..e9eec43 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
@@ -85,13 +85,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();
@@ -118,7 +120,6 @@ class LayerImageBase
 		void GetSpcOriginalLayer(double *spc);
 		void GetSpcBase(double *spc);
 
-
   private:
 		int							_X;
 		int							_Y;
@@ -129,8 +130,7 @@ class LayerImageBase
 		double 						_newSpcLayer[3];
 		int 						_dimBase[3];
 		double 						_spcBase[3];
-
-		
+		double 						_opacity;
 
 		vtkImageData				*_image;
 		vtkImageChangeInformation	*_imageChangeInformation;
@@ -139,18 +139,15 @@ 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;
  };