X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FColorLayerImageViewPanel.h;h=8853a85f215fb94683e623d93e9c72c267a19bad;hb=4ecb6789d069c8dcd40724f03d8225c25629cd52;hp=35a1c49d7704490d465748b76659dd20d6e12b74;hpb=794fbd4c4e96dd9792942301bd31dd0262eda5e2;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 35a1c49..8853a85 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"
 
 //-----------------------------------------------------
 
@@ -74,28 +77,31 @@ class ColorLayerImageViewPanel
 			void SetOriginalSpacing(double spc[3]);
 			void SetImage(vtkImageData *img);
 			void SetFittingMode(int fitting_mode);
-			int GetFittingMode();
+			int  GetFittingMode();
 			void SetActive(bool active);
 
 		private:
-			bool				_active;
-			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);
@@ -103,10 +109,7 @@ class ColorLayerImageViewPanel
 			void onChangeOpacity(wxScrollEvent& event);
 			void onSliceFixDinamic(wxCommandEvent& event);
 			void onSliceImage(wxScrollEvent& event);
-
 			void RefreshView();
-	
-
 };
 
 #endif