]> Creatis software - creaMaracasVisu.git/commitdiff
creaButtonContainer & creaPanelButtonContainer: Updates in doxygen documentation...
authorDiego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Thu, 2 Jun 2011 01:03:18 +0000 (01:03 +0000)
committerDiego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Thu, 2 Jun 2011 01:03:18 +0000 (01:03 +0000)
25 files changed:
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/controller/buttonContainerController.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/controller/buttonContainerController.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/functor.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/functor.txx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/structBCSettings.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonGroup.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonGroup.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonManager.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonManager.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/groupManager.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/groupManager.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/structBCPSettings.h

index 3af5eaf82efddcf7fb54ee6d78ebc7bf307f42dc..7cba265abeefa6362d8f6106939e37e2391bff26 100644 (file)
@@ -2,7 +2,7 @@
  * @file buttonContainerController.cxx
  * @brief This contains the ButtonContainerController class implementation
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #include "buttonContainerController.h"
@@ -98,7 +98,9 @@ namespace creaButtonContainer
                                    != this->m_BCPanel->m_ButtonGroupList.end( ); ++it )
                                {
                                        if ( ( *it )->GetButton( event.GetId( ) ) != NULL )
+                                       {
                                                ( *it )->GetButton( event.GetId( ) )->Execute( );
+                                       }//fi
                                }//rof
                        }//yrt
                        catch ( const std::exception& e )
index 2ccadcc86d9977515446ae241f71a0c18ccca88e..b240cb827c0cdacc1954aa11491f81d193f6cf96 100644 (file)
@@ -1,8 +1,8 @@
 /*!
  * @file buttonContainerController.h
- * @brief This contains the ButtonContainerController class
+ * @brief Contains the ButtonContainerController class
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #ifndef BUTTONCONTAINERCONTROLLER_H_
@@ -40,14 +40,14 @@ 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 <a href="http://docs.wxwidgets.org/stable/wx_wxevthandler.html">wxEvtHandler</a>
                 */
                class ButtonContainerController : public wxEvtHandler
                {
                        public:
                                //typedef definitions
+                               // ----------------------------------------------------------------------------------
                                /*!     @typedef creaButtonContainer::view::ButtonGroup ButtonGroup
                                 *      @brief Defines the ButtonGroup type
                                 */
@@ -88,6 +88,7 @@ namespace creaButtonContainer
                                 *      @brief Defines the BCPanel type
                                 */
                                typedef creaButtonContainer::view::ButtonContainerPanel BCPanel;
+                               // ----------------------------------------------------------------------------------
                                //end of typedef definition
                        public:
                                // ----------------------------------------------------------------------------------
@@ -105,7 +106,7 @@ namespace creaButtonContainer
 
                                // ----------------------------------------------------------------------------------
                                /*! @fn void AddEvents( );
-                                *      @brief This method connect every buttonEvent to the view.
+                                *      @brief This method connect every buttonEvents to the view.
                                 *      @exception std::bad_alloc
                                 */
                                void
index 395f12d3b763246c42dff8369d400832283b2d76..f596414134ef4a2af268de228afa0b69cf51f11a 100644 (file)
@@ -2,7 +2,7 @@
  * @file buttonGroupFactory.cxx
  * @brief Implements the ButtonGroupFactory class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #include "buttonGroupFactory.h"
@@ -24,9 +24,9 @@ namespace creaButtonContainer
                ButtonGroupFactory::CreateButtonGroupContainer( wxWindow* parent,
                    ButtonGroupModel* settings )
                {
+                       ButtonGroupContainer groupView;
                        try
                        {
-                               ButtonGroupContainer groupView;
                                ButtonGroupMap map = settings->GetButtonGroupContainer( );
                                for( ButtonGroupMap::iterator it = map.begin( ); it != map.end( ); ++it )
                                {
@@ -37,8 +37,7 @@ namespace creaButtonContainer
                                        ButtonGroup* group = new ButtonGroup( wxGroupName,
                                            this->GetButtons( parent, ( *it ).second ) );
                                        groupView.push_back( group );
-                               }
-                               return ( groupView );
+                               }//rof
                        }//yrt
                        catch ( const std::exception& e )
                        {
@@ -46,6 +45,7 @@ namespace creaButtonContainer
                                    << "ButtonGroupFactory::CreateButtonGroupContainer( wxWindow* parent,   ButtonGroupModel* settings )"
                                    << " exception: " << e.what( ) << std::endl;
                        }//chtac
+                       return ( groupView );
                }
                // ----------------------------------------------------------------------------------
                ButtonGroupFactory::ButtonContainer
@@ -60,7 +60,7 @@ namespace creaButtonContainer
                                {
                                        long id = wxNewId( );
                                        buttonList[ id ] = new Button( parent, id, *it );
-                               }
+                               }//rof
                                return ( buttonList );
                        }//yrt
                        catch ( const std::exception& e )
