From: davila <eduardo.davila@creatis.insa-lyon.fr>
Date: Mon, 26 Jan 2015 13:33:21 +0000 (+0100)
Subject: #2507 creaMaracasVisu Feature New Normal  -  creaPanelButtonContainer ListPanel
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e1c23d053ffe93035f13802efdb19dc116e4b46c;hp=b8c5a565c70ac0def1f21518afa2d847a9582d79;p=creaMaracasVisu.git

#2507 creaMaracasVisu Feature New Normal  -  creaPanelButtonContainer ListPanel
---

diff --git a/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx b/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
index 85f630b..882d3d0 100644
--- a/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
+++ b/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
@@ -46,7 +46,6 @@ PanelButtonContainer::Process( )
 
 	  settings->AddButtons(bbGetInputIn( ), bbGetInputType());
 
-
 	
 	PBContainer* panel = new PBContainer( myPanel, settings, bbGetInputType() );
 	wxBoxSizer* sizer  = new wxBoxSizer( wxHORIZONTAL );
@@ -75,7 +74,7 @@ void PanelButtonContainer::CreateWidget( wxWindow* parent )
 void
 PanelButtonContainer::bbUserSetDefaultValues( )
 {
-
+   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/ThresholdImageView/ColorLayerImageView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
index cbba163..515784a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
@@ -345,7 +345,7 @@ void ColorLayerImageView::ConfigLookupTable()  // virtual
       delta = GetGreyLevelBoundaries(1) - GetGreyLevelBoundaries(0);
       for (int ii = 1; ii <= delta ; ii++)
 	{
-	  thresholdTable->SetTableValue( GetGreyLevelBoundaries(0) + ii, GetBaseColors(0) * ii/delta,
+	  thresholdTable->SetTableValue( (GetGreyLevelBoundaries(0) + ii), GetBaseColors(0) * ii/delta,
 					 GetBaseColors(1) * ii/delta, GetBaseColors(2) * ii/delta, 1);
 	}
 	    
@@ -359,7 +359,7 @@ void ColorLayerImageView::ConfigLookupTable()  // virtual
 	      for (int ii = 1; ii <= delta; ii++)
 		{
 		  // Color computation : previous_color + (current_color - previous_color)/delta * ii
-		  thresholdTable->SetTableValue(GetGreyLevelBoundaries(i) + ii,
+		  thresholdTable->SetTableValue((GetGreyLevelBoundaries(i) + ii),
 						GetBaseColors((i-1)*3) + (GetBaseColors(i*3) - GetBaseColors((i-1)*3)) / delta * ii , 
 						GetBaseColors((i-1)*3 + 1) + (GetBaseColors(i*3 + 1) - GetBaseColors((i-1)*3 + 1)) / delta * ii ,
 						GetBaseColors((i-1)*3 + 2) + (GetBaseColors(i*3 + 2) - GetBaseColors((i-1)*3 + 2)) / delta * ii ,
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
index 7b640cd..45d2932 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
@@ -79,6 +79,7 @@ namespace creaButtonContainer
 		// ----------------------------------------------------------------------------------
 
 
+
 		void
 		ContainerSettings::AddButton( const StringType & groupName,
 		    const StringType &buttonName, const wxBitmap &icon,
@@ -164,7 +165,6 @@ namespace creaButtonContainer
 			}//hctac
 		}
 
-
 	// ----------------------------------------------------------------------------------
 	}//ecapseman
 }//ecapseman
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 7aa3dc5..2302977 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.h
@@ -35,7 +35,7 @@
 
 #include <vector>
 #include <wx/bitmap.h>
-#include <wx/listctrl.h>
+//EED-MLER  #include <wx/listctrl.h>
 
 #include "structBCSettings.h"
 #include "system.h"
@@ -107,6 +107,8 @@ namespace creaButtonContainer
 				 */
 				void
 				SetButtonGroupContainer( ButtonGroupMap bgContainer );
+
+
 				// ----------------------------------------------------------------------------------
 				/*! void ContainerSettings::SetGroupNameList( KeyMapList gNameList )
 				 * @brief This method sets a container with the name of the groups.
@@ -153,13 +155,6 @@ namespace creaButtonContainer
 				AddButtons( BCStructVectorType infoList );
 
 				// ----------------------------------------------------------------------------------
-			/*	void
-				AddItem(const StringType & groupName);
-
-				void
-				AddItem( BCSettingsStruct* info );
-
-				void
 				AddItems( BCStructVectorType infoList );*/
 
 				// ----------------------------------------------------------------------------------
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/listGroupFactory.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/listGroupFactory.cxx
index 54559d9..91df61b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/listGroupFactory.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/listGroupFactory.cxx
@@ -91,3 +91,4 @@ namespace creaButtonContainer
 	}//ecapseman
 }//ecapseman*/
 
