X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaPanelButtonContainer%2FcreaPanelButtonContainer.cxx;h=2cd26add7a968c39bede4cc54a92657de197228e;hb=bbd33bbb0f352d14d7068d87fcd50e02341004a9;hp=d7212643309df2ef6e71cfefff67d49e74eab739;hpb=a7017a8ade695bd14a4c7ee70b197d63b5e76765;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx
index d721264..2cd26ad 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx
@@ -69,7 +69,7 @@ namespace creaPanelButtonContainer
 		{
 			this->m_ButtonPanel = new wxPanel( this );
 			std::cout << "tipo 0; new ButtonContainerPanel"<<std::endl;
-			this->m_ButtonContainerPanel = new ButtonContainerPanel( this, this->m_ButtonContainerSettings->GetButtonGroupSettings( functor ),type );
+			this->m_ButtonContainerPanel = new ButtonContainerPanel( this, this->m_ButtonContainerSettings->GetButtonGroupSettings( functor ) );
 
 			this->m_AuiManager->AddPane( this->m_ButtonContainerPanel,wxAuiPaneInfo( ).Name( _T("ButtonContainerPanel") ).Caption(_("ButtonContainerPanel") ). CaptionVisible( true ).CloseButton(false ).Center( ).Resizable( true ) );
 			this->m_AuiManager->AddPane(this->m_ButtonPanel, wxAuiPaneInfo( ).Name( _T("ButtonPanel") ).Caption( _("ButtonPanel") ). CaptionVisible(true ).CloseButton( false ).Bottom( ).Resizable( true ) );
@@ -79,16 +79,54 @@ namespace creaPanelButtonContainer
 			this->m_ListPanel = new wxPanel(this);
 			std::cout << "tipo 1; new LIstWx"<<std::endl;
 			this->mylist = new ListWx(this, -1,this->m_ButtonContainerSettings->GetItemsMap(), lFunctor);
-
+			mylist->FillList();
 			this->m_AuiManager->AddPane( this->mylist,wxAuiPaneInfo( ).Name( _T("ListContainerPanel") ).Caption(_("ListContainerPanel") ). CaptionVisible( true ).CloseButton(false ).Center( ).Resizable( true ) );
 			this->m_AuiManager->AddPane(this->m_ListPanel, wxAuiPaneInfo( ).Name( _T("ListPanel") ).Caption( _("ListPanel") ). CaptionVisible(true ).CloseButton( false ).Bottom( ).Resizable( true ) );
-		}//MLER
+		}
+		else if( type == 2)
+		{
+
+			this->m_ListPanel = new wxPanel(this);
+
+			panelUp = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _T("ListConfigContainerPanel"));
+			wxBoxSizer* mainSizer = new wxBoxSizer(wxHORIZONTAL);
+
+		//=======
+			wxBoxSizer* listSizer = new wxBoxSizer(wxVERTICAL);
 
+			this->mylist = new ListWx(panelUp,-1,this->m_ButtonContainerSettings->GetItemsMap(),lFunctor);
+			this->mylist->Show(false);
+			ItemsMap empty;
+			this->myConfiglist = new ListWx(panelUp,-1, empty,lFunctor);
+			listSizer->Add(this->myConfiglist,0,wxEXPAND);
+			listSizer->Add(this->mylist,0,wxEXPAND);
+			mainSizer->Add(listSizer,0,wxEXPAND|wxALL,7);
 
-		//CartoButtonPanel Management
+		//=======
+			wxBoxSizer* buttonSizer = new wxBoxSizer(wxVERTICAL);
 
+			button = new wxButton(panelUp, -1, _("Configurar"),
+									wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Configurar"));
+
+			buttonSizer->Add(button,0,wxEXPAND);
+			mainSizer->Add(buttonSizer,0,wxEXPAND|wxALL,14);
+		//=======
+
+			panelUp->SetSizer(mainSizer);
+
+			this->m_AuiManager->AddPane( panelUp,wxAuiPaneInfo( ).Name( _T("ListConfigContainerPanel") ).Caption(_("ListConfigContainerPanel") ). CaptionVisible( true ).CloseButton(false ).Center( ).Resizable( true ) );
+			this->m_AuiManager->AddPane(this->m_ListPanel, wxAuiPaneInfo( ).Name( _T("ListPanel") ).Caption( _("ListPanel") ). CaptionVisible(true ).CloseButton( false ).Bottom( ).Resizable( true ) );
+		}
+
+
+		//MLER
 
 		this->m_AuiManager->Update( );
+		//m_listConfigPanel = new ListConfigPanel(this,1,_("Configuracion"),mylist);
+
+		this->Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+								wxCommandEventHandler(PanelButtonContainer::ButtonEvent));
+
 	}
 	// ----------------------------------------------------------------------------------
 	PanelButtonContainer::~PanelButtonContainer( )
@@ -175,6 +213,25 @@ namespace creaPanelButtonContainer
 		this->UpdateListPanel( buttonName );
 	}
 
+	void
+	PanelButtonContainer::ButtonEvent ( wxCommandEvent& event )
+	{
+
+		m_listConfigPanel = new ListConfigPanel(this,-1,_("Configuracion"), mylist, myConfiglist);
+
+		std::cout<< "BUtton Event"<<std::endl;
+
+		m_listConfigPanel->ShowModal();
+		this->myConfiglist->Reparent(panelUp);
+		this->myConfiglist->Show(true);
+		this->myConfiglist->SetFunctorEnabled(true);
+		this->myConfiglist->Update();
+		this->m_AuiManager->Update( );
+		this->m_ListPanel->Show(false);
+	}
+
+
+
 
 }//ecapseman