index b12cfb5edcbfa7554b8253b88ea94dc5dd1b8dd8..42b41866c73838639d25ec77de6727bb7ecd811b 100644 (file)
@@ -2,23 +2,18 @@
  * @file buttonGroupFactory.h
  * @brief Contains ButtonGroupFactory class
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #ifndef BUTTONGROUPFACTORY_H
 #define BUTTONGROUPFACTORY_H
 
 #include <wx/window.h>
-#include <list>
-#include <map>
-#include <iostream>
-#include <exception>
 
 #include "system.h"
 #include "button.h"
 #include "buttonGroup.h"
 #include "containerSettings.h"
-#include "functor.h"
 
 /*!    @namespace <creaButtonContainer>
  *     @brief Contains the creaButtonContainer library included in creaMaracasVisu.
@@ -40,6 +35,7 @@ namespace creaButtonContainer
                {
                        public:
                                //typedef definition
+                               // ----------------------------------------------------------------------------------
                                /*!     @typedef creaButtonContainer::view::Button Button;
                                 *      @brief Defines the Button type.
                                 */
@@ -78,7 +74,7 @@ namespace creaButtonContainer
                                virtual
                                ~ButtonGroupFactory( );
                                /*! @fn ButtonGroupContainer ButtonGroupFactory::CreateButtonGroupContainer( wxWindow* parent, ButtonGroupModel* settings );
-                                * @brief This method allows to create the ButtonGroupContainer.
+                                * @brief This method creates the ButtonGroupContainer.
                                 * @param parent the wxWindow* parent to be attached.
                                 * @param settings The Container settings.
                                 * @exception std::bad_alloc
@@ -89,7 +85,7 @@ namespace creaButtonContainer
                                    ButtonGroupModel* settings );
                        private:
                                /*! @fn ButtonContainer ButtonGroupFactory::GetButtons( wxWindow* parent, ButtonList buttonModel );
-                                * @brief  This method allows to create a wx button container for a group.
+                                * @brief  This method creates a wx button container for a group.
                                 * @param parent the wxWindow* parent to be attached.
                                 * @param buttonModel The button list with its own information.
                                 * @exception std::bad_alloc
index a4e18f90bf721e50f352799816b8ee3c2ff186f0..a85aff5c7f58a862258c2266a2a3c5bf709d44f6 100644 (file)
@@ -2,7 +2,7 @@
  * @file containerSettings.cxx
  * @brief Implements the ContainerSettings class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #include "containerSettings.h"
@@ -23,13 +23,13 @@ namespace creaButtonContainer
                ButtonGroupMap
                ContainerSettings::GetButtonGroupContainer( )
                {
-                       return this->m_ButtonGroupContainer;
+                       return ( this->m_ButtonGroupContainer );
                }
                // ----------------------------------------------------------------------------------
                KeyMapList
                ContainerSettings::GetGroupNameList( )
                {
-                       return this->m_GroupNameList;
+                       return ( this->m_GroupNameList );
                }
                // ----------------------------------------------------------------------------------
                void
@@ -45,15 +45,15 @@ namespace creaButtonContainer
                }
                // ----------------------------------------------------------------------------------
                void
-               ContainerSettings::AddButton( const std::string & groupName,
-                   const std::string buttonName, const std::string iconpath,
-                   const std::string buttonDescription, FunctionEventType event )
+               ContainerSettings::AddButton( const StringType & groupName,
+                   const StringType &buttonName, const StringType &iconpath,
+                   const StringType &buttonDescription, FunctionEventType event )
                {
+                       ButtonPair* pair = new ButtonPair(
+                           new ButtonInfo( buttonName, iconpath ),
+                           new ButtonAction( buttonDescription, event ) );
                        try
                        {
-                               ButtonPair* pair = new ButtonPair(
-                                   new ButtonInfo( buttonName, iconpath ),
-                                   new ButtonAction( buttonDescription, event ) );
                                for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it
                                    != this->m_GroupNameList.end( ); ++it )
                                {
@@ -79,11 +79,11 @@ namespace creaButtonContainer
                void
                ContainerSettings::AddButton( BCSettingsStruct* info )
                {
+                       ButtonPair* pair = new ButtonPair(
+                           new ButtonInfo( info->buttonName, info->iconpath ),
+                           new ButtonAction( info->buttonDescription, info->eventFunction ) );
                        try
                        {
-                               ButtonPair* pair = new ButtonPair(
-                                   new ButtonInfo( info->buttonName, info->iconpath ),
-                                   new ButtonAction( info->buttonDescription, info->eventFunction ) );
                                for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it
                                    != this->m_GroupNameList.end( ); ++it )
                                {
index e180dc12d5fa4fb0dd2bd4c6aeae75b62e7123ac..8be486179452cd03c315f2ea756ea1679e0dc907 100644 (file)
@@ -2,20 +2,16 @@
  * @file containerSettings.h
  * @brief Contains the ContainerSettings class
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #ifndef BUTTONGROUPSETTINGS_H_
 #define BUTTONGROUPSETTINGS_H_
 
-#include <list>
-#include <map>
 #include <vector>
-#include <iostream>
-#include <exception>
+
 #include "structBCSettings.h"
 #include "system.h"
-#include "functor.h"
 
 /*!    @namespace <creaButtonContainer>
  *     @brief Contains the creaButtonContainer library included in creaMaracasVisu.
@@ -102,12 +98,13 @@ namespace creaButtonContainer
                                 * @exception std::bad_alloc
                                 */
                                void
