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

Suppression des textes descriptifs des boutons

Browse Source 
Opitimisation mémoire
Fix' README
Changement de couleurs pour les icônes vertes qui rendaient pas
This commit is contained in:
HorlogeSkynet
2017-01-26 17:48:47 +01:00
parent 485642cf6c
commit 11507f66bc
13 changed files with 34 additions and 48 deletions

54
Controleur/menu.c

@ -19,7 +19,6 @@ void detruireBouton(Bouton *const bouton)
{
sfSprite_destroy(bouton->spriteButton);
sfTexture_destroy(bouton->textureButton);
sfText_destroy(bouton->textButton);
}
@ -54,25 +53,18 @@ Tool whichTool(const sfEvent *const event, const Menu *const menu)
}
void ajouterEntreeMenu(Menu *const menu, Bouton *const bouton, const sfFont *const font)
void ajouterEntreeMenu(Menu *const menu, Bouton *const bouton)
{
if(menu->sommetTableau < MAXBUTTONSMENU - 1)
{
menu->liste[++menu->sommetTableau] = bouton;
menu->liste[menu->sommetTableau]->zone = (Rectangle){{WIDTH, menu->sommetTableau * RATIOMENU}, {WIDTH + MENUWIDTH, (menu->sommetTableau + 1) * RATIOMENU}};
menu->liste[menu->sommetTableau]->zone = (Rectangle){{WIDTH, menu->sommetTableau * (RATIOMENU + BUTTONGAP)}, {WIDTH + MENUWIDTH, (menu->sommetTableau + 1) * RATIOMENU}};
sfSprite_setPosition(menu->liste[menu->sommetTableau]->spriteButton, (sfVector2f){0.0, menu->sommetTableau * RATIOMENU});
sfSprite_setPosition(menu->liste[menu->sommetTableau]->spriteButton, (sfVector2f){0.0, menu->sommetTableau * (RATIOMENU + BUTTONGAP)});
sfRenderTexture_drawSprite(menu->renderTextureMenu, menu->liste[menu->sommetTableau]->spriteButton, NULL);
// TO DO: POSITION TEXTE À CALCULER !!!
sfText *texte = creerTexte((sfVector2f){0.0, 0.0}, menu->liste[menu->sommetTableau]->nom, font, 8, sfBlack);
sfRenderTexture_drawText(menu->renderTextureMenu, texte, NULL);
sfRenderTexture_display(menu->renderTextureMenu);
// On sauvegarde aussi l'adresse du texte
menu->liste[menu->sommetTableau]->textButton = texte;
}
else
@ -85,57 +77,49 @@ void ajouterEntreeMenu(Menu *const menu, Bouton *const bouton, const sfFont *con
void chargerMenuAffichageLog(Menu *const menu, const Mode mode, const bool displayEnded)
{
sfFont *font = loadFontFromFile(REGULARFONTPATH);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_EXIT, "Quitter", "Vue/Ressources/Icones/exit.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_BACKTOHOME, "Menu", "Vue/Ressources/Icones/home.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_EXIT, "Quitter", "Vue/Ressources/Icones/exit.png"));
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_BACKTOHOME, "Menu", "Vue/Ressources/Icones/home.png"));
if(displayEnded)
{
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_ZOOMPREV, "Zoom precedent", "Vue/Ressources/Icones/back.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_ZOOMZONE, "Zoomer zone", "Vue/Ressources/Icones/zoom-in.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_ZOOMNEXT, "Zoom suivant", "Vue/Ressources/Icones/next.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_CHANGEMAP, "Changer fond", "Vue/Ressources/Icones/layers.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_SELECTPOINTS, "Selectionne zone", "Vue/Ressources/Icones/hide.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_CENTERPOSITION, "Recentrer", "Vue/Ressources/Icones/target.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_ZOOMPREV, "Zoom precedent", "Vue/Ressources/Icones/back.png"));
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_ZOOMZONE, "Zoomer zone", "Vue/Ressources/Icones/zoom-in.png"));
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_ZOOMNEXT, "Zoom suivant", "Vue/Ressources/Icones/next.png"));
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_CHANGEMAP, "Changer fond", "Vue/Ressources/Icones/layers.png"));
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_SELECTPOINTS, "Selectionne zone", "Vue/Ressources/Icones/hide.png"));
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_CENTERPOSITION, "Recentrer", "Vue/Ressources/Icones/target.png"));
if(mode != MODE_GLOBAL)
{
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_REPEAT, "Repeter", "Vue/Ressources/Icones/repeat.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_REPEAT, "Repeter", "Vue/Ressources/Icones/repeat.png"));
}
else
{
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_TOGGLEAGGLO, "Agglomerats", "Vue/Ressources/Icones/push-pin.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_TOGGLEAGGLO, "Agglomerats", "Vue/Ressources/Icones/push-pin.png"));
}
}
else
{
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_CANCEL, "Stopper", "Vue/Ressources/Icones/multiply.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_CANCEL, "Stopper", "Vue/Ressources/Icones/multiply.png"));
if(mode == MODE_PBP_AUTOMATIC)
{
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_RESUME, "Continuer", "Vue/Ressources/Icones/play-button.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_PAUSE, "Pause", "Vue/Ressources/Icones/pause.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_RESUME, "Continuer", "Vue/Ressources/Icones/play-button.png"));
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_PAUSE, "Pause", "Vue/Ressources/Icones/pause.png"));
}
else if(mode == MODE_PBP_MANUAL)
{
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_CONTINUE, "Suivant", "Vue/Ressources/Icones/fast-forward.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_CONTINUE, "Suivant", "Vue/Ressources/Icones/fast-forward.png"));
}
}
sfFont_destroy(font);
}
void chargerMenuYesNoQuestion(Menu *const menu)
{
sfFont *font = loadFontFromFile(REGULARFONTPATH);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_ACCEPT, "Oui", "Vue/Ressources/Icones/checked.png"), font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_CANCEL, "Non", "Vue/Ressources/Icones/multiply.png"), font);
sfFont_destroy(font);
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_ACCEPT, "Oui", "Vue/Ressources/Icones/checked.png"));
ajouterEntreeMenu(menu, loadButtonMenu(TOOL_CANCEL, "Non", "Vue/Ressources/Icones/multiply.png"));
}

