X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FbuttonContainerPanel.h;h=7696062979c0a7256f4f28a212110c35be76580c;hb=b8c5a565c70ac0def1f21518afa2d847a9582d79;hp=c65c693691b5f10212f15abf13188b67eb37c62d;hpb=c1b7d6e874f1bfcac251e852ae37229c12c61656;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 c65c693..7696062 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h @@ -1,8 +1,33 @@ +/*# --------------------------------------------------------------------- +# +# 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 * @brief This contains the ButtonContainerController class * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr) - * @date 2011-05-19 + * @date 2011-06-02 */ #ifndef BUTTONCONTAINERPANEL_H @@ -11,14 +36,18 @@ #include #include #include + #include #include +#include #include "buttonGroup.h" #include "groupManager.h" #include "buttonGroupFactory.h" #include "containerSettings.h" #include "buttonContainerController.h" +#include "listGroup.h" +#include "listGroupFactory.h" /*! @namespace * @brief Contains the creaButtonContainer library included in creaMaracasVisu. @@ -33,8 +62,7 @@ namespace creaButtonContainer { /*! @class ButtonContainerController buttonContainerController.h "buttonContainerController.h" * @brief This class contains the ButtonContainerPanel controller. - * @details This class describes the button events, it derives from wxEvtHandler and it is the - * controller in the MVC. + * @details This class describes the button events, it derives from wxEvtHandler. * @see wxEvtHandler */ class ButtonContainerController; @@ -46,11 +74,11 @@ namespace creaButtonContainer */ namespace view { - /*! @class ButtonContainerController buttonContainerController.h "buttonContainerController.h" - * @brief This class contains the ButtonContainerPanel controller. - * @details This class describes the button events, it derives from wxEvtHandler and it is the - * controller in the MVC. - * @see wxScrolledWindow + /*! @class ButtonContainerPanel buttonContainerPanel.h "buttonContainerPanel.h" + * @brief This class is the container of the creaButtonContainer. + * @details This class derives from wxScrolledWindow and manages the view of the buttonContainer. + * @bug The scrolled it doesn't work! (to be changed soon) + * @see wxScrolledWindow */ class ButtonContainerPanel : public wxScrolledWindow { @@ -104,6 +132,15 @@ namespace creaButtonContainer */ 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; + // ---------------------------------------------------------------------------------- //end of typedef definition public: @@ -112,7 +149,7 @@ 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, int type ); // ---------------------------------------------------------------------------------- /*! @fn ~ButtonContainerPanel( ); * @brief This is the destructor. @@ -121,20 +158,25 @@ namespace creaButtonContainer ~ButtonContainerPanel( ); // ---------------------------------------------------------------------------------- /*! @fn SetGroupContainer( ButtonGroupList groupContainer ); - * @brief This function sets the settings to the container. + * @brief This method sets the settings to the container. * @param groupContainer */ void - SetGroupContainer( ButtonGroupList groupContainer ); + SetButtonGroupContainer( ButtonGroupList groupContainer ); // ---------------------------------------------------------------------------------- /*! @fn PanelInit( ); - * This function initializes the panel. + * This method initializes the panel. + * @exception std::bad_alloc */ void - PanelInit( ); + PanelInit( int type); + // ---------------------------------------------------------------------------------- + + //void + //SetListGroupContainer(ListGroupList groupContainer ); // ---------------------------------------------------------------------------------- /*! @fn FitSizer( ); - * This function fits and organizes the sizer. + * This method fits and organizes the sizer. */ void FitSizer( ); @@ -146,6 +188,9 @@ namespace creaButtonContainer ButtonGroupList m_ButtonGroupList; //!