-                               AddButton( const std::string & groupName, const std::string buttonName,
-                                   const std::string iconpath, const std::string buttonDescription,
+                               AddButton( const StringType & groupName, const StringType &buttonName,
+                                   const StringType &iconpath, const StringType &buttonDescription,
                                    FunctionEventType event );
                                // ----------------------------------------------------------------------------------
                                /*! @fn void AddButton( BCSettingsStruct* info );
-                                *      @brief This method adds a new button to the container.
+                                *      @brief This method adds a new button to the container using the
+                                *      BCSettingsStruct structure.
                                 *      @exception std::bad_alloc
                                 *      @param info
                                 */
@@ -123,8 +120,8 @@ namespace creaButtonContainer
                                AddButtons( BCStructVectorType infoList );
                                // ----------------------------------------------------------------------------------
                        private:
-                               ButtonGroupMap m_ButtonGroupContainer; //! <std::map< std::string, ButtonList > View pointer.
-                               KeyMapList m_GroupNameList; //! <ButtonContainerPanel View pointer.
+                               ButtonGroupMap m_ButtonGroupContainer; //! <The container with the group of buttons.
+                               KeyMapList m_GroupNameList; //! <The container with the name of the groups of buttons.
                };
        }
 }
index 9cee15dcabf40128125f9d0a3d74ebf14c605640..fc0b7718d8a28ca9f884fb539c7636d68a182fcb 100644 (file)
@@ -2,7 +2,7 @@
  * @file functor.h
  * @brief Defines TFunctor class
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #ifndef TFUNCTOR_H_
index e37abe53d3e367930eaab8bda53ee5cfeeb6b01e..0fdf49640b20a8ed6c7df54fa6074ce076dbbfc1 100644 (file)
@@ -2,7 +2,7 @@
  * @file functor.cxx
  * @brief Implements TFunctor class and it propose is Call_Back Functions
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
 */
 
 namespace creaButtonContainer
index b78bdec6f36479411fec54a176da809bf870781c..a3d223d29c3dfb572a66dbc443465aaf12703022 100755 (executable)
@@ -2,13 +2,12 @@
  * @file structBCSettings.h
  * @brief Contains BCSettingsStruct structure.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #ifndef STRUCTBCSETTINGS_H_
 #define STRUCTBCSETTINGS_H_
 
-#include <string>
 #include "system.h"
 
 /*!    @namespace <creaButtonContainer>
@@ -27,10 +26,10 @@ namespace creaButtonContainer
                 */
                struct BCSettingsStruct
                {
-                               std::string groupName; //! <The name of the group of buttons.
-                               std::string buttonName; //! <The name of the button.
-                               std::string iconpath; //! <The iconPath of the button.
-                               std::string buttonDescription; //! <The description of the button.
+                               StringType groupName; //! <The name of the group of buttons.
+                               StringType buttonName; //! <The name of the button.
+                               StringType iconpath; //! <The iconPath of the button.
+                               StringType buttonDescription; //! <The description of the button.
                                FunctionEventType eventFunction; //! <The event associated to the button.
                };
        } //ecapseman
index 51db3bd5c136fa16fd6dcc7eca647bb4ac4bc601..012a5bfcb277f36cbb6f6242464b851d810e7d1d 100644 (file)
@@ -2,8 +2,8 @@
  * @file system.h
  * @brief Contains a system typedefs used to reuse code.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
-*/
+ * @date  2011-06-02
+ */
 
 #ifndef SYSTEM_H_
 #define SYSTEM_H_
@@ -12,6 +12,7 @@
 #include <map>
 #include <iostream>
 #include <exception>
