X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaPanelButtonContainer%2FcreaPanelButtonContainer.cxx;h=8024f4aacb6b1402220d417f8cf16c3a54136ed8;hb=8cb2e736dbd160649089afd44928db6d26febcca;hp=23feb3e1534987a2b929499142042159ebfef691;hpb=3c6c4d236dd41550927d9180688f40c127301431;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 23feb3e..8024f4a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx
@@ -39,9 +39,9 @@ namespace creaPanelButtonContainer
 
 //(*EventTable(ButtonContainerPanel)
 //*)
-	END_EVENT_TABLE()
+	END_EVENT_TABLE ()
 // ----------------------------------------------------------------------------------
-	typedef creaButtonContainer::model::TConcreteFunctor< PanelButtonContainer > TConcreteFunctor;
+	typedef creaButtonContainer::model::TConcreteFunctor<PanelButtonContainer> TConcreteFunctor;
 // ----------------------------------------------------------------------------------
 	PanelButtonContainer::PanelButtonContainer(wxWindow* parent,
 			ButtonContainerSettings* bcSettings, int type)
@@ -51,7 +51,8 @@ namespace creaPanelButtonContainer
 		this->m_ButtonContainerSettings = bcSettings;
 
 		//Using AuiManager to Manage the Panels
-		this->m_AuiManager = new wxAuiManager(this, wxAUI_MGR_DEFAULT);
+		this->m_AuiManager = new wxAuiManager(this,
+				wxAUI_MGR_DEFAULT | wxFULL_REPAINT_ON_RESIZE);
 
 		if (type == 0)
 		{
@@ -71,11 +72,12 @@ namespace creaPanelButtonContainer
 			//Top Panel
 			this->m_AuiManager->AddPane(this->m_ButtonContainerPanel,
 					wxAuiPaneInfo().Name(_T("ButtonContainerPanel")).DefaultPane().Caption(
-							_("ButtonContainerPanel")).PinButton().CaptionVisible(
-							true).CloseButton(false).Center().Resizable(true));
+							_("ButtonContainerPanel")).PinButton().CaptionVisible(true).CloseButton(
+							false).Center().Resizable(true));
 		}
 		else if (type == 1)
 		{
+			//MLER
 			TConcreteFunctor* lFunctor = new TConcreteFunctor(this,
 					&PanelButtonContainer::GenericListEvent);
 
@@ -93,16 +95,92 @@ namespace creaPanelButtonContainer
 			//Top Panel
 			this->m_AuiManager->AddPane(this->m_ListWxPanel,
 					wxAuiPaneInfo().Name(_T("ListContainerPanel")).DefaultPane().Caption(
-							_("ListContainerPanel")).PinButton().CaptionVisible(
-							true).CloseButton(false).Center().Resizable(true));
+							_("ListContainerPanel")).PinButton().CaptionVisible(true).CloseButton(
+							false).Center().Resizable(true));
 		}
