X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FHistogramWidget.h;h=4850d1322dcc64f1b66a7a396159ffb125c67d60;hb=f9901e756bb82bd333310b47607875331616bb29;hp=f559cc47c7a1d8ba6e9ff5c05e4178e714976a83;hpb=d8891e268dbd788932ede97097f41d8653f5e3f2;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h
index f559cc4..4850d13 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 
 
 #ifndef __HISTOGRAMW__
@@ -39,6 +64,8 @@ public:
 	
  
 	HistogramWidget( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag,vtkImageData* imageData,int type);
+
+	HistogramWidget( wxWindow *parent, wxWindowID id);
 	
 	~HistogramWidget();
 
@@ -134,15 +161,33 @@ public:
 	int getHistogramSize();
 	void setType(int type);
 
+	/**
+	**	Initialize the histogram 
+	*/
+	void initializeHistogram(vtkImageData* img);
+	/**
+	**	Returns two vectors, the grey level of the point and its value, the value is between [0,1]
+	**/
+	void GetValuesPointsFunction(std::vector<double>& greylevel,std::vector<double>& value);
+
+	/**
+	**	Returns two vectors, the grey level of the point and its value, the red, green
+	**	and blue value is between [0,1]
+	**/
+	void GetValuesColorPointsFunction(std::vector<double>& greylevel,
+									std::vector<double>& red,
+									std::vector<double>& green,
+									std::vector<double>& blue);
 
 
+	
 private:
 	
-	 pHistogram* histogram;
-	 pPlotter* plotter;
-	 int idTransferenceFunction;
-	 int histogramSize;
-	 int idHistogram;
+	 pHistogram* 	histogram;
+	 pPlotter* 		plotter;
+	 int 			idTransferenceFunction;
+	 int 			histogramSize;
+	 int 			idHistogram;
 	 /*
 	  if the image has already a transference
 	  function and color defines to that function
@@ -150,13 +195,15 @@ private:
 	 */
 	 bool transferenceFunctionHasPoints;
 	 bool transferenceFunctionHasColor;
+	 wxPanel* getControls();
 	 /*
 	 * type=1 with transference function for moving
 	 * type=2 without transference function for moving
 	 */
-	 int type;
+	 int type;	
 	 
 	 DECLARE_CLASS(HistogramWidget);
+
 	 //----------------------------------------------------------------------------
 	// wxWidget macro use declaration for handdling events
 	//----------------------------------------------------------------------------