+#include <string>
 #include "functor.h"
 
 /*!    @namespace <creaButtonContainer>
  */
 namespace creaButtonContainer
 {
+       // ----------------------------------------------------------------------------------
+       /*!     @typedef std::string* StringType;
+        *      @brief Defines the StringType type.
+        */
+       typedef std::string StringType;
+       // ----------------------------------------------------------------------------------
        /*!     @typedef model::TFunctor* FunctionEventType;
         *      @brief Defines the FunctionEventType type.
         */
@@ -28,13 +35,13 @@ namespace creaButtonContainer
         *      @brief Defines the ActionButton type.
         *      First is the button description, Second FunctionEventType
         */
-       typedef std::pair< std::string, FunctionEventType > ButtonAction;
+       typedef std::pair< StringType, FunctionEventType > ButtonAction;
        // ----------------------------------------------------------------------------------
        /*!     @typedef std::pair< std::string, std::string > ButtonInfo;
         *      @brief Defines the ButtonInfo type.
         *      First is the ButtonName and Second is the IconPath
         */
-       typedef std::pair< std::string, std::string > ButtonInfo;
+       typedef std::pair< StringType, StringType > ButtonInfo;
        // ----------------------------------------------------------------------------------
        /*!     @typedef std::pair< ButtonInfo*, ActionButton* > ButtonPair;
         *      @brief Defines the ButtonPair type.
@@ -44,7 +51,7 @@ namespace creaButtonContainer
        /*!     @typedef std::list< std::string > KeyMapList;
         *      @brief Defines the KeyMapList type.
         */
-       typedef std::list< std::string > KeyMapList;
+       typedef std::list< StringType > KeyMapList;
        // ----------------------------------------------------------------------------------
        /*!     @typedef std::list< ButtonPair* > ButtonList;
         *      @brief Defines the ButtonList type.
@@ -54,7 +61,7 @@ namespace creaButtonContainer
        /*!     @typedef std::map< std::string, ButtonList > ButtonGroupMap;
         *      @brief Defines the ButtonGroupMap type.
         */
-       typedef std::map< std::string, ButtonList > ButtonGroupMap;
+       typedef std::map< StringType, ButtonList > ButtonGroupMap;
 // ----------------------------------------------------------------------------------
 }
 
index 40b1697c46ea85d32feca11aa50fcb17a284bd3c..323e2a78813e4734f7f1e7bcae3e4b7c56bd6f94 100644 (file)
@@ -2,7 +2,7 @@
  * @file button.cxx
  * @brief Implements the Button class implementation.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #include "button.h"
