X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FColorLayerImageViewPanel.h;h=8853a85f215fb94683e623d93e9c72c267a19bad;hb=4ecb6789d069c8dcd40724f03d8225c25629cd52;hp=19121996b296c64a17d1377f41b2a2d6756aa30e;hpb=965c602117e9de99019d49bd78ca1d707a1a6bd2;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 1912199..8853a85 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.h
@@ -1,4 +1,27 @@
-
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
 
 /**
  *  \file
@@ -16,8 +39,14 @@
 
 #include <wx/wx.h>
 #include <wx/button.h>
-#include "ColorLayerImageView.h"
+#include "ColorLayerImageViewManager.h"
+#include "Histogram.h"
+#include "HistogramBase.h"
+
+// Borrame
+// #include "mBarRange2.h"
 
+//-----------------------------------------------------
 
 //EED 21-08-2010
 class wxDlgTransformByDimensionBySpacingByPixel
@@ -28,36 +57,51 @@ class wxDlgTransformByDimensionBySpacingByPixel
 		void GetTransformType(wxWindow *parent , wxString message,int &typeOfTransformation,bool &dlgWxOK) ;
 	};
 
+
+
 //-----------------------------------------------------
 
-	class ColorLayerImageViewPanel
+class ColorLayerImageViewPanel
 		: public wxPanel
 		{
 		public:
 			ColorLayerImageViewPanel(wxWindow * parent, int min, int max, int type);
 			~ColorLayerImageViewPanel();
 			void onThresholdStop();
-			ColorLayerImageView* GetColorLayerImageView();
-			void SetColorLayerImageView(ColorLayerImageView* colorLayerImageView);
+			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 SetImage(vtkImageData *img);
+			void SetFittingMode(int fitting_mode);
+			int  GetFittingMode();
+			void SetActive(bool active);
 
 		private:
-			int					_dimBase[3];
-			double				_spcBase[3];
-			double				_spcOrg[3];
-
-			bool				_thresholdGo;
-			ColorLayerImageView	*_colorLayerImageView;
-			wxButton			*_btn_ReadImage;
-			wxSlider			*_opacity;
-			wxCheckBox			*_interpolationCheckBox;
-			wxCheckBox			*_cb_ShowHide;
-			wxCheckBox			*_cb_SliceFixDinamic;
-			wxSlider			*_sl_SliceImage;
+			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);
@@ -65,7 +109,8 @@ class wxDlgTransformByDimensionBySpacingByPixel
 			void onChangeOpacity(wxScrollEvent& event);
 			void onSliceFixDinamic(wxCommandEvent& event);
 			void onSliceImage(wxScrollEvent& event);
-		};
+			void RefreshView();
+};
 
 #endif