X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FColorLayerImageViewPanel.h;h=abdefc1c075f267a2577492e4efe345fa475cedf;hb=8cb2e736dbd160649089afd44928db6d26febcca;hp=da8489cc6a6e5380598350bb26c16f5a44250132;hpb=ef92674006375c4fe7b842ce834590c5b6d9683f;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.h
index da8489c..abdefc1 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.h
@@ -40,8 +40,11 @@
 #include <wx/wx.h>
 #include <wx/button.h>
 #include "ColorLayerImageViewManager.h"
+#include "Histogram.h"
+#include "HistogramBase.h"
 
-
+// Borrame
+// #include "mBarRange2.h"
 
 //-----------------------------------------------------
 
@@ -51,7 +54,14 @@ class wxDlgTransformByDimensionBySpacingByPixel
 	public:
 		wxDlgTransformByDimensionBySpacingByPixel();
 		~wxDlgTransformByDimensionBySpacingByPixel();
-		void GetTransformType(wxWindow *parent , wxString message,int &typeOfTransformation,bool &dlgWxOK) ;
+		void GetTransformType(wxWindow *parent,
+ 									double baseSpc[3],
+									double layerSpc[3],
+									int baseDim[3],
+									int layerDim[3],
+									wxString message,
+									int &typeOfTransformation,
+									bool &dlgWxOK) ;
 	};
 
 
@@ -62,38 +72,43 @@ class ColorLayerImageViewPanel
 		: public wxPanel
 		{
 		public:
-			ColorLayerImageViewPanel(wxWindow * parent, int min, int max, int type);
+			ColorLayerImageViewPanel(wxWindow * parent, int min, int max,int opacity, int type);
 			~ColorLayerImageViewPanel();
 			void onThresholdStop();
+			void ChangeOpacity();
 			ColorLayerImageViewManager* GetColorLayerImageViewManager();
 //EED01			ColorLayerImageView* GetColorLayerImageView();
 //EED01			void SetColorLayerImageView(ColorLayerImageView* colorLayerImageView);
 			bool IsVisible();
-			void SetBaseSpacing(double spc[3]);
-			void SetBaseDimension(int dim[3]);
-			void SetOriginalSpacing(double spc[3]);
+
+
 			void SetImage(vtkImageData *img);
 			void SetFittingMode(int fitting_mode);
-			int GetFittingMode();
+			int  GetFittingMode();
+			void SetActive(bool active);
 
 		private:
-			int                             _fitting_mode;
-
-			int				_dimBase[3];
-			double				_spcBase[3];
-			double				_spcOrg[3];
-
-			bool				_thresholdGo;
-			ColorLayerImageViewManager     	*_colorLayerImageViewManager;
-//			ColorLayerImageView     	*_colorLayerImageView;  
-			wxButton			*_btn_ReadImage;
-			wxSlider			*_opacity;
-			wxCheckBox			*_interpolationCheckBox;
-			wxCheckBox			*_cb_ShowHide;
-			wxCheckBox			*_cb_SliceFixDinamic;
-			wxSlider			*_sl_SliceImageX;
-			wxSlider			*_sl_SliceImageY;
-			wxSlider			*_sl_SliceImageZ;
+			bool							_active;
+			int								_fitting_mode;
+			int								_dimBase[3];
+			double							_spcBase[3];
+			double							_spcOrg[3];
+			bool							_thresholdGo;
+			ColorLayerImageViewManager  	*_colorLayerImageViewManager;
+			wxButton						*_btn_ReadImage;
+			wxSlider						*_opacity;
+			wxCheckBox						*_interpolationCheckBox;
+			wxCheckBox						*_cb_ShowHide;
+			wxCheckBox						*_cb_SliceFixDinamic;
+			wxSlider						*_sl_SliceImageX;
+			wxSlider						*_sl_SliceImageY;
+			wxSlider						*_sl_SliceImageZ;
+
+//Borrame
+//			mBarRange2						*_barrange2;
+			Histogram*						_histogram;
+			HistogramMinMaxLevel*			_histogramMinMaxLevel;
+
 			void onReadImage(wxCommandEvent& event);
 			void onThresholdChange(wxCommandEvent& event);
 			void onThresholdShow(wxCommandEvent& event);
@@ -101,10 +116,7 @@ class ColorLayerImageViewPanel
 			void onChangeOpacity(wxScrollEvent& event);
 			void onSliceFixDinamic(wxCommandEvent& event);
 			void onSliceImage(wxScrollEvent& event);
-
 			void RefreshView();
-	
-
 };
 
 #endif