]> Creatis software - creaMaracasVisu.git/commitdiff
#2497 creaMaracasVisu Feature New Normal - In container button add the list option
authordavila <eduardo.davila@creatis.insa-lyon.fr>
Tue, 6 Jan 2015 15:23:18 +0000 (16:23 +0100)
committerdavila <eduardo.davila@creatis.insa-lyon.fr>
Tue, 6 Jan 2015 15:23:18 +0000 (16:23 +0100)
12 files changed:
bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
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/listGroupFactory.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/listGroupFactory.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listGroup.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listWx.cxx
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/structBCPSettings.h

index 76119b7be6306ea4847016d207645f292fa44e9a..3f30cba3e6e3675a08b280fbbdbf51dce3b10a07 100644 (file)
@@ -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)
index 6779dd399e7f0545cb93954256e472a8b68dd715..18f769916826774a5ad0967ed790ec76294c1a1f 100644 (file)
@@ -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
index d00db70c51f3c8fbaa1f71d68443852f7490b6bc..54f9ce9c9de7a4e051afb4e646e9d14d26dca4d0 100644 (file)
@@ -35,7 +35,7 @@
 
 #include <vector>
 #include <wx/bitmap.h>
-#include <wx/listctrl.h>
+//EED-MLER  #include <wx/listctrl.h>
 
 #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; //! <The container with the group of buttons.
                                KeyMapList m_GroupNameList; //! <The container with the name of the groups of buttons.
 
-                               ListGroupMap m_ListGroupContainer; // contenedor del grupo de listas
+//EED-MLER                             ListGroupMap m_ListGroupContainer; // contenedor del grupo de listas
                };
        }
 }
index 7322b06072a5e1510863e9974a49ce92c06f7319..d6ce52652d65ac0291c4a10306ed6a9bc8298a8d 100644 (file)
@@ -30,6 +30,9 @@
  * @date  2011-06-02
  */
 
+//EED-MLER
+/*
+
 #include "listGroupFactory.h"
 
 namespace creaButtonContainer
@@ -78,10 +81,12 @@ namespace creaButtonContainer
 
                        try
                        {
-                               /*List list = new List(parent,items);
 
-                               cList.push_back(list);
-                               //return ( buttonList ); // JPR*/
+                               //List list = new List(parent,items);
+                               //cList.push_back(list);
+                               //return ( buttonList ); // JPR
+
+
                        }//yrt
                        catch ( const std::exception& e )
                        {
@@ -95,3 +100,6 @@ namespace creaButtonContainer
        // ----------------------------------------------------------------------------------
        }//ecapseman
 }//ecapseman
+
+
+*/
index 7e137bd8c217b28dce66091a535063607ce492ef..6ec599271264754d55aa60473bdcfd5393c5aa7a 100644 (file)
 #define LISTGROUPFACTORY_H
 
 #include <wx/window.h>
-#include <wx/listctrl.h>
 
+#include <wx/listctrl.h>
 #include "listWx.h"
+
 #include "system.h"
 #include "listGroup.h"
 #include "containerSettings.h"
index 9481b66c2db1f8607491ed66e0fe5cc07578f982..69c3d2d8d7f6b5ec616003b065b4088694fce614 100644 (file)
@@ -39,8 +39,8 @@
 #include <exception>
 #include <string>
 #include "functor.h"
-#include <listWx.h>
-#include <wx/listctrl.h>
+//EED-MLER #include <listWx.h>
+//EED-MLER #include <wx/listctrl.h>
 
 
 /*!    @namespace <creaButtonContainer>
@@ -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
 
 
 // ----------------------------------------------------------------------------------
index 988fbc2496905652ac77e80f90dd1af937eb8b63..4426590c5b873395cc08272ea9bd952b6400ad70 100644 (file)
@@ -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 <creaButtonContainer>
  *     @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; //!<The container of managers.
-                               ButtonGroupList m_ButtonGroupList; //!<The list of button groups.
-                               BCController* m_ButtonCController; //!<Pontier to controller.
-                               Sizer* m_Sizer; //!<Pointer to wxSizer
+                               GroupManagerList        m_GroupManagerList; //!<The container of managers.
+                               ButtonGroupList         m_ButtonGroupList; //!<The list of button groups.
+                               BCController*           m_ButtonCController; //!<Pontier to controller.
+                               Sizer*                          m_Sizer; //!<Pointer to wxSizer
 
-                               ListGroupList m_ListGroupList;
+//EED-MLER                             ListGroupList m_ListGroupList;
                        DECLARE_EVENT_TABLE() //!<Event Table declaration.
                };
        }//ecapseman
index cb193d6d1005968f9d6e7887ad8bd53e168f5b21..9d6fbe6e907c7ca6e41772298e50bc80c408b731 100644 (file)
@@ -30,6 +30,9 @@
  * @date  2011-06-02
  */
 
+
+//EED-MLER
+/*
 #include "listGroup.h"
 
 namespace creaButtonContainer
@@ -68,3 +71,5 @@ namespace creaButtonContainer
        // ----------------------------------------------------------------------------------
        }//ecapseman
 }//ecapseman
+
+*/
index 5e670e74cb4b1f1dffc804d6fa46c8cfd7089353..6eb86d8b0cf81036287fef25f1ba33ac648f8332 100644 (file)
 #  knowledge of the CeCILL-B license and that you accept its terms.
 # ------------------------------------------------------------------------ */
 
+
+
+//EED-MLER
+/*
 #include "listWx.h"
 
 namespace creaButtonContainer
@@ -60,3 +64,7 @@ namespace creaButtonContainer
        }
 
 }
+
+
+
+*/
index 2ca8d8dab6bc79dd51f47306f28d5b0c77238e20..879be81aaddcb4dab32d4b01ff9cd0441abb9041 100644 (file)
@@ -237,6 +237,9 @@ namespace creaPanelButtonContainer
                }//hctac
        }
 
+
+//EED-MLER
+/*
        void
                ButtonContainerSettings::AddItem(BCPSettingsStruct* info)
                {
@@ -293,7 +296,7 @@ namespace creaPanelButtonContainer
                            << "exception: " << e.what( ) << std::endl;
                        }//hctac
                }
-
+*/
 
 // ----------------------------------------------------------------------------------
 }//ecapseman
index cdb3207783c62ad3a1a171201293cfa65abd2231..056e4e87e89a6e61ac25b3506f4333be9897d091 100644 (file)
@@ -35,7 +35,7 @@
 
 #include <wx/panel.h>
 #include <wx/bitmap.h>
-#include <wx/listctrl.h>
+//EED-MLER #include <wx/listctrl.h>
 
 #include <list>
 #include <map>
@@ -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; //!<This is the map with the groups of buttons.
                        KeyMapList m_GroupNameList; //!<This is a container with the name of the groups.
 
-                       ListGroupMap m_ListGroupContainer;
+//EED-MLER                     ListGroupMap m_ListGroupContainer;
        };
 }//ecapseman
 #endif /* BUTTONCONTAINERSETTINGS_H_ */
index 48681549b176dcd8cb0b1a53d688041b785f8400..d1446b0f5a67737140bf0c88f496318d173b5d50 100755 (executable)
@@ -36,7 +36,7 @@
 #include <string>
 #include <wx/panel.h>
 #include <wx/bitmap.h>
-#include "tlist.h"
+//EED-MLER #include "tlist.h"
 
 /*!    @namespace <creaPanelButtonContainer>
  *     @brief Contains the creaPanelButtonContainer library included in creaMaracasVisu.