3
Controleur/menu.h

@ -43,10 +43,9 @@ Tool whichTool(const sfEvent *const event, const Menu *const menu);
*
* @param menu Le menu dans lequel on ajoute cette entrée.
* @param bouton Le bouton a ajouter qui représente cette entrée.
* @param font La fonte à utiliser pour écrire le `nom` du bouton !
* @return Procédure.
*/
void ajouterEntreeMenu(Menu *const menu, Bouton *const bouton, const sfFont *const font);
void ajouterEntreeMenu(Menu *const menu, Bouton *const bouton);
/**
* @brief Charge une instance de Menu avec certains boutons.

6
Controleur/waiting.c

@ -59,7 +59,7 @@ Rectangle waitingOnMap(sfRenderWindow *const window, sfEvent *const event, sfRen
sfRenderTexture_clear(renderTexture, sfWhite);
renderSprite = loadSpriteFromTexture((sfVector2f){0.0, 0.0}, originalTexture);
sfRenderTexture_drawSprite(renderTexture, renderSprite, NULL);
afficherDateCurseur(event, renderTexture, &renderSprite, nbPointsAffiches, tabPointeursCercles, tabDatesConverties, font);
displayBackgroundSprite(window, renderSprite);
@ -181,6 +181,7 @@ Rectangle waitingOnMapEvent(sfRenderWindow *const window, sfEvent *const event,
else if((event->type == sfEvtMouseButtonPressed && event->mouseButton.button == sfMouseXButton2) || sfKeyboard_isKeyPressed(sfKeyN))
{
*action = ACTION_ZOOM_NEXT;
sfTexture_destroy(originalTexture);
break;
}
@ -258,6 +259,7 @@ Rectangle waitingOnMapEvent(sfRenderWindow *const window, sfEvent *const event,
if(carre.positionHG.x != 0.0 && carre.positionHG.y != 0.0 && carre.positionBD.x != 0.0 && carre.positionBD.y != 0.0)
{
*action = ACTION_ZOOM_ZONE;
sfTexture_destroy(originalTexture);
return carre;
}
}
@ -312,6 +314,8 @@ Rectangle waitingOnMapEvent(sfRenderWindow *const window, sfEvent *const event,
}
}
sfTexture_destroy(originalTexture);
// On retourne un Rectangle nul, mais c'est la valeur de `action` qui importe le plus ici.
return (Rectangle){{0.0, 0.0}, {0.0, 0.0}};
}

3
Headers/constantes.h

@ -80,3 +80,6 @@
// La taille du nom maximum pour une entrée du menu
#define BUTTONAMESIZE 16
// Un écart à placer entre chaque bouton
#define BUTTONGAP 10

1
Headers/structures.h

@ -103,7 +103,6 @@ typedef struct
char nom[BUTTONAMESIZE];
sfSprite *spriteButton;
sfTexture *textureButton;
sfText *textButton;
} Bouton;
typedef struct

12
README.md

@ -8,14 +8,14 @@
* CSFML 2.3
* libcurl >= 7.38.0-4
→ `# aptitude install git gcc libsfml-dev libcsfml-dev libcurl4-gnutls-dev`
→ `# aptitude install git gcc libsfml-dev libcsfml-dev libcurl4-gnutls-dev`
## How to get, build and run the project ?
`$ git clone https://github.com/HorlogeSkynet/GINPA.git`
`$ cd GINPA/`
`$ chmod +x install_workenv.sh && ./install_workenv.sh`
`$ make && ./bin/Release/GINPA`
`$ git clone https://github.com/HorlogeSkynet/GINPA.git`
`$ cd GINPA/`
`$ chmod +x install_workenv.sh && ./install_workenv.sh`
`$ make && ./bin/Release/GINPA`
### Which type of data the project uses ?
@ -25,7 +25,7 @@ _GINPA_ may compute incredible results after having parsed files logs, with line
* `tttttttttt` represents the number of seconds since [Epoch](https://fr.wikipedia.org/wiki/Epoch) of a point
* `xx.xxxxxx` the latitude of a point
* `yy.yyyyyy` the longitude of a position
* `yy.yyyyyy` the longitude of a point
#### Resources & Acknowledgments

BIN
Vue/Ressources/Icones/add.png

Binary file not shown.
Side by Side

Before

(image error) Size: 5.7 KiB

BIN
Vue/Ressources/Icones/checked.png

Binary file not shown.
Side by Side Swipe Overlay

Before

(image error) Size: 3.7 KiB

After

(image error) Size: 3.7 KiB

BIN
Vue/Ressources/Icones/exit.png

Binary file not shown.
Side by Side Swipe Overlay

Before

(image error) Size: 5.6 KiB

After

(image error) Size: 4.6 KiB

BIN
Vue/Ressources/Icones/locked.png

Binary file not shown.
Side by Side Swipe Overlay

Before

(image error) Size: 5.5 KiB

After

(image error) Size: 7.9 KiB

BIN
Vue/Ressources/Icones/play-button.png

Binary file not shown.
Side by Side Swipe Overlay

Before

(image error) Size: 12 KiB

After

(image error) Size: 12 KiB

BIN
Vue/Ressources/Icones/plus.png Normal file

Binary file not shown.
Side by Side

After

(image error) Size: 10 KiB

3
Vue/chargement.c

@ -104,8 +104,5 @@ Bouton* loadButtonMenu(const Tool outil, const char *const nom, const char *cons
// On n'oublie pas non plus de sauvegarder en mémoire l'adresse dela texture créée (histoire de la supprimer dans le futur)
button->textureButton = texture;
// ... et il reste encore un pointeur non-initialisé
button->textButton = NULL;
return button;
}