X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FbuttonContainerPanel.cxx;h=741088099a831e4e11e493757c1ff34853527c1e;hb=5c2299ec7d1a48d88d02fb31c46b15b69e40b9db;hp=0f182f50565d9dff4b6a8f0a9766f212c75bbb27;hpb=a7017a8ade695bd14a4c7ee70b197d63b5e76765;p=creaMaracasVisu.git

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 0f182f5..7410880 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
@@ -42,32 +42,19 @@ namespace creaButtonContainer
 		END_EVENT_TABLE()
 
 		// ----------------------------------------------------------------------------------
-		ButtonContainerPanel::ButtonContainerPanel( wxWindow* parent, ButtonGroupSettings* settings, int type )
+		ButtonContainerPanel::ButtonContainerPanel( wxWindow* parent, ButtonGroupSettings* settings )
 		: wxScrolledWindow(parent,-1, wxDefaultPosition,wxDefaultSize, wxTAB_TRAVERSAL | wxVSCROLL | wxHSCROLL | wxFULL_REPAINT_ON_RESIZE, _T("creaButtonContainer") )
 		{
 
 			std::cout<< "MLER | ButtonContainerPanel::ButtonContainerPanel( )" << std::endl;
 
 			ButtonGroupFactory factory;
-			//ListGroupFactory listFactory;
 
-			//MLER this->SetButtonGroupContainer( factory.CreateButtonGroupContainer( this, settings ) );
 
-			std::cout<< std::endl << " MLER buttonContainerPanel.cxx / ButtonContainerPanel() :: type " << type<<std::endl;
-			switch (type)
-			{
-			case 0:
-				this->SetButtonGroupContainer( factory.CreateButtonGroupContainer( this, settings ) );
-			break;
-			//case 1:
-				//this->SetListGroupContainer(listFactory.CreateButtonGroupContainer( this, settings ) );
-								// MLER Verificar ButtonGroupList contra ListGroupList
-			//break;
-			default:
-				this->SetButtonGroupContainer(factory.CreateButtonGroupContainer( this, settings ) );
-			}
+			this->SetButtonGroupContainer( factory.CreateButtonGroupContainer( this, settings ) );
+
 
-			this->PanelInit(type );
+			this->PanelInit( );
 			this->m_ButtonCController = new BCController( this );
 			this->m_ButtonCController->AddEvents( );
 			this->SetEventHandler( this->m_ButtonCController );
@@ -91,34 +78,21 @@ namespace creaButtonContainer
 		}*/
 		
 		// ----------------------------------------------------------------------------------
-		void ButtonContainerPanel::PanelInit( int type )
+		void ButtonContainerPanel::PanelInit( )
 		{
-			std::cout<< "MLER | ButtonContainerPanel::PanelInit( int type )" << std::endl;
+			std::cout<< "MLER | ButtonContainerPanel::PanelInit(  )" << std::endl;
 			try
 			{
 				
 // EED 20/01/2012  flag 01
 				this->m_Sizer = new Sizer( 0, 1, 0, 0 );
-				std::cout << " MLER buttonContainerPanel.cxx / Panel Init() :: type " << type << std::endl;
 
-				if(type == 0)
-				{
 					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(ListGroupList::iterator it1 = this->m_ListGroupList.begin(); it1 != this->m_ListGroupList.end(); ++it1)
-					{
-						GroupManager* manager = new GroupManager( this, *it1);
-						this->m_GroupManagerList[ manager->GetButtonID( ) ] = manager;
-						this->m_Sizer->Add( manager, 1, wxALL | wxALIGN_LEFT | wxALIGN_TOP, 5 );
-					}
-				}//MLER*/
 
 				this->SetSizer( this->m_Sizer );
 				this->Layout( );