@@ -15,9 +15,9 @@ namespace creaButtonContainer
                Button::Button( wxWindow* parent, long id, ButtonPair* pair )
                {
                        this->m_ButtonPair = pair;
-                       std::string wXbuttonName = this->m_ButtonPair->first->first;
-                       std::string wXiconPath = this->m_ButtonPair->first->second;
-                       std::string wXdescription = this->m_ButtonPair->second->first;
+                       StringType wXbuttonName = this->m_ButtonPair->first->first;
+                       StringType wXiconPath = this->m_ButtonPair->first->second;
+                       StringType wXdescription = this->m_ButtonPair->second->first;
                        wxString buttonName( wXbuttonName.c_str( ), wxConvUTF8 );
                        wxString imageIcon( wXiconPath.c_str( ), wxConvUTF8 );
                        wxString description( wXdescription.c_str( ), wxConvUTF8 );
@@ -33,19 +33,19 @@ namespace creaButtonContainer
                {
                }
                // ----------------------------------------------------------------------------------
-               std::string
+               StringType
                Button::GetButtonName( )
                {
                        return ( this->m_ButtonPair->first->first );
                }
                // ----------------------------------------------------------------------------------
-               std::string
+               StringType
                Button::GetIconPath( )
                {
                        return ( this->m_ButtonPair->first->second );
                }
                // ----------------------------------------------------------------------------------
-               std::string
+               StringType
                Button::GetDescription( )
                {
                        return ( this->m_ButtonPair->second->first );
@@ -56,8 +56,6 @@ namespace creaButtonContainer
                {
                        try
                        {
-                               std::cout << "ButtonAction: " << this->m_ButtonPair->first->first
-                                   << std::endl;
                                TFunctor* vTable[ ] =
                                { this->m_ButtonPair->second->second };
                                vTable[ 0 ]->Call( this->m_ButtonPair->first->first );
index 67d2861a2b35be8d5f1aeed49ce3b99a101b97ea..8462034bb47f89adbd9101b805239988d740191d 100644 (file)
@@ -2,7 +2,7 @@
  * @file button.h
  * @brief Contains the Button class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #ifndef BUTTON_H
 #include <wx/bmpbuttn.h>
 #include <wx/image.h>
 #include <wx/string.h>
-#include <string>
-#include <iostream>
-#include <exception>
-#include "functor.h"
+
 #include "system.h"
 
 /*!    @namespace <creaButtonContainer>
@@ -37,6 +34,7 @@ namespace creaButtonContainer
                {
                        public:
                                //typedef definition
+                               // ----------------------------------------------------------------------------------
                                /*!     @typedef creaButtonContainer::model::TFunctor TFunctor;
                                 *      @brief Defines the TFunctor type.
                                 */
@@ -70,21 +68,21 @@ namespace creaButtonContainer
                                 *      @brief This method returns the name of the button.
                                 *      @return std::string The name of the button.
                                 */
-                               std::string
+                               StringType
                                GetButtonName( );
                                // ----------------------------------------------------------------------------------
                                /*! @fn std::string Button::GetIconPath( );
                                 *      @brief This method returns the iconPath of the button.
                                 *      @return std::string The path of the icon.
                                 */
-                               std::string
+                               StringType
                                GetIconPath( );
                                // ----------------------------------------------------------------------------------
                                /*! @fn std::string Button::GetDescription( );
                                 *      @brief This method returns a the description of the button.
                                 *      @return std::string The tooltip of the button.
                                 */
-                               std::string
+                               StringType
                                GetDescription( );
                                // ----------------------------------------------------------------------------------
                                /*! @fn void Button::Execute( );
@@ -98,7 +96,7 @@ namespace creaButtonContainer
                                Execute( );
                                // ----------------------------------------------------------------------------------
                        private:
-                               ButtonPair* m_ButtonPair; //! <ButtonPair* ButtonPair pointer.
+                               ButtonPair* m_ButtonPair; //! <The pair with the button information.
                };
        }//ecapseman
 }//ecapseman
index 934d156ddf465ae30ad0e4bae8bd46efd029f001..93feebc7ec06c4079b986b78c0975ce28cc3cf62 100644 (file)
@@ -2,7 +2,7 @@
  * @file buttonGroup.cxx
  * @brief Implements the ButtonGroup class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-28
+ * @date  2011-06-02
  */
 
 #include "buttonContainerPanel.h"
index a49951f0d7e5df0dd816c2c48e9335832d11f28c..5a194cc1bcf1e0e2028c7eacd3ec2e681130ff4e 100644 (file)
@@ -2,7 +2,7 @@
  * @file buttonContainerController.h
  * @brief This contains the ButtonContainerController class
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-28
+ * @date  2011-06-02
  */
 
 #ifndef BUTTONCONTAINERPANEL_H
@@ -11,6 +11,7 @@
 #include <wx/scrolwin.h>
 #include <wx/button.h>
 #include <wx/sizer.h>
+
 #include <list>
 #include <map>
 #include <exception>
@@ -34,8 +35,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 <a href="http://docs.wxwidgets.org/stable/wx_wxevthandler.html">wxEvtHandler</a>
                 */
                class ButtonContainerController;
index 5a0db8b1a5adb71b4841ccc41ac395f117f69f4b..0738e60e6ff1dd6c30f597875c09bbd191780cd9 100644 (file)
@@ -2,7 +2,7 @@
  * @file buttonGroup.cxx
  * @brief Implements the ButtonGroup class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #include "buttonGroup.h"
@@ -38,21 +38,21 @@ namespace creaButtonContainer
                ButtonGroup::IdButtonContainer
                ButtonGroup::GetButtonIdContainer( )
                {
+                       IdButtonContainer idContainer;
                        try
                        {
-                               IdButtonContainer idContainer;
                                for( ButtonContainer::iterator it = this->m_Buttons.begin( ); it
                                    != this->m_Buttons.end( ); ++it )
                                {
                                        idContainer.push_back( ( *it ).first );
-                               }
-                               return ( idContainer );
+                               }//rof
                        }//yrt
                        catch ( std::exception& e )
                        {
                                std::cerr << "ButtonGroup::GetButtonIdContainer( )" << "exception: "
                                    << e.what( ) << std::endl;
                        }//hctac
+                       return ( idContainer );
                }
                // ----------------------------------------------------------------------------------
                Button*
index b3285692378b1fe7be551e9ca19027954bb308d0..0172389155754da83ced5df4136da4718407fd98 100644 (file)
@@ -2,16 +2,17 @@
  * @file buttonGroup.h
  * @brief This contains the ButtonGroup class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #ifndef BUTTONGROUP_H
 #define BUTTONGROUP_H
 
 //Library Definition
+#include <wx/stattext.h>
+
 #include <map>
 #include <list>
-#include <wx/stattext.h>
 #include <exception>
 
 #include "button.h"
@@ -34,6 +35,7 @@ namespace creaButtonContainer
                {
                        public:
                                //Typedef definition
+                               // ----------------------------------------------------------------------------------
                                /*!     @typedef creaButtonContainer::view::Button Button;
                                 *      @brief Defines the Button type.
                                 */
@@ -95,7 +97,7 @@ namespace creaButtonContainer
                                GetGroupName( );
                                // ----------------------------------------------------------------------------------
                        private:
-                               wxStaticText* m_GroupName; //!<A pointer with the name of the group.
+                               wxStaticText* m_GroupName; //!<A pointer with the wxStaticText of name of the group.
                                ButtonContainer m_Buttons; //!<A container with buttons.
                };
        }//ecapseman
index 38a4c6b38a2e5d874b5ba0db790501f6eb4385ea..8d00a5da0dc2feab29fa8cfe124291f8e934aecf 100644 (file)
@@ -2,7 +2,7 @@
  * @file buttonManager.cxx
  * @brief Implements the ButtonManager class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #include "buttonManager.h"
@@ -55,7 +55,7 @@ namespace creaButtonContainer
                                                this->m_GridSizer->Add( ( *it ).second, -1,
                                                    wxALL | wxALIGN_LEFT | wxALIGN_TOP, 5 );
                                        this->Add( m_GridSizer, -1, wxALL | wxALIGN_LEFT | wxALIGN_TOP, 5 );
-                               }
+                               }//fi
                        }//yrt
                        catch ( const std::exception& e )
                        {
index 15127e92ae3a0a38b1edb7bfc2e1d8cf8a59b740..88c6786e1b21047afbd6d8b56e6da78a1db71c0e 100644 (file)
@@ -2,7 +2,7 @@
  * @file buttonManager.h
  * @brief This contains the ButtonManager class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #ifndef CARTOBUTTONCONTAINER_H
 #include <wx/bmpbuttn.h>
 #include <wx/stattext.h>
 #include <wx/string.h>
+
 #include <map>
 #include <exception>
+
 #include "button.h"
 #include "buttonGroup.h"
 
@@ -37,6 +39,7 @@ namespace creaButtonContainer
                {
                        public:
                                //typedef definition.
+                               // ----------------------------------------------------------------------------------
                                /*!     @typedef creaButtonContainer::view::Button Button;
                                 *      @brief Defines the Button type.
                                 */
index bdb49d2331d9e7295fb3620fcd97164b8925e8ef..86a461a1ed359e881d7c6be73487a252e0f3795c 100644 (file)
@@ -2,7 +2,7 @@
  * @file groupManager.cxx
  * @brief Implements the GroupManager class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #include "groupManager.h"
@@ -21,7 +21,8 @@ namespace creaButtonContainer
                            wxDefaultValidator, _T("EXPBUTTON") );
                        this->Add( m_ExpansionButton, 1, wxALL | wxALIGN_LEFT | wxALIGN_TOP, 5 );
                        this->m_ButtonManager = new ButtonManager( buttonGroup );
-                       this->Add( this->m_ButtonManager, 1, wxALL | wxALIGN_LEFT | wxALIGN_TOP, 5 );
+                       this->Add( this->m_ButtonManager, 1, wxALL | wxALIGN_LEFT | wxALIGN_TOP,
+                           5 );
                }
                // ----------------------------------------------------------------------------------
                GroupManager::~GroupManager( )
