From 94c588d8de5ee97703f3d638ef79386c337e1ecb Mon Sep 17 00:00:00 2001 From: ctruillet Date: Wed, 29 Apr 2020 16:11:22 +0200 Subject: [PATCH] :bug: Correction sur l'Historique --- seekfox.jar | Bin 1582883 -> 1582852 bytes src/modele/Historique.java | 3 +++ src/modele/Resultat.java | 8 ++++++++ src/modele/TypeRecherche.java | 9 +++++++++ src/vue/HistoryScreen.java | 4 +++- src/vue/ResultsScreen.java | 2 ++ src/vue/SearchConfigImgScreen.java | 3 +++ src/vue/SearchConfigSndScreen.java | 1 + src/vue/SearchConfigTxtScreen.java | 2 ++ 9 files changed, 31 insertions(+), 1 deletion(-) diff --git a/seekfox.jar b/seekfox.jar index aeee02eeda5a7048a8b3ca855cea9a55412526f5..de925e69ffc34466c490a3b8af003c8b0172028b 100644 GIT binary patch delta 13186 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 Uh2e@G1V4rG{N&Fw(67t?2iSMko&W#< delta 13222 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 diff --git a/src/modele/Historique.java b/src/modele/Historique.java index d5c61ab..757ee40 100644 --- a/src/modele/Historique.java +++ b/src/modele/Historique.java @@ -145,6 +145,9 @@ private static Resultat toResultat (String recup) { case "MOTCLEF_COMPLEXE": type = TypeRequete.MOTCLEF_COMPLEXE; break; + case "COULEURDOMINANTE": + type = TypeRequete.COULEURDOMINANTE; + break; default : type = TypeRequete.FIN; break; diff --git a/src/modele/Resultat.java b/src/modele/Resultat.java index 7dd2f10..9c0a9c6 100644 --- a/src/modele/Resultat.java +++ b/src/modele/Resultat.java @@ -66,10 +66,18 @@ public String getRequete() { return requete; } + public void setRequete(String requete){ + this.requete=requete; + } + public TypeRequete getType() { return type; } + public void setType(TypeRequete type){ + this.type=type; + } + public ArrayList getResultats() { return resultats; } diff --git a/src/modele/TypeRecherche.java b/src/modele/TypeRecherche.java index 51f5398..e954281 100644 --- a/src/modele/TypeRecherche.java +++ b/src/modele/TypeRecherche.java @@ -10,6 +10,7 @@ public class TypeRecherche { private static TypeRecherche INSTANCE = null; private TypeRequete typeRequete; private boolean isMultimoteur = false; + private String requete = ""; //Constructeur @@ -42,4 +43,12 @@ public boolean isMultimoteur() { public void setMultimoteur(boolean multimoteur) { isMultimoteur = multimoteur; } + + public String getRequete() { + return requete; + } + + public void setRequete(String requete) { + this.requete = requete; + } } diff --git a/src/vue/HistoryScreen.java b/src/vue/HistoryScreen.java index 8a68488..7c1078d 100644 --- a/src/vue/HistoryScreen.java +++ b/src/vue/HistoryScreen.java @@ -73,9 +73,11 @@ public void sauvegarderRecherche(Resultat recherche){ break; case MOTCLEF: case MOTCLEF_COMPLEXE: - default: requete = recherche.getRequete(); break; + default: + requete = "null"; + break; } diff --git a/src/vue/ResultsScreen.java b/src/vue/ResultsScreen.java index 8114945..4936c8e 100644 --- a/src/vue/ResultsScreen.java +++ b/src/vue/ResultsScreen.java @@ -54,6 +54,8 @@ public void mousePressed(){ public void mouseReleased(){ resultsViewer.release(); if(saveButton.release()) { + results.setRequete(TypeRecherche.getINSTANCE().getRequete()); + results.setType(TypeRecherche.getINSTANCE().getTypeRequete()); Historique.addHistorique(results); nextScreen = ScreenName.MAIN; } diff --git a/src/vue/SearchConfigImgScreen.java b/src/vue/SearchConfigImgScreen.java index c4249f1..1e50b5e 100644 --- a/src/vue/SearchConfigImgScreen.java +++ b/src/vue/SearchConfigImgScreen.java @@ -189,12 +189,14 @@ public void runRecherche(){ if(file!=null){ if(file.getParent().endsWith("RGB")){ TypeRecherche.getINSTANCE().setTypeRequete(TypeRequete.IMAGE); + TypeRecherche.getINSTANCE().setRequete("./baseDeDocuments/Image/RGB/" + file.getName()); for (ControlRequete controlRequete : listControlRequete) { controlRequete.runRecherche(TypeRequete.IMAGE, "./baseDeDocuments/Image/RGB/" + file.getName()); } }else if(file.getParent().endsWith("NB")){ TypeRecherche.getINSTANCE().setTypeRequete(TypeRequete.IMAGE); + TypeRecherche.getINSTANCE().setRequete("./baseDeDocuments/Image/NB/" + file.getName()); for (ControlRequete controlRequete : listControlRequete) { controlRequete.runRecherche(TypeRequete.IMAGE, "./baseDeDocuments/Image/NB/" + file.getName()); } @@ -205,6 +207,7 @@ public void runRecherche(){ } }else { TypeRecherche.getINSTANCE().setTypeRequete(TypeRequete.COULEURDOMINANTE); + TypeRecherche.getINSTANCE().setRequete("" + Integer.toHexString(color.getRGB()).substring(2)); for (ControlRequete controlRequete : listControlRequete) { controlRequete.runRecherche(TypeRequete.COULEURDOMINANTE, "" + Integer.toHexString(color.getRGB()).substring(2)); } diff --git a/src/vue/SearchConfigSndScreen.java b/src/vue/SearchConfigSndScreen.java index b6d28b5..96f32ca 100644 --- a/src/vue/SearchConfigSndScreen.java +++ b/src/vue/SearchConfigSndScreen.java @@ -131,6 +131,7 @@ public void runRecherche(){ try { //Lancer la recherche if(file!=null){ TypeRecherche.getINSTANCE().setTypeRequete(TypeRequete.AUDIO); + TypeRecherche.getINSTANCE().setRequete("./baseDeDocuments/Audio/" + file.getName()); for (ControlRequete controlRequete : listControlRequete) { controlRequete.runRecherche(TypeRequete.AUDIO, "./baseDeDocuments/Audio/" + file.getName()); } diff --git a/src/vue/SearchConfigTxtScreen.java b/src/vue/SearchConfigTxtScreen.java index 8e91304..d46cb18 100644 --- a/src/vue/SearchConfigTxtScreen.java +++ b/src/vue/SearchConfigTxtScreen.java @@ -136,6 +136,7 @@ public void runRecherche(){ if(isRechercheTexte){ if(file!=null){ TypeRecherche.getINSTANCE().setTypeRequete(TypeRequete.TEXTE); + TypeRecherche.getINSTANCE().setRequete("./baseDeDocuments/Texte/" + file.getName()); for (ControlRequete controlRequete : listControlRequete) { controlRequete.runRecherche(TypeRequete.TEXTE, "./baseDeDocuments/Texte/" + file.getName()); } @@ -148,6 +149,7 @@ public void runRecherche(){ }else { if(searchBox.getWrittenText()!=""){ TypeRecherche.getINSTANCE().setTypeRequete(TypeRequete.MOTCLEF); + TypeRecherche.getINSTANCE().setRequete(searchBox.getWrittenText()); for (ControlRequete controlRequete : listControlRequete) { controlRequete.runRechercheComplexe(searchBox.getWrittenText());