From 77e1e2d7a8bbaa51c7d4222a64dbb99e90ca982a Mon Sep 17 00:00:00 2001
From: Yessine Ben El Bey <yessine.ben-el-bey@etu.unice.fr>
Date: Tue, 28 Apr 2020 09:32:33 +0200
Subject: [PATCH 1/4] =?UTF-8?q?Ajout=20de=20la=20musique=20param=C3=A8tre?=
 =?UTF-8?q?=20non=20complet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ihm/controller/ParametreController.java | 86 +++++++++++++++++----
 src/ihm/ressources/parametre.fxml           |  2 +-
 2 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/src/ihm/controller/ParametreController.java b/src/ihm/controller/ParametreController.java
index 550c9a6..d2cccc4 100644
--- a/src/ihm/controller/ParametreController.java
+++ b/src/ihm/controller/ParametreController.java
@@ -1,9 +1,16 @@
 package ihm.controller;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
 
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Clip;
+import javax.sound.sampled.LineUnavailableException;
+import javax.sound.sampled.UnsupportedAudioFileException;
+
 import ihm.Musique;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -14,11 +21,28 @@ import javafx.scene.control.ComboBox;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Pane;
 
-public class ParametreController implements Initializable{
+public class ParametreController implements Initializable  {
 	@FXML private Pane rootPane;
 	@FXML private CheckBox cmusique;
 	@FXML private CheckBox clair;
 	@FXML private ComboBox<String> langues;
+	AudioInputStream musique;
+	Clip clip;
+	
+	
+	String filepath = "src//ihm//ressources//musique//The_Red_Fox_Tavern.wav"; // lien vers la musique :
+	File files=new File("src//ihm//ressources//musique//The_Red_Fox_Tavern.wav");
+	
+	
+	
+	 
+	
+	File repertoire = new File("src//ihm//ressources");
+	 
+     String liste[] = repertoire.list();  
+	// https://www.youtube.com/watch?v=LBpKUIyOHdo
+	
+	
 
 
 
@@ -27,26 +51,60 @@ public class ParametreController implements Initializable{
 		langues.getItems().add("Anglais");
 		langues.getItems().add("Allemand");
 		langues.getItems().add("Espagnol");
-		langues.getItems().add("Français");
-
-
+		langues.getItems().add("Français");
 
 		
+		
 	}
-	/*@FXML
-	public void enregistre(MouseEvent mouseEvent) throws IOException{
-		if(cmusique.isSelected()==true) {
-
-			String filepath = "src//ihm//ressources//musique//The_Red_Fox_Tavern.wav"; // lien vers la musique :
-																						// https://www.youtube.com/watch?v=LBpKUIyOHdo
-			Musique musiqueObjet = new Musique();
-			//musiqueObjet.playMusique(filepath);
+	
+	@FXML
+	public void enregistre(MouseEvent mouseEvent) throws IOException, Exception{
+		if(files.exists()) {
+			try {
+				
+				clip=AudioSystem.getClip();
+				clip.open(AudioSystem.getAudioInputStream(files));
 			
-			Pane root = FXMLLoader.load(getClass().getResource("ressources/parametre.fxml"));
-			//root.setStyle("ressources/style/menuLight.css);
+				
+				if(cmusique.isSelected()==true) {
+
+					
+					
+					clip.start();
+					clip.loop(Clip.LOOP_CONTINUOUSLY);
+				
+					
+					
+					
+				}
+				else {
+					AudioSystem.getAudioInputStream(files).close();
+					clip.close();
+
+					
+				}
+			
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 			
 		}
 		
+		
+		/*	if(clair.isSelected()) {
+				Pane root = FXMLLoader.load(getClass().getResource("ressources/parametre.fxml"));
+				root.setStyle("ressources/style/menuLight.css");
+				  if (liste != null) {         
+			            for (int i = 0; i < liste.length; i++) {
+			                System.out.println(liste[i]);
+			                Pane root1 = FXMLLoader.load(getClass().getResource(liste[i]));
+							root1.setStyle("ressources/style/menuLight.css");
+			            }
+			} 
+		
+		
 	} */
 
 }
+}
diff --git a/src/ihm/ressources/parametre.fxml b/src/ihm/ressources/parametre.fxml
index e70b1b9..e382d83 100644
--- a/src/ihm/ressources/parametre.fxml
+++ b/src/ihm/ressources/parametre.fxml
@@ -37,6 +37,6 @@
             <Font size="36.0" />
          </font>
       </Label>
