X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FlistWx.cxx;h=4e6bb47b3df733850ab1478944d9a32d871dc583;hb=05c4abbebf824bbbbaaab135acf6c888662dff69;hp=868e331da4a37f8e2c5ed888493d8fc2b34a47b6;hpb=ff116b1d805145619b44879358f1fa8521ef5569;p=creaMaracasVisu.git

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 868e331..4e6bb47 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listWx.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listWx.cxx
@@ -1,28 +1,27 @@
 /*# ---------------------------------------------------------------------
-#
-# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
-#                        pour la Sant�)
-# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-# Previous Authors : Laurent Guigues, Jean-Pierre Roux
-# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
-#
-#  This software is governed by the CeCILL-B license under French law and
-#  abiding by the rules of distribution of free software. You can  use,
-#  modify and/ or redistribute the software under the terms of the CeCILL-B
-#  license as circulated by CEA, CNRS and INRIA at the following URL
-#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-#  or in the file LICENSE.txt.
-#
-#  As a counterpart to the access to the source code and  rights to copy,
-#  modify and redistribute granted by the license, users are provided only
-#  with a limited warranty  and the software's author,  the holder of the
-#  economic rights,  and the successive licensors  have only  limited
-#  liability.
-#
-#  The fact that you are presently reading this means that you have had
-#  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------ */
-
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la Sant�)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
 
 #include "listWx.h"
 
@@ -31,39 +30,113 @@ namespace creaButtonContainer
 	namespace view
 	{
 		// ----------------------------------------------------------------------------------
-		ListWx::ListWx( wxWindow* parent, wxWindowID id, ItemsMap iMap , TFunctor* functor ): wxListCtrl(parent,id)
+
+		ListWx::ListWx(wxWindow* parent, wxWindowID id, ItemsVector iVector,
+				TFunctor* functor)
+				: wxPanel(parent, id)
 		{
-			this->m_itemsMap = iMap;
-			this->functor = functor;
-			for (ItemsMap::iterator it=this->m_itemsMap.begin(); it!=this->m_itemsMap.end(); ++it)
+
+			this->m_Functor = functor;
+
+			wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
+
+			this->SetSizer(sizer);
+
+			this->m_ListBox = new wxListBox(this, -1);
+			this->m_FunctorEnabled = true;
+
+			this->Connect(wxEVT_COMMAND_LISTBOX_SELECTED,
+					wxCommandEventHandler(ListWx::OnListEvent));
+
+			if (!iVector.empty())
 			{
-				std::string key = it->first;
-				long index = this->InsertItem(0,  wxString::From8BitData(key.c_str()));
-				//this->Connect( index, wxEVT_LIST_ITEM_SELECTED,
-					//					    (wxObjectEventFunction) &ListWx::ButtonEvent );
+				for (ItemsVector::iterator it = iVector.begin(); it != iVector.end();
+						++it)
+				{
+					std::string key = it->first;
+					this->m_ListBox->Append(wxString(key.c_str(), wxConvUTF8));
+				}
 			}
+
+			sizer->Add(this->m_ListBox, 1, wxGROW);
+
 		}
+		// ----------------------------------------------------------------------------------
+
+		ListWx::ListWx(wxWindow* parent, wxWindowID id, TFunctor* functor)
+				: wxPanel(parent, id)
+		{
+			this->m_Functor = functor;
+
+			wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
+
+			this->SetSizer(sizer);
 
+			this->m_ListBox = new wxListBox(this, -1);
+			this->m_FunctorEnabled = true;
+
+			this->Connect(wxEVT_COMMAND_LISTBOX_SELECTED,
+					wxCommandEventHandler(ListWx::OnListEvent));
+
+			sizer->Add(this->m_ListBox, 1, wxGROW);
+
+		}
 		// ----------------------------------------------------------------------------------
-		ListWx::~ListWx( )
+
+		ListWx::~ListWx()
 		{
+
 		}
 
-		void
-		ListWx::ButtonEvent( wxCommandEvent& event )
+		// ----------------------------------------------------------------------------------
+
+		void ListWx::OnListEvent(wxCommandEvent& event)
 		{
-			try
+			if (!this->IsFunctorEnabled())
+				return;
+			else
 			{
-				//MLDR - Aqui necesita el nombre de la funcion para poderla ejecutar
-				this->functor->Call("PanelButtonContainer::GenericButtonEvent");
-			}//yrt
-			catch ( const std::exception& e )
-			{
-				std::cerr
-				    << "ButtonContainerController::ButtonEvent( wxCommandEvent& event ) exception: "
-				    << e.what( ) << std::endl;
-			}//hctac
+				try
+				{
+					std::cout << "MLER | ListWx::OnListEvent( wxListEvent& event )"
+							<< std::endl;
+
+					int iSelection;
+					iSelection = this->m_ListBox->GetSelection();
+
+					wxString itemNom = this->m_ListBox->GetString(iSelection);
+					std::string itemNomC = std::string(itemNom.mb_str());
+
+					this->m_Functor->Call(itemNomC);
+
+				} //yrt
+				catch (const std::exception& e)
+				{
+					std::cerr
+							<< "ButtonContainerController::ButtonEvent( wxCommandEvent& event ) exception: "
+							<< e.what() << std::endl;
+				} //hctac
+			}
+		}
+		// ----------------------------------------------------------------------------------
+
+		void ListWx::SetFunctorEnabled(const bool& enabled)
+		{
+			this->m_FunctorEnabled = enabled;
+		}
+		// ----------------------------------------------------------------------------------
+		bool ListWx::IsFunctorEnabled() const
+		{
+			return this->m_FunctorEnabled;
 		}
-	// ----------------------------------------------------------------------------------
-	}//ecapseman
-}//ecapseman
+
+		// ----------------------------------------------------------------------------------
+		wxListBox*
+				ListWx::GetListBox() const
+				{
+					return this->m_ListBox;
+				}
+
+	} //ecapseman
+} //ecapseman
+