From: espinosa Date: Fri, 30 Jan 2015 09:39:10 +0000 (+0100) Subject: #2516 creaMaracasVisu Feature New Normal - creaPanelButtonContainer ListPanel with... X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=bbd33bbb0f352d14d7068d87fcd50e02341004a9;p=creaMaracasVisu.git #2516 creaMaracasVisu Feature New Normal - creaPanelButtonContainer ListPanel with events 2 --- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listWx.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listWx.cxx index c7cfc56..32d101d 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listWx.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listWx.cxx @@ -47,6 +47,7 @@ namespace creaButtonContainer this->SetSizer(sizer); listBox = new wxListBox(this,-1); + m_functorEnabled = true; std::cout << "is ListBox"<< listBox->GetId()<< std::endl; // this->Connect( -1,wxEVT_COMMAND_CHOICE_SELECTED, @@ -131,16 +132,11 @@ namespace creaButtonContainer { if(!this->IsFunctorEnabled()) return; + else{ try { std::cout<< "MLER | ListWx::ListEvent( wxListEvent& event )" << std::endl; - // wxString itemNom = this->GetString(this->GetSelection()); - - // std::string itemNomC = std::string(itemNom.mb_str()); - - //this->functor->Call(itemNomC); - int iSelection; iSelection = listBox->GetSelection(); @@ -158,6 +154,7 @@ namespace creaButtonContainer << "ButtonContainerController::ButtonEvent( wxCommandEvent& event ) exception: " << e.what( ) << std::endl; }//hctac + } } // ---------------------------------------------------------------------------------- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx index c69fe01..2cd26ad 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx @@ -79,32 +79,12 @@ namespace creaPanelButtonContainer this->m_ListPanel = new wxPanel(this); std::cout << "tipo 1; new LIstWx"<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 ) ); } else if( type == 2) { - /*this->m_ListPanel = new wxPanel(this); - std::cout << "tipo 2; new LIstWx"<mylist = new ListWx(this, -1,this->m_ButtonContainerSettings->GetItemsMap(), lFunctor); - this->mylist->Show(false); - ItemsMap empty; - this->myConfiglist = new ListWx(this,-1, empty,lFunctor); - //wxButton - wxPanel* panelButton = new wxPanel(this); - wxBoxSizer* buttonSizer = new wxBoxSizer(wxHORIZONTAL); - button = new wxButton(panelButton, -1, _("Configurar"), - wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Configurar")); - buttonSizer->Add(button,0,wxEXPAND); - panelButton->SetSizer(buttonSizer); - - this->m_AuiManager->AddPane( panelButton,wxAuiPaneInfo( ).Name( _T("ListConfigContainerPanel") ).Caption(_("ListConfigContainerPanel") ). CaptionVisible( true ).CloseButton(false ).Center( ).Resizable( true ) ); - - this->m_AuiManager->AddPane( this->myConfiglist,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 ) ); - */ this->m_ListPanel = new wxPanel(this); @@ -135,9 +115,10 @@ namespace creaPanelButtonContainer 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("ListConfigPanel") ).Caption( _("ListConfigPanel") ). CaptionVisible(true ).CloseButton( false ).Bottom( ).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( ); @@ -240,14 +221,13 @@ namespace creaPanelButtonContainer std::cout<< "BUtton Event"<ShowModal() == 1 ) - { - this->myConfiglist->Reparent(panelUp); - this->myConfiglist->Show(true); - this->myConfiglist->SetFunctorEnabled(true); - this->panelUp->Update(); - this->m_AuiManager->Update( ); - } + 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); } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/listConfigPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/listConfigPanel.cxx index ccaec94..c39124f 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/listConfigPanel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/listConfigPanel.cxx @@ -83,22 +83,22 @@ namespace creaPanelButtonContainer sizerList2->Fit(panel2); sizerList2->SetSizeHints(panel2); - sizerUp->Add(panel2, 0, wxEXPAND|wxALL,7); + sizerUp->Add(panel2, 0, wxEXPAND); //======== - wxPanel* panel3 = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _T("Panel 3")); - wxBoxSizer* sizerList3 = new wxBoxSizer(wxHORIZONTAL); + //wxPanel* panel3 = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _T("Panel 3")); + //wxBoxSizer* sizerList3 = new wxBoxSizer(wxHORIZONTAL); //finalListBox = new wxListBox(panel3, -1, wxDefaultPosition, wxDefaultSize, 0, 0, 0, // wxDefaultValidator, _T("finalListBox")); - sizerList3->Add(m_finalListWx, 0, wxEXPAND); + //sizerList3->Add(m_finalListWx, 0, wxEXPAND); //panel3->SetSizer(sizerList3); //sizerList3->Fit(panel3); //sizerList3->SetSizeHints(panel3); - sizerUp->Add(m_finalListWx, 0, wxEXPAND|wxALL); + sizerUp->Add(m_finalListWx, 0, wxEXPAND); //sizer->Add(sizerUp, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); //FillList(); @@ -116,7 +116,7 @@ namespace creaPanelButtonContainer panel5->SetSizer(sizerList4); sizerList4->Fit(panel5); sizerList4->SetSizeHints(panel5); - sizerUp->Add(panel5, 0, wxEXPAND|wxALL,7); + sizerUp->Add(panel5, 0, wxEXPAND); //======== wxBoxSizer* sizerBotones = new wxBoxSizer(wxHORIZONTAL); @@ -210,6 +210,7 @@ namespace creaPanelButtonContainer ListConfigPanel::OnQuit(wxCommandEvent& event) { std::cout<<"Onquit"<