@@ -68,10 +69,14 @@ namespace creaButtonContainer
                GroupManager::HideSubPanel( bool hide )
                {
                        if ( hide == true )
+                       {
                                this->m_ButtonManager->HideButtonManager( );
+                       }//fi
                        else
+                       {
                                this->m_ButtonManager->ShowButtonManager( );
+                       }//esle
                }
-               // ----------------------------------------------------------------------------------
+       // ----------------------------------------------------------------------------------
        }//ecapseman
 }//ecapseman
index 969b7a487d2e63ef304473cb605adf01091aa009..c187c2e0fb91bcee8b8bc27fdc2c69a9c3e65682 100644 (file)
@@ -2,7 +2,7 @@
  * @file groupManager.h
  * @brief This contains the GroupManager class
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #ifndef GROUPMANAGER_H
 #include <wx/sizer.h>
 #include <wx/button.h>
 #include <wx/stattext.h>
-#include <wx/event.h>
+
 #include <list>
 #include <iostream>
 #include <exception>
+
 #include "buttonManager.h"
 #include "buttonGroup.h"
-#include <wx/event.h>
 
 /*!    @namespace <creaButtonContainer>
  *     @brief Contains the creaButtonContainer library included in creaMaracasVisu.
@@ -39,6 +39,7 @@ namespace creaButtonContainer
                {
                        public:
                                //typedef definition
+                               // ----------------------------------------------------------------------------------
                                /*!     @typedef creaButtonContainer::view::ButtonGroup ButtonGroup;
                                 *      @brief Defines the ButtonGroup type.
                                 */
index 8ca88d0e7200ab5d08dd1d66ab7e38f80aaa4754..80dee9a41172b129d35786b893cc58862311e880 100644 (file)
@@ -2,7 +2,7 @@
  * @file buttonContainerSettings.cxx
  * @brief Implements the ButtonContainerSettings class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #include "buttonContainerSettings.h"