-		else if(type == 2)
+		else if (type == 2)
 		{
+			TConcreteFunctor* lFunctor = new TConcreteFunctor(this,
+					&PanelButtonContainer::GenericListEvent);
+
+			this->m_EmptyPanel = new wxPanel(this);
+			this->m_EventPanel = this->m_EmptyPanel;
+
+			this->m_PanelUp = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize,
+					wxTAB_TRAVERSAL, _T("ListConfigContainerPanel"));
+			wxGridBagSizer* mainSizer = new wxGridBagSizer(0, 0);
+			mainSizer->AddGrowableCol(1);
+			mainSizer->AddGrowableRow(0);
+
+			//=======
+			//Original List
+			this->m_ListWxPanel = new ListWx(this->m_PanelUp, -1,
+					this->m_ButtonContainerSettings->GetItemsVector(), lFunctor);
+			this->m_ListWxPanel->Show(false);
+			//Configurable list
+			this->m_CurrentWxPanel = new ListWx(this->m_PanelUp, -1, lFunctor);
+
+			mainSizer->Add(this->m_ListWxPanel, wxGBPosition(0, 0), wxDefaultSpan,
+					wxALL | wxEXPAND | wxALIGN_CENTER_HORIZONTAL
+							| wxALIGN_CENTER_VERTICAL, 5);
+			mainSizer->Add(this->m_CurrentWxPanel, wxGBPosition(0, 1), wxDefaultSpan,
+					wxALL | wxEXPAND | wxALIGN_CENTER_HORIZONTAL
+							| wxALIGN_CENTER_VERTICAL, 5);
+
+			wxBitmap btmSettings(Settings_xpm); //Icon of Button
+
+			this->m_ConfigButton = new wxBitmapButton(this->m_PanelUp, -1,
+					btmSettings, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW,
+					wxDefaultValidator, _T("Config"));
+
+			mainSizer->Add(this->m_ConfigButton, wxGBPosition(1, 2), wxDefaultSpan,
+					wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL, 5);
+
+			//=======
+
+			this->m_PanelUp->SetSizer(mainSizer);
+			mainSizer->Fit(this->m_PanelUp);
+			mainSizer->SetSizeHints(this->m_PanelUp);
+
+			//Bottom Panel
+			this->m_AuiManager->AddPane(this->m_EventPanel,
+					wxAuiPaneInfo().Name(_T("EventPanel")).Caption(_("EventPanel")).CaptionVisible(
+							true).MinimizeButton().MaximizeButton().CloseButton(false).Center().Resizable(
+							true));
+			//Top Panel
+			this->m_AuiManager->AddPane(this->m_PanelUp,
+					wxAuiPaneInfo().Name(_T("ListContainerPanel")).DefaultPane().Caption(
+							_("ListContainerPanel")).PinButton().CaptionVisible(true).CloseButton(
+							false).Center().Resizable(true));
+
+			this->Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+					wxCommandEventHandler(PanelButtonContainer::OnConfigButton));
 
 		}
+		else if (type == 3)
+		{
+			//MLER
+			TConcreteFunctor* lFunctor = new TConcreteFunctor(this,
+			&PanelButtonContainer::GenericListEvent);
+
+			this->m_EventPanel = new wxPanel(this);
+			std::cout << "MLER Type 3; new ComboBox" << std::endl;
 
+			this->m_ComboBoxPanel = new ComboBox(this, -1,
+			this->m_ButtonContainerSettings->GetItemsVector(), lFunctor);
 
-		//MLER
+			//Bottom Panel
+			this->m_AuiManager->AddPane(this->m_EventPanel,
+				wxAuiPaneInfo().Name(_T("EventPanel")).Caption(_("EventPanel")).CaptionVisible(
+				true).MinimizeButton().MaximizeButton().CloseButton(false).Center().Resizable(
+				true));
+			//Top Panel
+			this->m_AuiManager->AddPane(this->m_ComboBoxPanel,
+				wxAuiPaneInfo().Name(_T("ComboBoxContainerPanel")).DefaultPane().Caption(
+				_("ComboBoxContainerPanel")).PinButton().CaptionVisible(true).CloseButton(
+				false).Center().Resizable(true));
+		}
+		//End MLER
 
 		this->m_AuiManager->Update();
 	}
@@ -180,6 +258,34 @@ namespace creaPanelButtonContainer
 		}							//hctac
 	}
 
+// ----------------------------------------------------------------------------------
+	void PanelButtonContainer::OnConfigButton(wxCommandEvent& event)
+	{
+
+		this->m_ListConfigDialog = new ListConfigDialog(this, -1, _("Settings"),
+				this->m_ListWxPanel, this->m_CurrentWxPanel);
+
+		std::cout << "Button Event" << std::endl;
+
+		this->m_EventPanel->Show(false);
+
+		this->m_ListConfigDialog->ShowModal();							//Show Dialog
+		this->m_CurrentWxPanel->Reparent(this->m_PanelUp);
+		this->m_CurrentWxPanel->Show(true);
+		this->m_CurrentWxPanel->SetFunctorEnabled(true);
+
+		this->m_CurrentWxPanel->GetListBox()->Deselect(
+				this->m_CurrentWxPanel->GetListBox()->GetSelection()); //Deselected item
+		this->m_CurrentWxPanel->Update();
+		this->m_ListWxPanel->Show(false);
+		this->m_EventPanel->Show(false);
+		this->m_EventPanel = this->m_EmptyPanel; //Management Empty Panel
+
+		this->m_AuiManager->GetPane(_T("EventPanel")).window = this->m_EventPanel;
+		this->m_AuiManager->Update();
+
+	}
+	//End MLER
 // ----------------------------------------------------------------------------------
 
 }//ecapseman