🐛 Correction sur l'Historique

SeekFox · Apr 29, 2020 · 94c588d · 94c588d
1 parent bbb1d0e
commit 94c588d
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 1 deletion.
diff --git a/seekfox.jar b/seekfox.jar
diff --git 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
@@ -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<CelluleResultat> getResultats() {
 		return resultats;
 	}

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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());