settings->AddButtons(bbGetInputIn( ), bbGetInputType());
-
PBContainer* panel = new PBContainer( myPanel, settings, bbGetInputType() );
wxBoxSizer* sizer = new wxBoxSizer( wxHORIZONTAL );
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)
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);
}
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 ,
// ----------------------------------------------------------------------------------
+
void
ContainerSettings::AddButton( const StringType & groupName,
const StringType &buttonName, const wxBitmap &icon,
}//hctac
}
-
// ----------------------------------------------------------------------------------
}//ecapseman
}//ecapseman
#include <vector>
#include <wx/bitmap.h>
-#include <wx/listctrl.h>
+//EED-MLER #include <wx/listctrl.h>
#include "structBCSettings.h"
#include "system.h"
*/
void
SetButtonGroupContainer( ButtonGroupMap bgContainer );
+
+
// ----------------------------------------------------------------------------------
/*! void ContainerSettings::SetGroupNameList( KeyMapList gNameList )
* @brief This method sets a container with the name of the groups.
AddButtons( BCStructVectorType infoList );
// ----------------------------------------------------------------------------------
- /* void
- AddItem(const StringType & groupName);
-
- void
- AddItem( BCSettingsStruct* info );
-
- void
AddItems( BCStructVectorType infoList );*/
// ----------------------------------------------------------------------------------
}//ecapseman
}//ecapseman*/
+
namespace creaButtonContainer
{
+
//using namespace view;
+
// ----------------------------------------------------------------------------------
/*! @typedef std::string* StringType;
* @brief Defines the StringType type.
#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.
typedef creaButtonContainer::controller::ButtonContainerController
BCController;
+
//typedef creaButtonContainer::model::ListGroupFactory ListGroupFactory;
//typedef creaButtonContainer::view::ListGroup ListGroup;
//typedef creaButtonContainer::model::ListGroupFactory ListGroupFactory;
+
// ----------------------------------------------------------------------------------
//end of typedef definition
public:
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
// ----------------------------------------------------------------------------------
}//ecapseman
}//ecapseman*/
+
+
# ------------------------------------------------------------------------ */
+
#include "listWx.h"
namespace creaButtonContainer
// ----------------------------------------------------------------------------------
}//ecapseman
}//ecapseman
+
+
}//hctac
}
+
+//EED-MLER
+/*
void
ButtonContainerSettings::AddItems(BCPSettingsStruct* info)
{
}//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;
return m_itemsMap;
}
+>>>>>>> b8c5a565c70ac0def1f21518afa2d847a9582d79
// ----------------------------------------------------------------------------------
}//ecapseman
#include <wx/panel.h>
#include <wx/bitmap.h>
-#include <wx/listctrl.h>
+//EED-MLER #include <wx/listctrl.h>
#include <list>
#include <map>
* @brief This class contains the settings of the button container.
*/
+
typedef std::map< std::string, wxPanel* > ItemsMap;
+
public:
// ----------------------------------------------------------------------------------
/*! @fn ButtonContainerSettings( );
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_ */
git://git.creatis.insa-lyon.fr / creaMaracasVisu.git / commitdiff