X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fmodel%2FcontainerSettings.cxx;h=0b6b21c63934c912804b5dc6cdd445eb62d9fe14;hb=05c4abbebf824bbbbaaab135acf6c888662dff69;hp=6779dd399e7f0545cb93954256e472a8b68dd715;hpb=b2ac7f59e78e33f8e11065cffa2f2072aa9a9ee5;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx index 6779dd3..0b6b21c 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.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 containerSettings.cxx @@ -37,237 +37,118 @@ namespace creaButtonContainer namespace model { // ---------------------------------------------------------------------------------- - ContainerSettings::ContainerSettings( ) + ContainerSettings::ContainerSettings() { + } // ---------------------------------------------------------------------------------- - ContainerSettings::~ContainerSettings( ) + ContainerSettings::~ContainerSettings() { } - + // ---------------------------------------------------------------------------------- - ButtonGroupMap - ContainerSettings::GetButtonGroupContainer( ) + ButtonGroupMap ContainerSettings::GetButtonGroupContainer() { - return ( this->m_ButtonGroupContainer ); + return (this->m_ButtonGroupContainer); } // ---------------------------------------------------------------------------------- - KeyMapList - ContainerSettings::GetGroupNameList( ) + KeyMapList ContainerSettings::GetGroupNameList() { - return ( this->m_GroupNameList ); + return (this->m_GroupNameList); } - + // ---------------------------------------------------------------------------------- - void - ContainerSettings::SetButtonGroupContainer(ButtonGroupMap bgContainer) + void ContainerSettings::SetButtonGroupContainer(ButtonGroupMap bgContainer) { this->m_ButtonGroupContainer = bgContainer; } // ---------------------------------------------------------------------------------- - void - ContainerSettings::SetGroupNameList( KeyMapList gNameList ) + void ContainerSettings::SetGroupNameList(KeyMapList gNameList) { this->m_GroupNameList = gNameList; } - - // ---------------------------------------------------------------------------------- - - ListGroupMap - ContainerSettings::GetListGroupContainer( ) - { - return ( this->m_ListGroupContainer ); - } - - void - ContainerSettings::SetListGroupContainer( ListGroupMap lstContainer ) - { - this->m_ListGroupContainer = lstContainer; - } // ---------------------------------------------------------------------------------- - // ---------------------------------------------------------------------------------- - void - ContainerSettings::AddButton( const StringType & groupName, - const StringType &buttonName, const wxBitmap &icon, - const StringType &buttonDescription, FunctionEventType event ) + void ContainerSettings::AddButton(const StringType & groupName, + const StringType &buttonName, const wxBitmap &icon, + const StringType &buttonDescription, FunctionEventType event) { - std::cout<< std::endl<<"MLER CLASS : ContainerSettings" << std::endl; - std::cout<< std::endl<<"MLER ContainerSettings // AddButton "<m_GroupNameList.begin( ); it - != this->m_GroupNameList.end( ); ++it ) + for (KeyMapList::iterator it = this->m_GroupNameList.begin(); + it != this->m_GroupNameList.end(); ++it) { - if ( ( *it ).compare( groupName ) == 0 ) + if ((*it).compare(groupName) == 0) { - std::cout<<"MLER ContainerSettings // AddButton : it "<<*it <m_ButtonGroupContainer[ groupName ].push_back( pair ); + this->m_ButtonGroupContainer[groupName].push_back(pair); return; - }//fi - }//rof - this->m_GroupNameList.push_back( groupName ); - this->m_ButtonGroupContainer[ groupName ].push_back( pair ); - }//yrt - catch ( const std::exception& e ) + } //fi + } //rof + this->m_GroupNameList.push_back(groupName); + this->m_ButtonGroupContainer[groupName].push_back(pair); + } //yrt + catch (const std::exception& e) { std::cerr - << "ContainerSettings::AddButton( const std::string & groupName," - << "const std::string buttonName, const std::string iconpath," - << "const std::string buttonDescription, FunctionEventType event ) exception: " - << e.what( ) << std::endl; - }//hctac + << "ContainerSettings::AddButton( const std::string & groupName," + << "const std::string buttonName, const std::string iconpath," + << "const std::string buttonDescription, FunctionEventType event ) exception: " + << e.what() << std::endl; + } //hctac } // ---------------------------------------------------------------------------------- - void - ContainerSettings::AddButton( BCSettingsStruct* info ) + void ContainerSettings::AddButton(BCSettingsStruct* info) { + ButtonPair* pair = new ButtonPair( - new ButtonInfo( info->buttonName, info->icon ), - new ButtonAction( info->buttonDescription, info->eventFunction ) ); + new ButtonInfo(info->buttonName, info->icon), + new ButtonAction(info->buttonDescription, info->eventFunction)); try { - for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it - != this->m_GroupNameList.end( ); ++it ) + for (KeyMapList::iterator it = this->m_GroupNameList.begin(); + it != this->m_GroupNameList.end(); ++it) { - if ( ( *it ).compare( info->groupName ) == 0 ) + if ((*it).compare(info->groupName) == 0) { - this->m_ButtonGroupContainer[ info->groupName ].push_back( pair ); + this->m_ButtonGroupContainer[info->groupName].push_back(pair); return; - }//fi - }//rof - this->m_GroupNameList.push_back( info->groupName ); - this->m_ButtonGroupContainer[ info->groupName ].push_back( pair ); - }//yrt - catch ( const std::exception& e ) + } //fi + } //rof + this->m_GroupNameList.push_back(info->groupName); + this->m_ButtonGroupContainer[info->groupName].push_back(pair); + } //yrt + catch (const std::exception& e) { std::cerr - << "void ContainerSettings::AddButton( BCSettingsStruct* info ) " - << "exception: " << e.what( ) << std::endl; - }//hctac + << "void ContainerSettings::AddButton( BCSettingsStruct* info ) " + << "exception: " << e.what() << std::endl; + } //hctac } // ---------------------------------------------------------------------------------- - void - ContainerSettings::AddButtons( BCStructVectorType infoList ) + void ContainerSettings::AddButtons(BCStructVectorType infoList) { - try - { - for( BCStructVectorType::iterator it = infoList.begin( ); it - != infoList.end( ); ++it ) - { - this->AddButton( *it ); - }//rof - }//yrt - catch ( const std::exception& e ) - { - std::cerr - << "ContainerSettings::AddButtons( BCStructVectorType infoList ) " - << "exception: " << e.what( ) << std::endl; - }//hctac - } - void - ContainerSettings::AddItems(BCStructVectorType infoList) - { try { - for( BCStructVectorType::iterator it = infoList.begin( ); it - != infoList.end( ); ++it ) + for (BCStructVectorType::iterator it = infoList.begin(); + it != infoList.end(); ++it) { - this->AddItem(*it); - }//rof - }//yrt - catch ( const std::exception& e ) + this->AddButton(*it); + } //rof + } //yrt + catch (const std::exception& e) { std::cerr - << "ContainerSettings::AddButtons( BCStructVectorType infoList ) " - << "exception: " << e.what( ) << std::endl; - }//hctac + << "ContainerSettings::AddButtons( BCStructVectorType infoList ) " + << "exception: " << e.what() << std::endl; + } //hctac } - //----------------------------------------------------------------------------------- - void - ContainerSettings::AddItem(const StringType & groupName) - { - - //Es importante hacer un test, recibiendo como parametro la info de un item. - - - wxListItem* item; - item->SetId(1); - item->SetText(wxT("monica")); - - creaButtonContainer::view::ListWx l; - l.setItems(item); - - - try - { - for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); - it!= this->m_GroupNameList.end( ); ++it ) - { - if(( *it ).compare( groupName ) == 0 ) - { - this->m_ListGroupContainer[ groupName ].push_back(l); - return; - } - } - this->m_GroupNameList.push_back( groupName ); - this->m_ListGroupContainer[ groupName ].push_back( l ); - } - catch ( const std::exception& e ) - { - std::cerr - << "ContainerSettings::AddButton( const std::string & groupName," - << "const std::string buttonName, const std::string iconpath," - << "const std::string buttonDescription, FunctionEventType event ) exception: " - << e.what( ) << std::endl; - }//hctac - } - - - void - ContainerSettings::AddItem( BCSettingsStruct* info ) - { - wxListItem* item; - - wxString myString((info->buttonName).c_str(),wxConvUTF8); - item->SetText(myString); - - creaButtonContainer::view::ListWx l; - l.setItems(item); - - try - { - for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it - != this->m_GroupNameList.end( ); ++it ) - { - if ( ( *it ).compare( info->groupName ) == 0 ) - { - this->m_ListGroupContainer[ info->groupName ].push_back( l ); - return; - }//fi - }//rof - this->m_GroupNameList.push_back( info->groupName ); - this->m_ListGroupContainer[ info->groupName ].push_back( l ); - } - catch (const std::exception& e) - { - std::cerr - << "void ContainerSettings::AddItem( BCSettingsStruct* info ) " - << "exception: " << e.what( ) << std::endl; - } - - } - - // ---------------------------------------------------------------------------------- }//ecapseman -}//ecapseman +} //ecapseman