HorlogeSkynet/GINPA
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'origin/menu' of https://github.com/HorlogeSkynet/GINPA into origin/menu

Browse Source
This commit is contained in:
Tatiyk 2017-01-19 13:39:24 +01:00
commit 10f10f4802
4 changed files with 27 additions and 5 deletions

4
Controleur/controleAffichage.c

@ -9,7 +9,7 @@ Point** affichageLogs(sfRenderWindow *const window, sfRenderTexture *renderTextu
uint32_t nbPtsNonAffiches = 0;
uint32_t numAgglo = 0;
Point** tmpPtsAffiches=calloc(nbElements,sizeof(Point*));
Point** tmpPtsAffiches = calloc(nbElements, sizeof(Point*));
if(tmpPtsAffiches == NULL)
{
fprintf(stderr, "Stockage temporaire points affichés: %s\n", strerror(errno));
@ -88,7 +88,7 @@ Point** affichageLogs(sfRenderWindow *const window, sfRenderTexture *renderTextu
if(sfKeyboard_isKeyPressed(sfKeyBack))
{
Point ** ptsAffiches = copieTabPointeurPt(tmpPtsAffiches, *nbPointsAffiches);
Point **ptsAffiches = copieTabPointeurPt(tmpPtsAffiches, *nbPointsAffiches);
free(tmpPtsAffiches);
return ptsAffiches;
}

8
Controleur/menu.c

@ -88,17 +88,21 @@ void chargerMenuAffichageLog(Menu *const menu, const Mode mode, const bool displ
{
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_ZOOMZONE, "Zoomer zone", "Vue/Ressources/Icones/zoom-in.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_SELECTPOINTS, "Selectionne zone", "Vue/Ressources/Icones/hide.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_CENTERPOSITION, "Recentrer", "Vue/Ressources/Icones/placeholder.png"), font);
if(mode != MODE_GLOBAL)
{
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_REPEAT, "Repeter", "Vue/Ressources/Icones/repeat.png"), font);
}
else
{
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_TOGGLEAGGLO, "Agglomerats", "Vue/Ressources/Icones/push-pin.png"), font);
}
}
else
{
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_CENTERPOSITION, "Recentrer", "Vue/Ressources/Icones/placeholder.png"), font);
if(mode == MODE_PBP_AUTOMATIC)
{
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_RESUME, "Continuer", "Vue/Ressources/Icones/play.png"), font);

18
Controleur/menu.h

@ -39,3 +39,21 @@ Tool whichTool(const sfEvent *const event, const Menu *const menu);
* @return Procédure.
*/
void ajouterEntreeMenu(Menu *const menu, BoutonMenu *const bouton, const sfFont *const font);
/**
* @brief Charge une instance de Menu avec certains boutons.
*
* @param menu Le menu à charger !
* @param mode Le mode dans lequel l'affichage des logs s'effectue.
* @param displayEnded Si oui ou non l'affichage des points est terminé.
* @return Procédure.
*/
void chargerMenuAffichageLog(Menu *const menu, const Mode mode, const bool displayEnded);
/**
* @brief Charge une instance de Menu avec un bouton Oui et un bouton Non.
*
* @param menu Le menu à charger !
* @return Procédure.
*/
void chargerMenuYesNoQuestion(Menu *const menu);

2
Headers/structures.h

@ -20,7 +20,7 @@ typedef enum {NO_ACTION, ACTION_QUIT, ACTION_ZOOM_NEXT, ACTION_ZOOM_PREV, ACTION
typedef enum {FIRSTYPE, ROADMAP, SATELLITE, TERRAIN, HYBRID, LASTYPE} MapType;
typedef enum {NO_TOOL, TOOL_EXIT, TOOL_BACKTOHOME, TOOL_ZOOMZONE, TOOL_SELECTPOINTS, TOOL_ADDLOGS, TOOL_ACCEPT, TOOL_CANCEL, TOOL_NEXT, TOOL_PREVIOUS, TOOL_PBP, TOOL_MODE_GLOBAL, TOOL_RESUME, TOOL_PAUSE, TOOL_CONTINUE, TOOL_CENTERPOSITION, TOOL_REPEAT} Tool;
typedef enum {NO_TOOL, TOOL_EXIT, TOOL_BACKTOHOME, TOOL_ZOOMZONE, TOOL_SELECTPOINTS, TOOL_ADDLOGS, TOOL_ACCEPT, TOOL_CANCEL, TOOL_NEXT, TOOL_PREVIOUS, TOOL_PBP, TOOL_MODE_GLOBAL, TOOL_RESUME, TOOL_PAUSE, TOOL_CONTINUE, TOOL_CENTERPOSITION, TOOL_REPEAT, TOOL_TOGGLEAGGLO} Tool;
typedef struct
{