Skip to content

Commit

Permalink
🐛 Correction sur le resultScreen
Browse files Browse the repository at this point in the history
  • Loading branch information
@ctruillet
ctruillet committed Apr 29, 2020
1 parent c33ea70 commit bbb1d0e
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion akela/data/descripteursTexte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
[./baseDeDocuments/Texte/15-Capturer_et_emprisonner_le_CO2,.xml;252]{CO2;21}{une;12}{climatique;3}{gaz;6}{effet;4}{par;8}{les;21}{dans;16}{des;13}{geologiques;4}{Meme;3}{pas;7}{certains;3}{sont;4}{devrait;4}{petrole;3}{charbon;4}{qui;13}{sur;4}{ces;4}{Les;3}{climat;3}{capture;6}{stockage;5}{indique;3}{que;7}{technologies;3}{plus;6}{cout;4}{est;6}{encore;3}{nest;4}{pour;5}{dune;3}{milliards;3}{tonnes;4}{aux;3}{comme;3}{procedes;3}{envisages;3}{tonne;4}{represente;3}{000;5}{Mais;3}!
[./baseDeDocuments/Texte/15-Capturer_et_emprisonner_le_CO.xml;251]{une;12}{climatique;3}{gaz;6}{effet;4}{par;8}{les;21}{dans;16}{des;13}{geologiques;4}{Meme;3}{pas;7}{certains;3}{sont;4}{devrait;4}{petrole;3}{charbon;4}{qui;13}{sur;4}{ces;4}{Les;3}{climat;3}{capture;6}{stockage;5}{CO2;20}{indique;3}{que;7}{technologies;3}{plus;6}{cout;4}{est;6}{encore;3}{nest;4}{pour;5}{dune;3}{milliards;3}{tonnes;4}{aux;3}{comme;3}{procedes;3}{envisages;3}{tonne;4}{represente;3}{000;5}{Mais;3}!
[./baseDeDocuments/Texte/15-Danse___Preljocaj_emmene_l_Opera.xml;60]{Preljocaj;5}{lOpera;4}{Paris;3}{par;4}{Angelin;3}{comme;3}{que;4}{des;9}{les;10}{corps;3}{ballet;3}{aussi;3}{est;3}{qui;3}!
[./baseDeDocuments/Texte/15-La_mort_de_Robert_Wise,.xml;223]{Robert;15}{Wise;13}{realisateur;4}{Side;5}{comme;3}{monteur;3}{avec;18}{Welles;4}{lui;6}{que;5}{septembre;3}{meme;3}{West;4}{Story;4}{film;14}{son;9}{films;4}{pour;12}{Ryan;4}{Chez;3}{Julie;3}{Melodie;3}{bonheur;3}{ans;4}{deux;4}{des;5}{plus;5}{succes;7}{pas;3}{ses;6}{les;4}{science;3}{fiction;3}{est;4}{dans;4}{RKO;4}{sur;3}{alors;3}{par;3}{scene;4}{dernier;3}{comedie;3}{musicale;3}!
[./baseDeDocuments/Texte/15-La_mort_de_Robert_Wise,.xml;220]{Robert;15}{Wise;13}{realisateur;4}{Side;5}{comme;3}{monteur;3}{avec;18}{Welles;4}{lui;6}{que;5}{septembre;3}{meme;3}{West;4}{Story;4}{film;14}{son;9}{films;4}{pour;12}{Ryan;4}{Chez;3}{Julie;3}{Melodie;3}{bonheur;3}{ans;4}{deux;4}{des;5}{plus;5}{succes;7}{pas;3}{ses;6}{les;4}{science;3}{fiction;3}{est;4}{dans;4}{RKO;4}{alors;3}{par;3}{scene;4}{dernier;3}{comedie;3}{musicale;3}!
[./baseDeDocuments/Texte/15-Le_Theatre_des_Champs-Elysees.xml;105]{2005;3}{Theatre;4}{des;13}{Champs;4}{Elysees;4}{travaux;4}{ont;4}{son;8}{salle;4}{concerts;3}{acoustique;5}{par;5}{les;6}{qui;5}{septembre;3}{reverberation;3}{dans;3}{scene;5}{bois;3}{theatre;3}{une;4}{etre;4}{que;5}!
[./baseDeDocuments/Texte/15-Lille_s_incline.xml;143]{Lille;6}{dans;6}{les;15}{secondes;3}{Benfica;4}{mercredi;4}{Ligue;3}{des;8}{champions;3}{sont;3}{aux;5}{ont;3}{fait;3}{Dans;3}{Claude;4}{Puel;4}{stade;3}{Bruges;3}{Juventus;4}{Turin;4}{Groupe;3}{Arsenal;3}{Thoune;3}{Manchester;3}{United;3}{match;3}{pas;7}{avons;3}{nous;4}{qui;4}{choses;3}{que;3}{Cest;3}{groupe;4}{pourtant;3}!
[./baseDeDocuments/Texte/15-_Si_on_veut_aller_trop.xml;218]{par;5}{veut;3}{nous;15}{selectionneur;4}{lequipe;7}{France;8}{que;10}{dans;8}{les;18}{six;3}{championnat;4}{pour;10}{ans;3}{est;3}{ete;3}{1998;3}{vous;3}{qui;6}{cest;6}{pas;19}{dire;3}{fait;6}{cette;5}{des;7}{basket;8}{fran�ais;3}{faute;3}{medias;3}{une;9}{NBA;3}{joueurs;5}{quand;3}{tres;3}{rugby;3}{avec;4}{sport;3}{message;3}{sur;3}!
Expand Down
2 changes: 1 addition & 1 deletion akela/data/user.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ admin
10
3
2
26
69
500
2 changes: 1 addition & 1 deletion impeesa/data/descripteursTexte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
[./baseDeDocuments/Texte/15-Capturer_et_emprisonner_le_CO2,.xml;252]{CO2;21}{une;12}{climatique;3}{gaz;6}{effet;4}{par;8}{les;21}{dans;16}{des;13}{geologiques;4}{Meme;3}{pas;7}{certains;3}{sont;4}{devrait;4}{petrole;3}{charbon;4}{qui;13}{sur;4}{ces;4}{Les;3}{climat;3}{capture;6}{stockage;5}{indique;3}{que;7}{technologies;3}{plus;6}{cout;4}{est;6}{encore;3}{nest;4}{pour;5}{dune;3}{milliards;3}{tonnes;4}{aux;3}{comme;3}{procedes;3}{envisages;3}{tonne;4}{represente;3}{000;5}{Mais;3}!
[./baseDeDocuments/Texte/15-Capturer_et_emprisonner_le_CO.xml;251]{une;12}{climatique;3}{gaz;6}{effet;4}{par;8}{les;21}{dans;16}{des;13}{geologiques;4}{Meme;3}{pas;7}{certains;3}{sont;4}{devrait;4}{petrole;3}{charbon;4}{qui;13}{sur;4}{ces;4}{Les;3}{climat;3}{capture;6}{stockage;5}{CO2;20}{indique;3}{que;7}{technologies;3}{plus;6}{cout;4}{est;6}{encore;3}{nest;4}{pour;5}{dune;3}{milliards;3}{tonnes;4}{aux;3}{comme;3}{procedes;3}{envisages;3}{tonne;4}{represente;3}{000;5}{Mais;3}!
[./baseDeDocuments/Texte/15-Danse___Preljocaj_emmene_l_Opera.xml;60]{Preljocaj;5}{lOpera;4}{Paris;3}{par;4}{Angelin;3}{comme;3}{que;4}{des;9}{les;10}{corps;3}{ballet;3}{aussi;3}{est;3}{qui;3}!
[./baseDeDocuments/Texte/15-La_mort_de_Robert_Wise,.xml;223]{Robert;15}{Wise;13}{realisateur;4}{Side;5}{comme;3}{monteur;3}{avec;18}{Welles;4}{lui;6}{que;5}{septembre;3}{meme;3}{West;4}{Story;4}{film;14}{son;9}{films;4}{pour;12}{Ryan;4}{Chez;3}{Julie;3}{Melodie;3}{bonheur;3}{ans;4}{deux;4}{des;5}{plus;5}{succes;7}{pas;3}{ses;6}{les;4}{science;3}{fiction;3}{est;4}{dans;4}{RKO;4}{sur;3}{alors;3}{par;3}{scene;4}{dernier;3}{comedie;3}{musicale;3}!
[./baseDeDocuments/Texte/15-La_mort_de_Robert_Wise,.xml;222]{Robert;15}{Wise;13}{realisateur;4}{Side;5}{comme;3}{monteur;3}{avec;18}{Welles;4}{lui;6}{que;5}{septembre;3}{meme;3}{West;4}{Story;4}{film;14}{son;9}{films;4}{pour;12}{Ryan;4}{Chez;3}{Julie;3}{Melodie;3}{bonheur;3}{ans;4}{deux;4}{des;5}{plus;5}{succes;7}{pas;3}{ses;6}{les;4}{science;3}{fiction;3}{dans;4}{est;3}{RKO;4}{sur;3}{alors;3}{par;3}{scene;4}{dernier;3}{comedie;3}{musicale;3}!
[./baseDeDocuments/Texte/15-Le_Theatre_des_Champs-Elysees.xml;105]{2005;3}{Theatre;4}{des;13}{Champs;4}{Elysees;4}{travaux;4}{ont;4}{son;8}{salle;4}{concerts;3}{acoustique;5}{par;5}{les;6}{qui;5}{septembre;3}{reverberation;3}{dans;3}{scene;5}{bois;3}{theatre;3}{une;4}{etre;4}{que;5}!
[./baseDeDocuments/Texte/15-Lille_s_incline.xml;143]{Lille;6}{dans;6}{les;15}{secondes;3}{Benfica;4}{mercredi;4}{Ligue;3}{des;8}{champions;3}{sont;3}{aux;5}{ont;3}{fait;3}{Dans;3}{Claude;4}{Puel;4}{stade;3}{Bruges;3}{Juventus;4}{Turin;4}{Groupe;3}{Arsenal;3}{Thoune;3}{Manchester;3}{United;3}{match;3}{pas;7}{avons;3}{nous;4}{qui;4}{choses;3}{que;3}{Cest;3}{groupe;4}{pourtant;3}!
[./baseDeDocuments/Texte/15-_Si_on_veut_aller_trop.xml;218]{par;5}{veut;3}{nous;15}{selectionneur;4}{lequipe;7}{France;8}{que;10}{dans;8}{les;18}{six;3}{championnat;4}{pour;10}{ans;3}{est;3}{ete;3}{1998;3}{vous;3}{qui;6}{cest;6}{pas;19}{dire;3}{fait;6}{cette;5}{des;7}{basket;8}{fran�ais;3}{faute;3}{medias;3}{une;9}{NBA;3}{joueurs;5}{quand;3}{tres;3}{rugby;3}{avec;4}{sport;3}{message;3}{sur;3}!
Expand Down
2 changes: 1 addition & 1 deletion impeesa/data/user.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ admin
10
3
2
26
69
500
6 changes: 3 additions & 3 deletions src/vue/HistoryScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ public void sauvegarderRecherche(Resultat recherche){
case TEXTE:
case IMAGE:
case AUDIO:
requete = recherche.getRequete().substring(recherche.getRequete().lastIndexOf('/')+1).toUpperCase();
requete = recherche.getRequete().substring(recherche.getRequete().lastIndexOf('/')+1);
break;
case COULEURDOMINANTE:
requete = "#"+recherche.getRequete().toUpperCase();
requete = "#"+recherche.getRequete();
break;
case MOTCLEF:
case MOTCLEF_COMPLEXE:
default:
requete = recherche.getRequete().toUpperCase();
requete = recherche.getRequete();
break;

}
Expand Down
2 changes: 1 addition & 1 deletion src/vue/LoginScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public LoginScreen(PApplet p) {
passwordBox = new Textbox(p.width / 2, p.height/2+20, p.width / 4, 30, "Mot de Passe", true, true, p);

validerButton = new Button(p.width/2, p.height/2 + 110, 100, 40,p.color(255), "Valider",true,p);
backButton = new Button(20, p.height - 60, 100, 40,p.color(200,0,0), "Retour",false,p);
backButton = new Button(20, p.height - 60, 100, 40,p.color(255), "Retour",false,p);
}

public void draw() {
Expand Down
7 changes: 5 additions & 2 deletions src/vue/ResultsScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,14 @@ public void mousePressed(){

public void mouseReleased(){
resultsViewer.release();
if(saveButton.release())
if(saveButton.release()) {
Historique.addHistorique(results);
nextScreen = ScreenName.MAIN;
if(backButton.release())
}

if(backButton.release()) {
nextScreen = ScreenName.MAIN;
}


}
Expand Down

0 comments on commit bbb1d0e

Please sign in to comment.