X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FbuttonContainerPanel.cxx;h=0f182f50565d9dff4b6a8f0a9766f212c75bbb27;hb=8f1f70ffb361d0ccde7da40ff128cebdcfcf3f13;hp=bdd564998b6cc042961643972084819c7d13d842;hpb=db86dba6381cc26c3fa1070608b2ac56abeb823c;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx index bdd5649..0f182f5 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx @@ -46,10 +46,10 @@ namespace creaButtonContainer : wxScrolledWindow(parent,-1, wxDefaultPosition,wxDefaultSize, wxTAB_TRAVERSAL | wxVSCROLL | wxHSCROLL | wxFULL_REPAINT_ON_RESIZE, _T("creaButtonContainer") ) { - std::cout<< std::endl << " MLER buttonContainerPanel.cxx / ButtonContainerPanel() " << std::endl; + std::cout<< "MLER | ButtonContainerPanel::ButtonContainerPanel( )" << std::endl; ButtonGroupFactory factory; - ListGroupFactory listFactory; + //ListGroupFactory listFactory; //MLER this->SetButtonGroupContainer( factory.CreateButtonGroupContainer( this, settings ) ); @@ -59,10 +59,10 @@ namespace creaButtonContainer case 0: this->SetButtonGroupContainer( factory.CreateButtonGroupContainer( this, settings ) ); break; - case 1: - this->SetListGroupContainer(listFactory.CreateButtonGroupContainer( this, settings ) ); + //case 1: + //this->SetListGroupContainer(listFactory.CreateButtonGroupContainer( this, settings ) ); // MLER Verificar ButtonGroupList contra ListGroupList - break; + //break; default: this->SetButtonGroupContainer(factory.CreateButtonGroupContainer( this, settings ) ); } @@ -81,17 +81,19 @@ namespace creaButtonContainer // ---------------------------------------------------------------------------------- void ButtonContainerPanel::SetButtonGroupContainer(ButtonGroupList groupContainer ) { + std::cout<< "MLER | ButtonContainerPanel::SetButtonGroupContainer()" << std::endl; this->m_ButtonGroupList = groupContainer; } // ---------------------------------------------------------------------------------- - void ButtonContainerPanel::SetListGroupContainer(ListGroupList groupContainer ) + /*void ButtonContainerPanel::SetListGroupContainer(ListGroupList groupContainer ) { this->m_ListGroupList = groupContainer; - } + }*/ // ---------------------------------------------------------------------------------- void ButtonContainerPanel::PanelInit( int type ) { + std::cout<< "MLER | ButtonContainerPanel::PanelInit( int type )" << std::endl; try { @@ -108,7 +110,7 @@ namespace creaButtonContainer this->m_Sizer->Add( manager, 1, wxALL | wxALIGN_LEFT | wxALIGN_TOP, 5 ); } } - else + /*else { for(ListGroupList::iterator it1 = this->m_ListGroupList.begin(); it1 != this->m_ListGroupList.end(); ++it1) { @@ -116,7 +118,7 @@ namespace creaButtonContainer this->m_GroupManagerList[ manager->GetButtonID( ) ] = manager; this->m_Sizer->Add( manager, 1, wxALL | wxALIGN_LEFT | wxALIGN_TOP, 5 ); } - }//MLER + }//MLER*/ this->SetSizer( this->m_Sizer ); this->Layout( ); @@ -132,6 +134,7 @@ namespace creaButtonContainer // ---------------------------------------------------------------------------------- void ButtonContainerPanel::FitSizer( ) { + std::cout<< "MLER | ButtonContainerPanel::FitSizer( )" << std::endl; this->m_Sizer->Fit( this ); this->m_Sizer->FitInside( this ); this->SetScrollRate( 20, 20 );