From: espinosa <espinosa@creatis.insa-lyon.fr>
Date: Mon, 26 Jan 2015 15:13:00 +0000 (+0100)
Subject: #2516 creaMaracasVisu Feature New Normal  -  creaPanelButtonContainer ListPanel with... 
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaMaracasVisu.git;a=commitdiff_plain;h=8f1f70ffb361d0ccde7da40ff128cebdcfcf3f13

#2516 creaMaracasVisu Feature New Normal  -  creaPanelButtonContainer ListPanel with events 2
---

diff --git a/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx b/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
index 882d3d0..3386357 100644
--- a/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
+++ b/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
@@ -74,7 +74,7 @@ void PanelButtonContainer::CreateWidget( wxWindow* parent )
 void
 PanelButtonContainer::bbUserSetDefaultValues( )
 {
-   bbSetInputType("0");
+   bbSetInputType(0);
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h
index 2302977..05c326f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h
@@ -154,9 +154,6 @@ namespace creaButtonContainer
 				void
 				AddButtons( BCStructVectorType infoList );
 
-				// ----------------------------------------------------------------------------------
-				AddItems( BCStructVectorType infoList );*/
-
 				// ----------------------------------------------------------------------------------
 				// ----------------------------------------------------------------------------------
 			private:
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
index e93c87a..7f96dcf 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
@@ -281,9 +281,6 @@ namespace creaPanelButtonContainer
 		}//hctac
 	}
 
-
-//EED-MLER
-/*
 	void
 	ButtonContainerSettings::AddItems(BCPSettingsStruct* info)
 	{
@@ -307,24 +304,6 @@ namespace creaPanelButtonContainer
 		}//yrt
 		catch ( const std::exception& e )
 		{
-<<<<<<< HEAD
-			try
-			{
-				for( BCStructVectorType::iterator it = infoList.begin( ); it
-				    != infoList.end( ); ++it )
-				{
-					this->AddItem(*it);
-				}//rof
-			}//yrt
-			catch ( const std::exception& e )
-			{
-				std::cerr
-			    << "ContainerSettings::AddButtons( BCStructVectorType infoList ) "
-			    << "exception: " << e.what( ) << std::endl;
-			}//hctac
-		}
-*/
-=======
 			std::cerr
 			<< "ButtonContainerSettings::AddButton( BCPSettingsStruct* info )"
 			<< "exception: " << e.what( ) << std::endl;
@@ -339,8 +318,6 @@ namespace creaPanelButtonContainer
 		return m_itemsMap;
 	}
 
->>>>>>> b8c5a565c70ac0def1f21518afa2d847a9582d79
 
 // ----------------------------------------------------------------------------------
 }//ecapseman
-
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
index 9f3e524..bb00f7d 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
@@ -35,7 +35,7 @@
 
 #include <wx/panel.h>
 #include <wx/bitmap.h>
-//EED-MLER #include <wx/listctrl.h>
+#include <wx/listctrl.h>
 
 #include <list>
 #include <map>
@@ -126,9 +126,7 @@ namespace creaPanelButtonContainer
 			 *	@brief This class contains the settings of the button container.
 			 */
 
-
 			typedef std::map< std::string, wxPanel* > ItemsMap;
-
 		public:
 			// ----------------------------------------------------------------------------------
 			/*! @fn ButtonContainerSettings( );
@@ -234,15 +232,23 @@ namespace creaPanelButtonContainer
 			void
 			AddButtons( BCStructVectorType infoList, int type );
 
+			void
+			AddItems(BCPSettingsStruct* info);
+
+			ItemsMap
+			GetItemsMap();
+
+			PanelButton
+			GetPanelList( const StringType &buttonName );
+
+
 			// ----------------------------------------------------------------------------------
 		private:
 			ButtonGroupMap m_ButtonGroupContainer; //!<This is the map with the groups of buttons.
 			KeyMapList m_GroupNameList; //!<This is a container with the name of the groups.
 
-
 			//MLER
 			ItemsMap m_itemsMap; //This is the map with the name and the wPanel
 		};
-
 }//ecapseman
 #endif /* BUTTONCONTAINERSETTINGS_H_ */