+
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h
index 7473726..987a565 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/system.h
@@ -43,7 +43,9 @@
 
 namespace creaButtonContainer
 {
+
 	//using namespace view;
+
 	// ----------------------------------------------------------------------------------
 	/*!	@typedef std::string* StringType;
 	 *	@brief Defines the StringType type.
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h
index 7696062..5e14541 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.h
@@ -46,8 +46,8 @@
 #include "buttonGroupFactory.h"
 #include "containerSettings.h"
 #include "buttonContainerController.h"
-#include "listGroup.h"
-#include "listGroupFactory.h"
+//EED-MLER #include "listGroup.h"
+//EED-MLER #include "listGroupFactory.h"
 
 /*!	@namespace <creaButtonContainer>
  *	@brief Contains the creaButtonContainer library included in creaMaracasVisu.
@@ -133,6 +133,7 @@ namespace creaButtonContainer
 				typedef creaButtonContainer::controller::ButtonContainerController
 				    BCController;
 
+
 				//typedef creaButtonContainer::model::ListGroupFactory ListGroupFactory;
 
 				//typedef creaButtonContainer::view::ListGroup ListGroup;
@@ -141,6 +142,7 @@ namespace creaButtonContainer
 
 				//typedef creaButtonContainer::model::ListGroupFactory ListGroupFactory;
 
+
 				// ----------------------------------------------------------------------------------
 				//end of typedef definition
 			public:
@@ -184,12 +186,14 @@ namespace creaButtonContainer
 			public:
 				friend class creaButtonContainer::controller::ButtonContainerController;
 			private:
-				GroupManagerList m_GroupManagerList; //!<The container of managers.
-				ButtonGroupList m_ButtonGroupList; //!<The list of button groups.
-				BCController* m_ButtonCController; //!<Pontier to controller.
-				Sizer* m_Sizer; //!<Pointer to wxSizer
+				GroupManagerList 	m_GroupManagerList; //!<The container of managers.
+				ButtonGroupList 	m_ButtonGroupList; //!<The list of button groups.
+				BCController* 		m_ButtonCController; //!<Pontier to controller.
+				Sizer* 				m_Sizer; //!<Pointer to wxSizer
+
 
 				//ListGroupList m_ListGroupList;
+
 			DECLARE_EVENT_TABLE() //!<Event Table declaration.
 		};
 	}//ecapseman
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listGroup.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listGroup.cxx
index 9ba6cee..04686b0 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listGroup.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listGroup.cxx
@@ -94,3 +94,5 @@ namespace creaButtonContainer
 	// ----------------------------------------------------------------------------------
 	}//ecapseman
 }//ecapseman*/
+
+
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 9fd986b..5de552c 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listWx.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/listWx.cxx
@@ -24,6 +24,7 @@
 # ------------------------------------------------------------------------ */
 
 
+
 #include "listWx.h"
 
 namespace creaButtonContainer
@@ -82,3 +83,5 @@ namespace creaButtonContainer
 	// ----------------------------------------------------------------------------------
 	}//ecapseman
 }//ecapseman
+
+
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
index cc82378..e93c87a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
@@ -281,6 +281,9 @@ namespace creaPanelButtonContainer
 		}//hctac
 	}
 
+
+//EED-MLER
+/*
 	void
 	ButtonContainerSettings::AddItems(BCPSettingsStruct* info)
 	{
@@ -304,6 +307,24 @@ 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;
@@ -318,6 +339,7 @@ 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 bb00f7d..9f3e524 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>
-#include <wx/listctrl.h>
+//EED-MLER #include <wx/listctrl.h>
 
 #include <list>
 #include <map>
@@ -126,7 +126,9 @@ namespace creaPanelButtonContainer
 			 *	@brief This class contains the settings of the button container.
 			 */
 
+
 			typedef std::map< std::string, wxPanel* > ItemsMap;
+
 		public:
 			// ----------------------------------------------------------------------------------
 			/*! @fn ButtonContainerSettings( );
@@ -232,23 +234,15 @@ 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_ */