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

diff --git a/bbtk/src/bbmaracasvisuHistogramView.cxx b/bbtk/src/bbmaracasvisuHistogramView.cxx
index 70c7868..a310168 100644
--- a/bbtk/src/bbmaracasvisuHistogramView.cxx
+++ b/bbtk/src/bbmaracasvisuHistogramView.cxx
@@ -1,7 +1,31 @@
+/*# ---------------------------------------------------------------------
+#
+# 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"
 
-#include "Histogram.h"
 
 namespace bbcreaMaracasVisu
 {
@@ -12,32 +36,54 @@ BBTK_BLACK_BOX_IMPLEMENTATION(HistogramView,bbtk::WxBlackBox);
 //------------------------------------------------
 void HistogramView::Process()
 {
+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 );
+		_histogramMinMaxLevel->Configure( bbGetInputIn() );
+	}
+printf("EED HistogramView::Process End \n");
 }
 
 //------------------------------------------------
 void HistogramView::CreateWidget(wxWindow* parent)
 {
+	firsttime=true;
 	bbtkDebugMessageInc("Core",9,"HistogramViewWindow::CreateWidget()"<<std::endl);
-	Histogram *wxwidget = new Histogram( parent , -1, wxPoint(0,0), wxSize(400,400),wxNO_BORDER ,bbGetInputIn());
-    bbtkDebugDecTab("Core",9);
-	bbSetOutputWidget( wxwidget );
-}
+	
+//EED 07Mai2009	
+//	histogram_wxwidget = new Histogram( parent , -1, wxPoint(0,0), wxSize(400,400),wxNO_BORDER ,bbGetInputIn());
+	wxPanel *wxpanel =new wxPanel(parent);
+	wxpanel->SetSize(400,400);
 
-//------------------------------------------------
-void HistogramView::bbUserConstructor()
-{
-	wxwidget = NULL;
-}
+//Borrame
+//	histogram_wxwidget = new Histogram( parent , -1, wxPoint(0,0), wxSize(400,400),wxNO_BORDER );
+	
+	Histogram* histogram		= new Histogram(  parent , -1, wxPoint(0,0), wxSize(400,400), /*wxNO_BORDER*/ wxBORDER_DEFAULT ); 
+	_histogramMinMaxLevel 	= new HistogramMinMaxLevel( (HistogramBase*)histogram );
 
-//------------------------------------------------
-void HistogramView::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
+   bbtkDebugDecTab("Core",9);
+	bbSetOutputWidget( _histogramMinMaxLevel->GetWindow() );
+//  	bbSetOutputWidget( wxpanel );
 }
 
-//------------------------------------------------
-void HistogramView::bbUserDestructor()
-{
-}
+	//-----------------------------------------------------------------	
+	void HistogramView::bbUserSetDefaultValues()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void HistogramView::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void HistogramView::bbUserFinalizeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
 
 }
 // EO namespace bbcreaMaracasVisu