X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FLayerImageBase.h;h=e9eec4326fb1accd52bf854fb4da8b5fe686ee7f;hb=dea0efc567d8332b2e7eb936e3ba4ac1c11b2542;hp=f9989b0176ba4f8a258f797d898f7e08b45fa3cd;hpb=d40f88aeb2e3bf3619875d913eb876a6c82e6009;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 f9989b0..e9eec43 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
@@ -45,6 +45,8 @@
 #include "vtkScalarBarActor.h"
 
 #include "InteractorStyleMaracas.h"
+#include "vtkImageChangeInformation.h"
+
 
 //----------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------
@@ -63,7 +65,7 @@ public:
 	virtual bool OnRightButtonUp();
 
 private:
-    bool					_state;
+    bool				_state;
     bool 				_stateKey;
     LayerImageBase* 	_layerImageBase;
 
@@ -83,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();
@@ -106,30 +110,44 @@ class LayerImageBase
 		bool GetActorPresent();
 		void GetImageScalarRange();
 
+		void SetDimensionOriginalLayer(int dim[3]);
+		void SetDimensionBase(int dim[3]);
+		void SetSpcOriginalLayer(double spc[3]);
+		void SetNewSpacingLayer(double spc[3]);
+		void SetSpcBase(double spc[3]);
+		void GetDimensionOriginalLayer(int *dim);
+		void GetDimensionBase(int *dim);
+		void GetSpcOriginalLayer(double *spc);
+		void GetSpcBase(double *spc);
 
   private:
-		int						_X;
-		int						_Y;
-		int						_Z;
-		bool					_actorPresent;
-		vtkImageData			*_image;
-		vtkImageReslice			*_imageReslicer;
-		vtkLookupTable			*_thresholdTable;
-		vtkImageMapToColors		*_thresholdMapper;
-		vtkImageActor			*_thresholdActor;
-		wxVtkBaseView			*_baseView;
-
-		vtkScalarBarActor		*_scalarbarActor;
-
-		virtual void 			ConfigLookupTable() = 0;		
-		void		 			CleanXYZ(double &x, double &y, double &z);
-
+		int							_X;
+		int							_Y;
+		int							_Z;
+		bool						_actorPresent;
+		int 						_dimOriginalLayer[3];
+		double 						_spcOriginalLayer[3];
+		double 						_newSpcLayer[3];
+		int 						_dimBase[3];
+		double 						_spcBase[3];
+		double 						_opacity;
+
+		vtkImageData				*_image;
+		vtkImageChangeInformation	*_imageChangeInformation;
+		vtkImageReslice				*_imageReslicer;
+		vtkLookupTable				*_thresholdTable;
+		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;
+		vtkLookupTable				*GetThresholdTable();
+	  	double 						_range[2];
+	  	std::vector<double> 		_rangeForColorBar;
+	  	std::vector<int> 			_colorBarPosition;
  };