X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuHistogramView.cxx;h=f9c399481a5045b8635e65d305bd48db13e8c95d;hb=4b2a99534d79424c7892e09160a1488604741064;hp=f41c189f4618ff12f364b988e1d0ef8c8ef270e1;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git diff --git a/bbtk/src/bbmaracasvisuHistogramView.cxx b/bbtk/src/bbmaracasvisuHistogramView.cxx index f41c189..f9c3994 100644 --- a/bbtk/src/bbmaracasvisuHistogramView.cxx +++ b/bbtk/src/bbmaracasvisuHistogramView.cxx @@ -36,10 +36,11 @@ BBTK_BLACK_BOX_IMPLEMENTATION(HistogramView,bbtk::WxBlackBox); //------------------------------------------------ void HistogramView::Process() { - if (firsttime==true){ + 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() ); } } @@ -53,10 +54,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 ); } @@ -80,4 +86,3 @@ void HistogramView::CreateWidget(wxWindow* parent) } // EO namespace bbcreaMaracasVisu -