X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuHistogramView.cxx;h=a3101688aea46ff005d287fcd95816e711111bb7;hb=a7017a8ade695bd14a4c7ee70b197d63b5e76765;hp=bd1e1f5413cf467fc228649d7379514c4fb5fb2a;hpb=738e5bef4c52a1f25013e598a008a81f20fc6f63;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuHistogramView.cxx b/bbtk/src/bbmaracasvisuHistogramView.cxx
index bd1e1f5..a310168 100644
--- a/bbtk/src/bbmaracasvisuHistogramView.cxx
+++ b/bbtk/src/bbmaracasvisuHistogramView.cxx
@@ -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.
+# ------------------------------------------------------------------------ */
+
 #include "bbmaracasvisuHistogramView.h"
 #include "bbcreaMaracasVisuPackage.h"
 
@@ -11,11 +36,14 @@ BBTK_BLACK_BOX_IMPLEMENTATION(HistogramView,bbtk::WxBlackBox);
 //------------------------------------------------
 void HistogramView::Process()
 {
-	if (firsttime==true){
+printf("EED HistogramView::Process Start \n");
+	if (firsttime==true)
+	{
 		firsttime=false;
 	//	histogram_wxwidget = new Histogram( wxpanel , -1, wxPoint(0,0), wxSize(400,400),wxNO_BORDER );
-		histogram_wxwidget->Configure( bbGetInputIn() );
+		_histogramMinMaxLevel->Configure( bbGetInputIn() );
 	}
+printf("EED HistogramView::Process End \n");
 }
 
 //------------------------------------------------
@@ -28,10 +56,15 @@ void HistogramView::CreateWidget(wxWindow* parent)
 //	histogram_wxwidget = new Histogram( parent , -1, wxPoint(0,0), wxSize(400,400),wxNO_BORDER ,bbGetInputIn());
 	wxPanel *wxpanel =new wxPanel(parent);
 	wxpanel->SetSize(400,400);
-	histogram_wxwidget = new Histogram( parent , -1, wxPoint(0,0), wxSize(400,400),wxNO_BORDER );
+
+//Borrame
+//	histogram_wxwidget = new Histogram( parent , -1, wxPoint(0,0), wxSize(400,400),wxNO_BORDER );
 	
-    bbtkDebugDecTab("Core",9);
-	bbSetOutputWidget( histogram_wxwidget );
+	Histogram* histogram		= new Histogram(  parent , -1, wxPoint(0,0), wxSize(400,400), /*wxNO_BORDER*/ wxBORDER_DEFAULT ); 
+	_histogramMinMaxLevel 	= new HistogramMinMaxLevel( (HistogramBase*)histogram );
+
+   bbtkDebugDecTab("Core",9);
+	bbSetOutputWidget( _histogramMinMaxLevel->GetWindow() );
 //  	bbSetOutputWidget( wxpanel );
 }