X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FHistogram.h;h=01071f720b72bd8c0a86993a45a212dfb05e488c;hb=4dcdcabb81ce9f9e9b7ccdb86a64995d7b18ea23;hp=5138dc65133f146a069f72f2ef70c86162b51b83;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h
index 5138dc6..01071f7 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.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 __HISTOGRAMW1__
@@ -16,18 +41,20 @@
 #include <wx/wx.h>
 #endif
 
+#include "HistogramBase.h"
+#include "marTypes.h"
 #include "pPlotterWindow.h"
 #include "pFunctionPoint.h"
-#include  "vtkImageData.h"
+#include "vtkImageData.h"
 #include "pHistogram.h"
 #include "pPlotterScaleY.h"
 #include "pPlotterScaleX.h"
 
-#define MAX 500
+//#define MAX 500
 #define NUM_POINTS 100
 #define WINDOW_SIZE 10
 
-class Histogram:public wxPanel
+class creaMaracasVisu_EXPORT Histogram:public wxPanel, HistogramBase
 {
 public:
 	//---------------------
@@ -37,7 +64,9 @@ public:
 	//HistogramWidget( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag );
 	
  
-	Histogram( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag,vtkImageData* imageData);
+//EED Borrame 07Mai2009
+//	Histogram( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag,vtkImageData* imageData);
+	Histogram( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag);
 	
 	~Histogram();
 
@@ -59,14 +88,16 @@ public:
 	*/
 	int getHistogramPoint(int gValue);
 	int getHistogramSize();
-	
-	
+	pPlotterWindow* GetPlotterWindow(); 
+	virtual void Configure(vtkImageData* imageData);
+	virtual wxWindow* GetWindow();
+
 private:
 	
 	 pHistogram*		histogram;
 	 pPlotterWindow*	plotter;
-	 int				histogramSize;
-	 int				 idHistogram;
+	 int					histogramSize;
+	 int					idHistogram;
 	 
 	 
 	 DECLARE_CLASS(Histogram);