From 19866c24e0c00120d0a40da4d03d6eebc3e031b6 Mon Sep 17 00:00:00 2001 From: davila Date: Tue, 6 Jan 2015 16:23:18 +0100 Subject: [PATCH] #2497 creaMaracasVisu Feature New Normal - In container button add the list option --- .../bbcreaMaracasVisuPanelButtonContainer.cxx | 7 +++---- .../model/containerSettings.cxx | 9 ++++++++- .../model/containerSettings.h | 15 ++++++++++---- .../model/listGroupFactory.cxx | 14 ++++++++++--- .../model/listGroupFactory.h | 3 ++- .../creaButtonContainer/model/system.h | 10 +++++----- .../view/buttonContainerPanel.h | 20 +++++++++---------- .../creaButtonContainer/view/listGroup.cxx | 5 +++++ .../creaButtonContainer/view/listWx.cxx | 8 ++++++++ .../buttonContainerSettings.cxx | 5 ++++- .../buttonContainerSettings.h | 13 +++++++----- .../structBCPSettings.h | 2 +- 12 files changed, 76 insertions(+), 35 deletions(-) diff --git a/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx b/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx index 76119b7..3f30cba 100644 --- a/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx +++ b/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx @@ -45,11 +45,10 @@ PanelButtonContainer::Process( ) if(bbGetInputType()== "1") { - settings->AddItems(bbGetInputIn()); - +//EED-MLER settings->AddItems( bbGetInputIn() ); } else { - settings->AddButtons(bbGetInputIn( )); + settings->AddButtons( bbGetInputIn() ); } @@ -80,7 +79,7 @@ void PanelButtonContainer::CreateWidget( wxWindow* parent ) void PanelButtonContainer::bbUserSetDefaultValues( ) { - + bbSetInputType("0"); } //===== // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) 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..18f7699 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx @@ -72,6 +72,8 @@ namespace creaButtonContainer } // ---------------------------------------------------------------------------------- +//EED-MLER +/* ListGroupMap ContainerSettings::GetListGroupContainer( ) @@ -84,6 +86,7 @@ namespace creaButtonContainer { this->m_ListGroupContainer = lstContainer; } +*/ // ---------------------------------------------------------------------------------- @@ -173,6 +176,8 @@ namespace creaButtonContainer }//hctac } +//EED-MLER +/* void ContainerSettings::AddItems(BCStructVectorType infoList) { @@ -191,6 +196,8 @@ namespace creaButtonContainer << "exception: " << e.what( ) << std::endl; }//hctac } + + //----------------------------------------------------------------------------------- void ContainerSettings::AddItem(const StringType & groupName) @@ -266,7 +273,7 @@ namespace creaButtonContainer } - +*/ // ---------------------------------------------------------------------------------- }//ecapseman diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h index d00db70..54f9ce9 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h @@ -35,7 +35,7 @@ #include #include -#include +//EED-MLER #include #include "structBCSettings.h" #include "system.h" @@ -107,6 +107,8 @@ namespace creaButtonContainer */ void SetButtonGroupContainer( ButtonGroupMap bgContainer ); + + // ---------------------------------------------------------------------------------- /*! void ContainerSettings::SetGroupNameList( KeyMapList gNameList ) * @brief This method sets a container with the name of the groups. @@ -115,12 +117,15 @@ namespace creaButtonContainer void SetGroupNameList( KeyMapList gNameList ); +//EED-MLER +/* + ListGroupMap GetListGroupContainer( ); void SetListGroupContainer( ListGroupMap lstContainer ); - +*/ // ---------------------------------------------------------------------------------- /*! @@ -158,6 +163,8 @@ namespace creaButtonContainer void AddButtons( BCStructVectorType infoList ); +//EED-MLER +/* // ---------------------------------------------------------------------------------- void AddItem(const StringType & groupName); @@ -167,14 +174,14 @@ namespace creaButtonContainer void AddItems( BCStructVectorType infoList ); - +*/ // ---------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------- private: ButtonGroupMap m_ButtonGroupContainer; //! -#include +#include #include "listWx.h" + #include "system.h" #include "listGroup.h" #include "containerSettings.h" diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h index 9481b66..69c3d2d 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h @@ -39,8 +39,8 @@ #include #include #include "functor.h" -#include -#include +//EED-MLER #include +//EED-MLER #include /*! @namespace @@ -59,7 +59,7 @@ }*/ namespace creaButtonContainer { - using namespace view; +//EED-MLER using namespace view; // ---------------------------------------------------------------------------------- /*! @typedef std::string* StringType; * @brief Defines the StringType type. @@ -120,8 +120,8 @@ namespace creaButtonContainer //typedef std::map< StringType, ItemsList > ListGroupMap; // ex: grupo A,items lista A (la lista de ese grupo) - typedef std::list< ListWx > ListLst; - typedef std::map< StringType, ListLst > ListGroupMap; // ex: grupo A,lista A,lista B +//EED-MLER typedef std::list< ListWx > ListLst; +//EED-MLER typedef std::map< StringType, ListLst > ListGroupMap; // ex: grupo A,lista A,lista B // ---------------------------------------------------------------------------------- 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 988fbc2..4426590 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h @@ -46,8 +46,8 @@ #include "buttonGroupFactory.h" #include "containerSettings.h" #include "buttonContainerController.h" -#include "listGroup.h" -#include "listGroupFactory.h" +//EED-MLER #include "listGroup.h" +//EED-MLER #include "listGroupFactory.h" /*! @namespace * @brief Contains the creaButtonContainer library included in creaMaracasVisu. @@ -133,11 +133,11 @@ namespace creaButtonContainer typedef creaButtonContainer::controller::ButtonContainerController BCController; - typedef creaButtonContainer::view::ListGroup ListGroup; +//EED-MLER typedef creaButtonContainer::view::ListGroup ListGroup; - typedef std::list< ListGroup* > ListGroupList; +//EED-MLER typedef std::list< ListGroup* > ListGroupList; - typedef creaButtonContainer::model::ListGroupFactory ListGroupFactory; +//EED-MLER typedef creaButtonContainer::model::ListGroupFactory ListGroupFactory; // ---------------------------------------------------------------------------------- //end of typedef definition @@ -178,12 +178,12 @@ namespace creaButtonContainer public: friend class creaButtonContainer::controller::ButtonContainerController; private: - GroupManagerList m_GroupManagerList; //! #include -#include +//EED-MLER #include #include #include @@ -126,9 +126,9 @@ namespace creaPanelButtonContainer * @brief This class contains the settings of the button container. */ - typedef wxListItem Item; - typedef std::list < tList* > ItemsList; - typedef std::map< StringType, ListLst > ListGroupMap; +//EED-MLER typedef wxListItem Item; +//EED-MLER typedef std::list < tList* > ItemsList; +//EED-MLER typedef std::map< StringType, ListLst > ListGroupMap; public: @@ -236,18 +236,21 @@ namespace creaPanelButtonContainer void AddButtons( BCStructVectorType infoList ); +//EED-MLER +/* void AddItem (BCPSettingsStruct* info); void AddItems( BCStructVectorType infoList ); +*/ // ---------------------------------------------------------------------------------- private: ButtonGroupMap m_ButtonGroupContainer; //! #include #include -#include "tlist.h" +//EED-MLER #include "tlist.h" /*! @namespace * @brief Contains the creaPanelButtonContainer library included in creaMaracasVisu. -- 2.47.1