X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FbuttonContainerPanel.h;fp=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FbuttonContainerPanel.h;h=86dd513fd4bb5f44f634174ea13b8d0a73090322;hb=8eebd53dcbe07edf0569621003178ee37d69a39b;hp=f16da5ee6dd99544ed46874a6503c866f823c2c8;hpb=bbd33bbb0f352d14d7068d87fcd50e02341004a9;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h index f16da5e..86dd513 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h @@ -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 buttonContainerController.h @@ -46,8 +46,6 @@ #include "buttonGroupFactory.h" #include "containerSettings.h" #include "buttonContainerController.h" -//EED-MLER #include "listGroup.h" -//EED-MLER #include "listGroupFactory.h" /*! @namespace * @brief Contains the creaButtonContainer library included in creaMaracasVisu. @@ -80,7 +78,7 @@ namespace creaButtonContainer * @bug The scrolled it doesn't work! (to be changed soon) * @see wxScrolledWindow */ - class ButtonContainerPanel : public wxScrolledWindow + class ButtonContainerPanel: public wxScrolledWindow { public: //typedef definition @@ -98,12 +96,12 @@ namespace creaButtonContainer /*! @typedef std::list< ButtonGroup* > ButtonGroupList; * @brief Defines the ButtonGroupList type. */ - typedef std::list< ButtonGroup* > ButtonGroupList; + typedef std::list ButtonGroupList; // ---------------------------------------------------------------------------------- /*! @typedef std::map< long, GroupManager* > GroupManagerList; * @brief Defines the GroupManagerList type. */ - typedef std::map< long, GroupManager* > GroupManagerList; + typedef std::map GroupManagerList; // ---------------------------------------------------------------------------------- /*! @typedef wxFlexGridSizer Sizer; * @brief Defines the Sizer type. @@ -113,35 +111,22 @@ namespace creaButtonContainer /*! @typedef std::list< long > KeyList; * @brief Defines the KeyList type. */ - typedef std::list< long > KeyList; + typedef std::list KeyList; // ---------------------------------------------------------------------------------- /*! @typedef creaButtonContainer::model::ContainerSettings ButtonGroupSettings; * @brief Defines the ButtonGroupSettings type. */ - typedef creaButtonContainer::model::ContainerSettings - ButtonGroupSettings; + typedef creaButtonContainer::model::ContainerSettings ButtonGroupSettings; // ---------------------------------------------------------------------------------- /*! @typedef creaButtonContainer::model::ButtonGroupFactory ButtonGroupFactory; * @brief Defines the ButtonGroupFactory type. */ - typedef creaButtonContainer::model::ButtonGroupFactory - ButtonGroupFactory; + typedef creaButtonContainer::model::ButtonGroupFactory ButtonGroupFactory; // ---------------------------------------------------------------------------------- /*! creaButtonContainer::controller::ButtonContainerController BCController; * @brief Defines the BCController type. */ - typedef creaButtonContainer::controller::ButtonContainerController - BCController; - - - //typedef creaButtonContainer::model::ListGroupFactory ListGroupFactory; - - //typedef creaButtonContainer::view::ListGroup ListGroup; - - //typedef std::list< ListGroup* > ListGroupList; - - //typedef creaButtonContainer::model::ListGroupFactory ListGroupFactory; - + typedef creaButtonContainer::controller::ButtonContainerController BCController; // ---------------------------------------------------------------------------------- //end of typedef definition @@ -151,27 +136,27 @@ namespace creaButtonContainer * @param parent wxWindow pointer to parent. * @param settings ButtonGroupSettings Pointer to button container settings. */ - ButtonContainerPanel( wxWindow* parent, ButtonGroupSettings* settings); + ButtonContainerPanel(wxWindow* parent, ButtonGroupSettings* settings); // ---------------------------------------------------------------------------------- /*! @fn ~ButtonContainerPanel( ); * @brief This is the destructor. */ virtual - ~ButtonContainerPanel( ); + ~ButtonContainerPanel(); // ---------------------------------------------------------------------------------- /*! @fn SetGroupContainer( ButtonGroupList groupContainer ); * @brief This method sets the settings to the container. * @param groupContainer */ void - SetButtonGroupContainer( ButtonGroupList groupContainer ); + SetButtonGroupContainer(ButtonGroupList groupContainer); // ---------------------------------------------------------------------------------- /*! @fn PanelInit( ); * This method initializes the panel. * @exception std::bad_alloc */ void - PanelInit( ); + PanelInit(); // ---------------------------------------------------------------------------------- //void @@ -181,22 +166,20 @@ namespace creaButtonContainer * This method fits and organizes the sizer. */ void - FitSizer( ); + FitSizer(); // ---------------------------------------------------------------------------------- public: friend class creaButtonContainer::controller::ButtonContainerController; private: - GroupManagerList m_GroupManagerList; //!