X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FbuttonContainerPanel.cxx;fp=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FbuttonContainerPanel.cxx;h=b23ff0163e3016f2d0dd176ff667efe7f83a6fe9;hb=8eebd53dcbe07edf0569621003178ee37d69a39b;hp=0f182f50565d9dff4b6a8f0a9766f212c75bbb27;hpb=497867af0d89e85bac1566016ee3fe1014207489;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 0f182f5..b23ff01 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx @@ -1,27 +1,27 @@ /*# --------------------------------------------------------------------- -# -# 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. -# ------------------------------------------------------------------------ */ + # + # 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. + # ------------------------------------------------------------------------ */ /*! * @file buttonGroup.cxx @@ -42,104 +42,69 @@ namespace creaButtonContainer END_EVENT_TABLE() // ---------------------------------------------------------------------------------- - ButtonContainerPanel::ButtonContainerPanel( wxWindow* parent, ButtonGroupSettings* settings, int type ) + ButtonContainerPanel::ButtonContainerPanel( wxWindow* parent, ButtonGroupSettings* settings ) : wxScrolledWindow(parent,-1, wxDefaultPosition,wxDefaultSize, wxTAB_TRAVERSAL | wxVSCROLL | wxHSCROLL | wxFULL_REPAINT_ON_RESIZE, _T("creaButtonContainer") ) { - std::cout<< "MLER | ButtonContainerPanel::ButtonContainerPanel( )" << std::endl; - ButtonGroupFactory factory; - //ListGroupFactory listFactory; - - //MLER this->SetButtonGroupContainer( factory.CreateButtonGroupContainer( this, settings ) ); - std::cout<< std::endl << " MLER buttonContainerPanel.cxx / ButtonContainerPanel() :: type " << type<SetButtonGroupContainer( factory.CreateButtonGroupContainer( this, settings ) ); - break; - //case 1: - //this->SetListGroupContainer(listFactory.CreateButtonGroupContainer( this, settings ) ); - // MLER Verificar ButtonGroupList contra ListGroupList - //break; - default: - this->SetButtonGroupContainer(factory.CreateButtonGroupContainer( this, settings ) ); - } + this->SetButtonGroupContainer( factory.CreateButtonGroupContainer( this, settings ) ); - this->PanelInit(type ); + this->PanelInit( ); this->m_ButtonCController = new BCController( this ); this->m_ButtonCController->AddEvents( ); this->SetEventHandler( this->m_ButtonCController ); } - + // ---------------------------------------------------------------------------------- - ButtonContainerPanel::~ButtonContainerPanel( ) + ButtonContainerPanel::~ButtonContainerPanel() { } - + // ---------------------------------------------------------------------------------- - void ButtonContainerPanel::SetButtonGroupContainer(ButtonGroupList groupContainer ) + void ButtonContainerPanel::SetButtonGroupContainer( + ButtonGroupList groupContainer) { - std::cout<< "MLER | ButtonContainerPanel::SetButtonGroupContainer()" << std::endl; + this->m_ButtonGroupList = groupContainer; } + // ---------------------------------------------------------------------------------- - /*void ButtonContainerPanel::SetListGroupContainer(ListGroupList groupContainer ) - { - this->m_ListGroupList = groupContainer; - }*/ - - // ---------------------------------------------------------------------------------- - void ButtonContainerPanel::PanelInit( int type ) + void ButtonContainerPanel::PanelInit() { - std::cout<< "MLER | ButtonContainerPanel::PanelInit( int type )" << std::endl; try { - + // EED 20/01/2012 flag 01 - this->m_Sizer = new Sizer( 0, 1, 0, 0 ); - std::cout << " MLER buttonContainerPanel.cxx / Panel Init() :: type " << type << std::endl; + this->m_Sizer = new Sizer(0, 1, 0, 0); - if(type == 0) + for (ButtonGroupList::iterator it = this->m_ButtonGroupList.begin(); + it != this->m_ButtonGroupList.end(); ++it) { - for( ButtonGroupList::iterator it = this->m_ButtonGroupList.begin( ); it != this->m_ButtonGroupList.end( ); ++it ) - { - GroupManager* manager = new GroupManager( this, *it ); - this->m_GroupManagerList[ manager->GetButtonID( ) ] = manager; - this->m_Sizer->Add( manager, 1, wxALL | wxALIGN_LEFT | wxALIGN_TOP, 5 ); - } + GroupManager* manager = new GroupManager(this, *it); + this->m_GroupManagerList[manager->GetButtonID()] = manager; + this->m_Sizer->Add(manager, 1, wxALL | wxALIGN_LEFT | wxALIGN_TOP, 5); } - /*else - { - for(ListGroupList::iterator it1 = this->m_ListGroupList.begin(); it1 != this->m_ListGroupList.end(); ++it1) - { - GroupManager* manager = new GroupManager( this, *it1); - this->m_GroupManagerList[ manager->GetButtonID( ) ] = manager; - this->m_Sizer->Add( manager, 1, wxALL | wxALIGN_LEFT | wxALIGN_TOP, 5 ); - } - }//MLER*/ - this->SetSizer( this->m_Sizer ); - this->Layout( ); - this->FitSizer( ); - }//yrt - catch ( const std::exception& e ) + this->SetSizer(this->m_Sizer); + this->Layout(); + this->FitSizer(); + } //yrt + catch (const std::exception& e) { std::cerr << "ButtonContainerPanel::PanelInit( ) " << "exception: " - << e.what( ) << std::endl; - }//hctac + << e.what() << std::endl; + } //hctac } - + // ---------------------------------------------------------------------------------- - void ButtonContainerPanel::FitSizer( ) + void ButtonContainerPanel::FitSizer() { - std::cout<< "MLER | ButtonContainerPanel::FitSizer( )" << std::endl; - this->m_Sizer->Fit( this ); - this->m_Sizer->FitInside( this ); - this->SetScrollRate( 20, 20 ); - this->m_Sizer->SetSizeHints( this ); + this->m_Sizer->Fit(this); + this->m_Sizer->FitInside(this); + this->SetScrollRate(20, 20); + this->m_Sizer->SetSizeHints(this); } // ---------------------------------------------------------------------------------- }//ecapseman -}//ecapseman +} //ecapseman