-      <Button layoutX="340.0" layoutY="525.0" mnemonicParsing="false" styleClass="bouton" stylesheets="@style/menu.css" text="Enregistrer" />
+      <Button layoutX="340.0" layoutY="525.0" mnemonicParsing="false" onMouseClicked="#enregistre" styleClass="bouton" stylesheets="@style/menu.css" text="Enregistrer" />
    </children>
 </Pane>

From 0a8c88359526fbfd3479df3f40e0e9a996b0a728 Mon Sep 17 00:00:00 2001
From: Bastien NOEL <bastien.noel@hotmail.fr>
Date: Tue, 28 Apr 2020 14:12:59 +0200
Subject: [PATCH 2/4] bouton musique fonctionnel

---
 src/database/DatabaseTesting.java           |   7 +-
 src/database/Table.java                     |   2 +-
 src/ihm/Musique.java                        |  33 ++++--
 src/ihm/controller/ParametreController.java | 120 +++++++++-----------
 4 files changed, 79 insertions(+), 83 deletions(-)

diff --git a/src/database/DatabaseTesting.java b/src/database/DatabaseTesting.java
index 5269835..93dc71e 100644
--- a/src/database/DatabaseTesting.java
+++ b/src/database/DatabaseTesting.java
@@ -32,12 +32,7 @@ public class DatabaseTesting {
     	
     	Table a = new Table("a");
     	a.remplirTable("CartesLumiere");
-    	try {
-			ByteaToCardImage.getImg(a.getList().get(5).getImg());
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+
     	
     	
     	
diff --git a/src/database/Table.java b/src/database/Table.java
index eb92c15..b8cc929 100644
--- a/src/database/Table.java
+++ b/src/database/Table.java
@@ -27,7 +27,7 @@ public class Table {
             while (retour.next()) {
             	Record r = new Record(retour.getString("id"), retour.getString("nom"), retour.getBytes("image"));
             	list.add(r);
-            	//System.out.printf("%-20.30s  %-30.30s  %-20.30s%n", retour.getString("id"), retour.getString("nom"), retour.getBytes("image"));
+            	System.out.printf("%-20.30s  %-30.30s  %-20.30s%n", retour.getString("id"), retour.getString("nom"), retour.getBytes("image"));
             }
 
         } catch (SQLException e) {
diff --git a/src/ihm/Musique.java b/src/ihm/Musique.java
index d9bf68d..7ee513a 100644
--- a/src/ihm/Musique.java
+++ b/src/ihm/Musique.java
@@ -8,28 +8,41 @@ import javax.sound.sampled.Clip;
 import javax.swing.JOptionPane;
 
 public class Musique {
-	
-	public void  playMusique(String path) {
-		
+
+	public static Clip clip;
+	public static long clipTimePosition = 0;
+
+	public static void playMusique(String path) {
+
 		try {
-			
+
 			File musicPath = new File(path);
-			
-			if( musicPath.exists()) {
-				
+
+			if (musicPath.exists()) {
+
 				AudioInputStream audioInput = AudioSystem.getAudioInputStream(musicPath);
-				Clip clip = AudioSystem.getClip();
+				clip = AudioSystem.getClip();
 				clip.open(audioInput);
 				clip.start();
 				clip.loop(Clip.LOOP_CONTINUOUSLY);
-				
+
 			} else {
 				System.out.println("le fichier audio n'est pas trouvé");
 			}
-			
+
 		} catch (Exception ex) {
 			ex.printStackTrace();
 		}
 	}
 
+	public static void pauseMusique(Clip clip) {
+		clipTimePosition = clip.getMicrosecondPosition();
+		clip.stop();
+	}
+
+	public static void resumeMusique(Clip clip) {
+		clip.setMicrosecondPosition(clipTimePosition);
+		clip.start();
+	}
+
 }
diff --git a/src/ihm/controller/ParametreController.java b/src/ihm/controller/ParametreController.java
index d2cccc4..c319173 100644
--- a/src/ihm/controller/ParametreController.java
+++ b/src/ihm/controller/ParametreController.java
@@ -10,6 +10,7 @@ import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.Clip;
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.UnsupportedAudioFileException;
+import javax.swing.JOptionPane;
 
 import ihm.Musique;
 import javafx.fxml.FXML;
@@ -21,30 +22,27 @@ import javafx.scene.control.ComboBox;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Pane;
 
-public class ParametreController implements Initializable  {
-	@FXML private Pane rootPane;
-	@FXML private CheckBox cmusique;
-	@FXML private CheckBox clair;
-	@FXML private ComboBox<String> langues;
+public class ParametreController implements Initializable {
+	@FXML
+	private Pane rootPane;
+	@FXML
+	private CheckBox cmusique;
+	@FXML
+	private CheckBox clair;
+	@FXML
+	private ComboBox<String> langues;
 	AudioInputStream musique;
 	Clip clip;
-	
-	
+	boolean coche = false;
+	boolean MusiqueLancee = false;
+
 	String filepath = "src//ihm//ressources//musique//The_Red_Fox_Tavern.wav"; // lien vers la musique :
-	File files=new File("src//ihm//ressources//musique//The_Red_Fox_Tavern.wav");
-	
-	
-	
-	 
-	
+																				// https://www.youtube.com/watch?v=LBpKUIyOHdo
+	File files = new File("src//ihm//ressources//musique//The_Red_Fox_Tavern.wav");
+
 	File repertoire = new File("src//ihm//ressources");
-	 
-     String liste[] = repertoire.list();  
-	// https://www.youtube.com/watch?v=LBpKUIyOHdo
-	
-	
-
 
+	String liste[] = repertoire.list();
 
 	@Override
 	public void initialize(URL arg0, ResourceBundle arg1) {
@@ -53,58 +51,48 @@ public class ParametreController implements Initializable  {
 		langues.getItems().add("Espagnol");
 		langues.getItems().add("Français");
 
-		
-		
 	}
-	
+
 	@FXML
-	public void enregistre(MouseEvent mouseEvent) throws IOException, Exception{
-		if(files.exists()) {
-			try {
-				
-				clip=AudioSystem.getClip();
-				clip.open(AudioSystem.getAudioInputStream(files));
-			
-				
-				if(cmusique.isSelected()==true) {
+	public void enregistre(MouseEvent mouseEvent) throws IOException, Exception {
 
-					
-					
-					clip.start();
-					clip.loop(Clip.LOOP_CONTINUOUSLY);
-				
-					
-					
-					
-				}
-				else {
-					AudioSystem.getAudioInputStream(files).close();
-					clip.close();
+		if (files.exists()) {
 
-					
+			if (cmusique.isSelected() == true) {
+				coche = true;
+				if (Musique.clipTimePosition == 0 && MusiqueLancee == false) {
+					Musique.playMusique(filepath);
+					MusiqueLancee = true;
+
+				} else {
+					Musique.resumeMusique(Musique.clip);
 				}
-			
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+
+			} else {
+				if (coche == true) {
+					coche = false;
+					Musique.pauseMusique(Musique.clip);
+				}
+
 			}
-			
-		}
-		
-		
-		/*	if(clair.isSelected()) {
-				Pane root = FXMLLoader.load(getClass().getResource("ressources/parametre.fxml"));
-				root.setStyle("ressources/style/menuLight.css");
-				  if (liste != null) {         
-			            for (int i = 0; i < liste.length; i++) {
-			                System.out.println(liste[i]);
-			                Pane root1 = FXMLLoader.load(getClass().getResource(liste[i]));
-							root1.setStyle("ressources/style/menuLight.css");
-			            }
-			} 
-		
-		
-	} */
+			/*
+			 * } catch (IOException e) { // TODO Auto-generated catch block
+			 * e.printStackTrace(); }
+			 */
 
-}
+		}
+
+		/*
+		 * if(clair.isSelected()) { Pane root =
+		 * FXMLLoader.load(getClass().getResource("ressources/parametre.fxml"));
+		 * root.setStyle("ressources/style/menuLight.css"); if (liste != null) { for
+		 * (int i = 0; i < liste.length; i++) { System.out.println(liste[i]); Pane root1
+		 * = FXMLLoader.load(getClass().getResource(liste[i]));
+		 * root1.setStyle("ressources/style/menuLight.css"); } }
+		 * 
+		 * 
+		 * }
+		 */
+
+	}
 }

From 9e57f0edd6580a21c7e83ab3070b9dfde471235f Mon Sep 17 00:00:00 2001
From: Bastien NOEL <bastien.noel@hotmail.fr>
Date: Tue, 28 Apr 2020 14:27:42 +0200
Subject: [PATCH 3/4] ajout de commentaires

---
 src/ihm/controller/ParametreController.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/ihm/controller/ParametreController.java b/src/ihm/controller/ParametreController.java
index c319173..3186f5e 100644
--- a/src/ihm/controller/ParametreController.java
+++ b/src/ihm/controller/ParametreController.java
@@ -31,10 +31,8 @@ public class ParametreController implements Initializable {
 	private CheckBox clair;
 	@FXML
 	private ComboBox<String> langues;
-	AudioInputStream musique;
-	Clip clip;
-	boolean coche = false;
-	boolean MusiqueLancee = false;
+	boolean coche = false; // verifi si la checbox musical est coche
+	boolean MusiqueLancee = false; //verifi si la musique a déja été lancé une première fois
 
 	String filepath = "src//ihm//ressources//musique//The_Red_Fox_Tavern.wav"; // lien vers la musique :
 																				// https://www.youtube.com/watch?v=LBpKUIyOHdo
@@ -60,18 +58,18 @@ public class ParametreController implements Initializable {
 
 			if (cmusique.isSelected() == true) {
 				coche = true;
-				if (Musique.clipTimePosition == 0 && MusiqueLancee == false) {
+				if (Musique.clipTimePosition == 0 && MusiqueLancee == false) { // si la musique n'a jamais été lancé
 					Musique.playMusique(filepath);
 					MusiqueLancee = true;
 
 				} else {
-					Musique.resumeMusique(Musique.clip);
+					Musique.resumeMusique(Musique.clip); // si elle a deja été lancé mais mis en pause, reprend a partir du point d'arret
 				}
 
 			} else {
 				if (coche == true) {
 					coche = false;
-					Musique.pauseMusique(Musique.clip);
+					Musique.pauseMusique(Musique.clip); //met en pause la musique 
 				}
 
 			}

From 6fedf1c0610df053704dbdb3eeeaeba71d3b42b6 Mon Sep 17 00:00:00 2001
From: Bastien NOEL <bastien.noel@hotmail.fr>
Date: Tue, 28 Apr 2020 14:49:47 +0200
Subject: [PATCH 4/4] =?UTF-8?q?=C3=A9puration=20du=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ihm/Main.java                           |  6 ------
 src/ihm/Musique.java                        |  1 -
 src/ihm/controller/ParametreController.java | 18 ++++++------------
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/ihm/Main.java b/src/ihm/Main.java
index ae4bc0f..ca87e71 100644
--- a/src/ihm/Main.java
+++ b/src/ihm/Main.java
@@ -7,7 +7,6 @@ import java.util.ResourceBundle;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
-import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 
@@ -28,11 +27,6 @@ public class Main extends Application {
 	}
 
 	public static void main(String[] args) {
-
-		String filepath = "src//ihm//ressources//musique//The_Red_Fox_Tavern.wav"; // lien vers la musique :
-																					// https://www.youtube.com/watch?v=LBpKUIyOHdo
-		Musique musiqueObjet = new Musique();
-		//musiqueObjet.playMusique(filepath);
 		launch(args);
 	}
 }
diff --git a/src/ihm/Musique.java b/src/ihm/Musique.java
index 7ee513a..67b930d 100644
--- a/src/ihm/Musique.java
+++ b/src/ihm/Musique.java
@@ -5,7 +5,6 @@ import java.io.File;
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.Clip;
-import javax.swing.JOptionPane;
 
 public class Musique {
 
diff --git a/src/ihm/controller/ParametreController.java b/src/ihm/controller/ParametreController.java
index 3186f5e..97270e3 100644
--- a/src/ihm/controller/ParametreController.java
+++ b/src/ihm/controller/ParametreController.java
@@ -5,18 +5,10 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
 
-import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.Clip;
-import javax.sound.sampled.LineUnavailableException;
-import javax.sound.sampled.UnsupportedAudioFileException;
-import javax.swing.JOptionPane;
-
 import ihm.Musique;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
-import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.input.MouseEvent;
@@ -73,12 +65,9 @@ public class ParametreController implements Initializable {
 				}
 
 			}
-			/*
-			 * } catch (IOException e) { // TODO Auto-generated catch block
-			 * e.printStackTrace(); }
-			 */
 
 		}
+		
 
 		/*
 		 * if(clair.isSelected()) { Pane root =
@@ -91,6 +80,11 @@ public class ParametreController implements Initializable {
 		 * 
 		 * }
 		 */
+		
+		
+		Pane pane = FXMLLoader.load(getClass().getResource("../ressources/Jouer_tour(3)attaquer.fxml"));
+
+        rootPane.getChildren().setAll(pane);
 
 	}
 }