@@ -32,7 +32,7 @@ namespace creaPanelButtonContainer
        // ----------------------------------------------------------------------------------
        //GetButtonPanel returns the panel associated to the buttonAction
        ButtonContainerSettings::PanelButton
-       ButtonContainerSettings::GetPanelButton( const std::string &buttonName )
+       ButtonContainerSettings::GetPanelButton( const StringType &buttonName )
        {
                try
                {
@@ -52,7 +52,7 @@ namespace creaPanelButtonContainer
                catch ( std::exception& e )
                {
                        std::cerr
-                           << "ButtonContainerSettings::GetPanelButton( const std::string &buttonName ) "
+                           << "ButtonContainerSettings::GetPanelButton( const StringType &buttonName ) "
                            << "exception: " << e.what( ) << std::endl;
                }//hctac
                return ( NULL );
@@ -79,7 +79,7 @@ namespace creaPanelButtonContainer
                catch ( std::exception& e )
                {
                        std::cerr
-                           << "ButtonContainerSettings::GetPanelButton( const std::string &buttonName ) "
+                           << "ButtonContainerSettings::GetPanelButton( const StringType &buttonName ) "
                            << "exception: " << e.what( ) << std::endl;
                }//hctac
        }
@@ -98,9 +98,9 @@ namespace creaPanelButtonContainer
        }
        // ----------------------------------------------------------------------------------
        void
-       ButtonContainerSettings::AddButton( const std::string & groupName,
-           const std::string &buttonName, const std::string &iconpath,
-           const std::string &buttonDescription, PanelButton panel )
+       ButtonContainerSettings::AddButton( const StringType & groupName,
+           const StringType &buttonName, const StringType &iconpath,
+           const StringType &buttonDescription, PanelButton panel )
        {
                try
                {
@@ -131,9 +131,9 @@ namespace creaPanelButtonContainer
                catch ( const std::exception& e )
                {
                        std::cerr
-                           << "ButtonContainerSettings::AddButton( const std::string & groupName,"
-                           << "const std::string &buttonName, const std::string &iconpath,"
-                           << "const std::string &buttonDescription, PanelButton panel ) "
+                           << "ButtonContainerSettings::AddButton( const StringType & groupName,"
+                           << "const StringType &buttonName, const StringType &iconpath,"
+                           << "const StringType &buttonDescription, PanelButton panel ) "
                            << "exception: " << e.what( ) << std::endl;
                }//hctac
        }
index fa94fd1d2342afb5d266d2643d07de944b847918..92391e1b719048c460f5eef967af7a75aede9e43 100644 (file)
@@ -2,15 +2,16 @@
  * @file buttonContainerSettings.h
  * @brief This contains the ButtonContainerSettings class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #ifndef BUTTONCONTAINERSETTINGS_H_
 #define BUTTONCONTAINERSETTINGS_H_
 
+#include <wx/panel.h>
+
 #include <list>
 #include <map>
-#include <wx/panel.h>
 #include <vector>
 #include <iostream>
 
@@ -30,6 +31,12 @@ namespace creaPanelButtonContainer
        {
                public:
                        //typedef definition.
+                       // ----------------------------------------------------------------------------------
+                       /*!     @typedef std::string* StringType;
+                        *      @brief Defines the StringType type.
+                        */
+                       typedef std::string StringType;
+                       // ----------------------------------------------------------------------------------
                        /*!     typedef creaButtonContainer::model::TFunctor TFunctor;
                         *      @brief Defines the TFunctor type.
                         */
@@ -124,7 +131,7 @@ namespace creaPanelButtonContainer
                        // ----------------------------------------------------------------------------------
                        /*! @fn ButtonGroupSettings* GetButtonGroupSettings( TFunctor* functor );
                         *      @brief this method return the settings the generic settings for creaButtonContainer.
-                        * @param functor
+                        * @param functor The function to be called in the action button.
                         * @exception std::bad_alloc
                         * @return
                         */
@@ -149,11 +156,11 @@ namespace creaPanelButtonContainer
                         const std::string &iconpath, const std::string &buttonDescription,
                         PanelButton panel );
                         * @brief This method adds a new button into a group of buttons.
-                        * @param groupName
-                        * @param buttonName
-                        * @param iconpath
-                        * @param buttonDescription
-                        * @param panel
+                        * @param groupName The button groupName
+                        * @param buttonName The buttonName
+                        * @param iconpath The path of the icon
+                        * @param buttonDescription The button tooltip
+                        * @param panel The panel to be called when the button is clicked
                         * @exception std::bad_alloc
                         */
                        void
@@ -163,7 +170,7 @@ namespace creaPanelButtonContainer
                        // ----------------------------------------------------------------------------------
                        /*! @fn void AddButton( BCPSettingsStruct* info );
                         * @brief This method adds a new button into a group of buttons.
-                        * @param info
+                        * @param info The pointer to BCPSettingsStruct.
                         * @exception std::bad_alloc
                         */
                        void
@@ -171,7 +178,7 @@ namespace creaPanelButtonContainer
                        // ----------------------------------------------------------------------------------
                        /*! @fn void AddButtons( BCStructVectorType infoList );
                         * @brief This method adds new buttons into the container.
-                        * @param infoList
+                        * @param infoList The BCStructVectorType
                         * @exception std::bad_alloc
                         */
                        void
index c2b954ac41e0fa50e77841d1c12599095feb6591..9ea9dc7260bacde0162e71d9a62eea1e71d67b11 100644 (file)
@@ -2,7 +2,7 @@
  * @file creaPanelButtonContainer.h
  * @brief implements PanelButtonContainer class
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-28
+ * @date  2011-06-02
  */
 
 #include "creaPanelButtonContainer.h"
@@ -65,7 +65,9 @@ namespace creaPanelButtonContainer
                            buttonName );
                        //changing the parent of the panel!
                        if ( this->m_ButtonPanel->GetParent( ) != this )
