#2516 creaMaracasVisu Feature New Normal - creaPanelButtonContainer ListPanel with...

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / creaButtonContainer / view / buttonContainerPanel.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
index aaeae8cbabd7c93a56404c2738faf148c7416b09..741088099a831e4e11e493757c1ff34853527c1e 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
@@ -42,15 +42,19 @@ namespace creaButtonContainer
                END_EVENT_TABLE()
 
                // ----------------------------------------------------------------------------------
-               ButtonContainerPanel::ButtonContainerPanel( wxWindow* parent, ButtonGroupSettings* settings, std::string type )
+               ButtonContainerPanel::ButtonContainerPanel( wxWindow* parent, ButtonGroupSettings* settings )
                : wxScrolledWindow(parent,-1, wxDefaultPosition,wxDefaultSize, wxTAB_TRAVERSAL | wxVSCROLL | wxHSCROLL | wxFULL_REPAINT_ON_RESIZE, _T("creaButtonContainer") )
                {
 
-                       std::cout<< std::endl << " MLER buttonContainerPanel.cxx / ButtonContainerPanel() " << std::endl;
+                       std::cout<< "MLER | ButtonContainerPanel::ButtonContainerPanel( )" << std::endl;
 
                        ButtonGroupFactory factory;
-                       this->SetGroupContainer( factory.CreateButtonGroupContainer( this, settings ) );
-                       this->PanelInit(type );
+
+
+                       this->SetButtonGroupContainer( factory.CreateButtonGroupContainer( this, settings ) );
+
+
+                       this->PanelInit( );
                        this->m_ButtonCController = new BCController( this );
                        this->m_ButtonCController->AddEvents( );
                        this->SetEventHandler( this->m_ButtonCController );
@@ -62,38 +66,33 @@ namespace creaButtonContainer
                }
                
                // ----------------------------------------------------------------------------------
-               void ButtonContainerPanel::SetGroupContainer( ButtonGroupList groupContainer )
+               void ButtonContainerPanel::SetButtonGroupContainer(ButtonGroupList groupContainer )
                {
+                       std::cout<< "MLER | ButtonContainerPanel::SetButtonGroupContainer()" << std::endl;
                        this->m_ButtonGroupList = groupContainer;
                }
+               // ----------------------------------------------------------------------------------
+               /*void ButtonContainerPanel::SetListGroupContainer(ListGroupList groupContainer )
+               {
+                       this->m_ListGroupList = groupContainer;
+               }*/
                
                // ----------------------------------------------------------------------------------
-               void ButtonContainerPanel::PanelInit( std::string type )
+               void ButtonContainerPanel::PanelInit( )
                {
+                       std::cout<< "MLER | ButtonContainerPanel::PanelInit(  )" << std::endl;
                        try
                        {
                                
 // EED 20/01/2012  flag 01
                                this->m_Sizer = new Sizer( 0, 1, 0, 0 );
 
-                               if(type == "1")
-                               {
-                                       for( ButtonGroupList::iterator it = this->m_ButtonGroupList.begin( ); it != this->m_ButtonGroupList.end( ); ++it )
-                                       {
-                                               GroupManager* manager = new GroupManager( this, *it );
-                                               this->m_GroupManagerList[ manager->GetButtonID( ) ] = manager;
-                                               this->m_Sizer->Add( manager, 1, wxALL | wxALIGN_LEFT | wxALIGN_TOP, 5 );
-                                       }
-                               }
-                               else
-                               {
                                        for( ButtonGroupList::iterator it = this->m_ButtonGroupList.begin( ); it != this->m_ButtonGroupList.end( ); ++it )
                                        {
                                                GroupManager* manager = new GroupManager( this, *it );
                                                this->m_GroupManagerList[ manager->GetButtonID( ) ] = manager;
                                                this->m_Sizer->Add( manager, 1, wxALL | wxALIGN_LEFT | wxALIGN_TOP, 5 );
                                        }
-                               }
 
                                this->SetSizer( this->m_Sizer );
                                this->Layout( );
@@ -109,6 +108,7 @@ namespace creaButtonContainer
                // ----------------------------------------------------------------------------------
                void ButtonContainerPanel::FitSizer( )
                {
+                       std::cout<< "MLER | ButtonContainerPanel::FitSizer( )" << std::endl;
                        this->m_Sizer->Fit( this );
                        this->m_Sizer->FitInside( this );
                        this->SetScrollRate( 20, 20 );