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=340258234a441ee5099ef1dbd6efdc74f77e702d;hb=4518d93a0a51221812cfb6d783f8e7f4fd77b498;hp=aaeae8cbabd7c93a56404c2738faf148c7416b09;hpb=c1742e6eca1299979dbacc1f609bc14c3494bc7a;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 aaeae8c..3402582 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
@@ -42,14 +42,31 @@ namespace creaButtonContainer
 		END_EVENT_TABLE()
 
 		// ----------------------------------------------------------------------------------
-		ButtonContainerPanel::ButtonContainerPanel( wxWindow* parent, ButtonGroupSettings* settings, std::string type )
+		ButtonContainerPanel::ButtonContainerPanel( wxWindow* parent, ButtonGroupSettings* settings, int type )
 		: 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;
 
 			ButtonGroupFactory factory;
-			this->SetGroupContainer( factory.CreateButtonGroupContainer( this, settings ) );
+			ListGroupFactory listFactory;
+
+			//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 ) );
+								//Verificar ButtonGroupList contra ListGroupList
+			break;
+			default:
+				this->SetButtonGroupContainer(factory.CreateButtonGroupContainer( this, settings ) );
+			}
+
 			this->PanelInit(type );
 			this->m_ButtonCController = new BCController( this );
 			this->m_ButtonCController->AddEvents( );
@@ -62,21 +79,27 @@ namespace creaButtonContainer
 		}
 		
 		// ----------------------------------------------------------------------------------
-		void ButtonContainerPanel::SetGroupContainer( ButtonGroupList groupContainer )
+		void ButtonContainerPanel::SetButtonGroupContainer(ButtonGroupList groupContainer )
 		{
 			this->m_ButtonGroupList = groupContainer;
 		}
+		// ----------------------------------------------------------------------------------
+		void ButtonContainerPanel::SetListGroupContainer(ListGroupList groupContainer )
+		{
+			this->m_ListGroupList = groupContainer;
+		}
 		
 		// ----------------------------------------------------------------------------------
-		void ButtonContainerPanel::PanelInit( std::string type )
+		void ButtonContainerPanel::PanelInit( int type )
 		{
 			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 == "1")
+				if(type == 0)
 				{
 					for( ButtonGroupList::iterator it = this->m_ButtonGroupList.begin( ); it != this->m_ButtonGroupList.end( ); ++it )
 					{
@@ -87,13 +110,13 @@ namespace creaButtonContainer
 				}
 				else
 				{
-					for( ButtonGroupList::iterator it = this->m_ButtonGroupList.begin( ); it != this->m_ButtonGroupList.end( ); ++it )
+					for(ListGroupList::iterator it1 = this->m_ListGroupList.begin(); it1 != this->m_ListGroupList.end(); ++it1)
 					{
-						GroupManager* manager = new GroupManager( this, *it );
+						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( );