+                       {
                                this->m_ButtonPanel->Reparent( this );
+                       }//fi
                        //CartoSettingsPanel Management
                        this->m_AuiManager->GetPane( _T("ButtonPanel") ).window
                            = this->m_ButtonPanel;
index aac12ec76afb0549a1b453df8c940d18bc9dab6e..dffcdeb675ad933285a9f32987eef62c0c8441b7 100644 (file)
@@ -2,7 +2,7 @@
  * @file PanelButtonContainer
  * @brief This contains the ButtonContainerSettings class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-28
+ * @date  2011-06-02
  */
 
 #ifndef PANELBUTTONCONTAINER_H_
@@ -30,13 +30,14 @@ namespace creaPanelButtonContainer
        {
                public:
                        //typedef definition.
-                       /*!     typedef creaButtonContainer::model::TFunctor TFunctor;
-                        *      @brief Defines the TFunctor type.
+                       // ----------------------------------------------------------------------------------
+                       /*!     typedef creaPanelButtonContainer::ButtonContainerSettings ButtonContainerSettings;
+                        *      @brief Defines the ButtonContainerSettings type.
                         */
                        typedef creaPanelButtonContainer::ButtonContainerSettings
                            ButtonContainerSettings;
-                       /*!     typedef creaButtonContainer::model::TFunctor TFunctor;
-                        *      @brief Defines the TFunctor type.
+                       /*!     typedef creaButtonContainer::view::ButtonContainerPanel ButtonContainerPanel;
+                        *      @brief Defines the ButtonContainerPanel type.
                         */
                        typedef creaButtonContainer::view::ButtonContainerPanel
                            ButtonContainerPanel;
@@ -46,8 +47,8 @@ namespace creaPanelButtonContainer
                        // ----------------------------------------------------------------------------------
                        /*! @fn PanelButtonContainer( wxWindow* parent, ButtonContainerSettings* bcSettings );
                         *      @brief This is the parameterized constructor.
-                        *      @param parent
-                        *      @param bcSettings
+                        *      @param parent The wxWindow pointer to parent
+                        *      @param bcSettings //The buttonContainerSettings
                         */
                        PanelButtonContainer( wxWindow* parent,
                            ButtonContainerSettings* bcSettings );
@@ -59,7 +60,7 @@ namespace creaPanelButtonContainer
                        ~PanelButtonContainer( );
                        // ----------------------------------------------------------------------------------
                        /*! @fn void UpdatePanel( const std::string &buttonName );
-                        *  @brief This method Updates the m_ButtonPanel for a panel
+                        *  @brief This method Updates the m_ButtonPanel to a panel
                         *  of the clicked button in creaButtonContainer.
                         *      @param buttonName
                         */
@@ -69,7 +70,7 @@ namespace creaPanelButtonContainer
                        /*! @fn void GenericButtonEvent( const std::string &buttonName );
                         *      @brief This method is the function that calls the panels contained in the buttons
                         *      (in creaButtonContainer is the function contained in the functors to be called back.
-                        *      @param buttonName
+                        *      @param buttonName The name of the button
                         */
                        void
                        GenericButtonEvent( const std::string &buttonName );
index be67f22c22947d8c5031dda037f0792031611386..76e186d86d7760169eef3577f6e6ed492df93e43 100755 (executable)
@@ -2,7 +2,7 @@
  * @file structBCPSettings.h
  * @brief Contains BCPSettingsStruct structure.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #ifndef STRUCTBCPSETTINGS_H_