diff --git a/02_Calcul/Activite_calcul/.gitignore b/.gitignore similarity index 100% rename from 02_Calcul/Activite_calcul/.gitignore rename to .gitignore diff --git a/02_Calcul/.~lock.exemple_visu01.odt# b/02_Calcul/.~lock.exemple_visu01.odt# deleted file mode 100644 index ed9acdcaddfcebdc711e55dcd9b3b805d8c898d4..0000000000000000000000000000000000000000 --- a/02_Calcul/.~lock.exemple_visu01.odt# +++ /dev/null @@ -1 +0,0 @@ -,stag,formation-ldnr-5CG6385VLR,19.09.2024 11:37,file:///home/stag/.config/libreoffice/4; \ No newline at end of file diff --git a/02_Calcul/Activite_calcul/pom.xml b/02_Calcul/Activite_calcul/pom.xml deleted file mode 100644 index 649fbd6d0079615a954e72bdcd041266964a9b23..0000000000000000000000000000000000000000 --- a/02_Calcul/Activite_calcul/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - activite - Activite_calcul - 01 - jar - - UTF-8 - 17 - 17 - activité_calcul.Activite_calcul - - Activite_calcul - \ No newline at end of file diff --git a/02_Calcul/Activite_calcul/target/classes/Calcul/Main.class b/02_Calcul/Activite_calcul/target/classes/Calcul/Main.class deleted file mode 100644 index 40a43920343e8d7356961e7e37762c6d38aa8da1..0000000000000000000000000000000000000000 Binary files a/02_Calcul/Activite_calcul/target/classes/Calcul/Main.class and /dev/null differ diff --git a/02_Calcul/Activite_calcul/target/classes/Calcul/TestCalcul.class b/02_Calcul/Activite_calcul/target/classes/Calcul/TestCalcul.class deleted file mode 100644 index 0d585fa31f9263e64502c2296f3a0650ede6f2a9..0000000000000000000000000000000000000000 Binary files a/02_Calcul/Activite_calcul/target/classes/Calcul/TestCalcul.class and /dev/null differ diff --git a/02_Calcul/Activite_calcul/target/classes/beans/Addition.class b/02_Calcul/Activite_calcul/target/classes/beans/Addition.class deleted file mode 100644 index 6a8bb9e4cf67d7b7d08bf68929e819c1a9bc9d7a..0000000000000000000000000000000000000000 Binary files a/02_Calcul/Activite_calcul/target/classes/beans/Addition.class and /dev/null differ diff --git a/02_Calcul/Activite_calcul/target/classes/beans/Substraction.class b/02_Calcul/Activite_calcul/target/classes/beans/Substraction.class deleted file mode 100644 index f0e602c366773d1f12ab8f96dfb416532eb9732d..0000000000000000000000000000000000000000 Binary files a/02_Calcul/Activite_calcul/target/classes/beans/Substraction.class and /dev/null differ diff --git a/02_Calcul/Activite_calcul/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/02_Calcul/Activite_calcul/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 9c60d4097c87b6494d5133e167ecf0829f0bda84..0000000000000000000000000000000000000000 --- a/02_Calcul/Activite_calcul/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,4 +0,0 @@ -beans/Substraction.class -Calcul/Main.class -Calcul/TestCalcul.class -beans/Addition.class diff --git a/02_Calcul/Activite_calcul/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/02_Calcul/Activite_calcul/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index f66af9686ffa6c91cc0fc1cf2fab8739022c469d..0000000000000000000000000000000000000000 --- a/02_Calcul/Activite_calcul/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,4 +0,0 @@ -/home/stag/Documents/JSE/Exos/projet_Activités/projet_groupe05/02_Calcul/Activite_calcul/src/main/java/beans/Addition.java -/home/stag/Documents/JSE/Exos/projet_Activités/projet_groupe05/02_Calcul/Activite_calcul/src/main/java/beans/Substraction.java -/home/stag/Documents/JSE/Exos/projet_Activités/projet_groupe05/02_Calcul/Activite_calcul/src/main/java/Calcul/Main.java -/home/stag/Documents/JSE/Exos/projet_Activités/projet_groupe05/02_Calcul/Activite_calcul/src/main/java/Calcul/TestCalcul.java diff --git a/02_Calcul/Documents/exemple_visu01.odt b/02_Calcul/Documents/exemple_visu01.odt deleted file mode 100644 index 942e4f80714125eea4dc8235d67da1c7e139d173..0000000000000000000000000000000000000000 Binary files a/02_Calcul/Documents/exemple_visu01.odt and /dev/null differ diff --git a/02_Calcul/Documents/note_Panel b/02_Calcul/Documents/note_Panel deleted file mode 100644 index 54df248be245e8d4a5cc4902fc46c7461f372bbe..0000000000000000000000000000000000000000 --- a/02_Calcul/Documents/note_Panel +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - */ - -package Calcul; - - -import beans.Operation; -import javax.swing.Box; -import javax.swing.JPanel; - -/** - * Activite - * - * @author cedric - */ -public class Activite_calcul extends JPanel { - - private final Box content; - - private final Operation calPanel; - - public Activite_calcul() { - this.content = Box.createVerticalBox(); - - this.calPanel = new Operation(); - - this.initGui(); - - this.setSize(500, 500); - - } - - private void initGui() { - this.content.add(calPanel); - this.add(content); - - - } -} - diff --git a/02_Calcul/Documents/CDC.odt b/Documents/CDC.odt similarity index 100% rename from 02_Calcul/Documents/CDC.odt rename to Documents/CDC.odt diff --git a/02_Calcul/exemple_visu01.odt b/Documents/exemple_visu01.odt similarity index 100% rename from 02_Calcul/exemple_visu01.odt rename to Documents/exemple_visu01.odt diff --git a/02_Calcul/Documents/notes _pour_calcul.odt b/Documents/notes _pour_calcul.odt similarity index 100% rename from 02_Calcul/Documents/notes _pour_calcul.odt rename to Documents/notes _pour_calcul.odt diff --git a/02_Calcul/Activite_calcul/nbactions.xml b/nbactions.xml similarity index 100% rename from 02_Calcul/Activite_calcul/nbactions.xml rename to nbactions.xml diff --git a/pom.xml b/pom.xml index 5cdb5d4922cbb87afba0326b5d55540a6ca86827..649fbd6d0079615a954e72bdcd041266964a9b23 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,15 @@ 4.0.0 - com.mycompany - Groupe_05 - 1.0-SNAPSHOT + activite + Activite_calcul + 01 jar UTF-8 17 17 - com.mycompany.groupe_05.Groupe_05 + activité_calcul.Activite_calcul + Activite_calcul \ No newline at end of file diff --git a/02_Calcul/Activite_calcul/src/main/java/Calcul/Main.java b/src/main/java/Calcul/Main.java similarity index 100% rename from 02_Calcul/Activite_calcul/src/main/java/Calcul/Main.java rename to src/main/java/Calcul/Main.java diff --git a/02_Calcul/Activite_calcul/src/main/java/Calcul/TestCalcul.java b/src/main/java/Calcul/TestCalcul.java similarity index 84% rename from 02_Calcul/Activite_calcul/src/main/java/Calcul/TestCalcul.java rename to src/main/java/Calcul/TestCalcul.java index 1ac6682b6a854f20cab98b1c0ef3f91d28f917fa..0d5a8d9792675ab4a0e912282295de64b07d8f74 100644 --- a/02_Calcul/Activite_calcul/src/main/java/Calcul/TestCalcul.java +++ b/src/main/java/Calcul/TestCalcul.java @@ -4,6 +4,7 @@ import beans.Addition; import beans.Substraction; import java.util.Random; import javax.swing.Box; +import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JPanel; @@ -21,6 +22,7 @@ public class TestCalcul extends JFrame { private final Substraction substractionPanel; public TestCalcul() { + this.setTitle("Seras-tu résoudre ce calcul"); this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); @@ -31,14 +33,14 @@ public class TestCalcul extends JFrame { panels = new JPanel[]{additionPanel, substractionPanel}; - this.TestPanel(); + this.initGui(); //Appel de la méthode pour afficher un panel aléatoire this.TestPanel(); - this.setSize(800, 600); this.setVisible(true); + } private void TestPanel() { @@ -51,9 +53,18 @@ public class TestCalcul extends JFrame { } currentPanel = panels[randomIndex]; + + JButton other = new JButton("Autre calcul"); + other.addActionListener((ae) -> { + this.TestPanel(); + + }); + + currentPanel.add(other); this.add(currentPanel); - // Rafraîchir l'affichage + +// Rafraîchir l'affichage this.revalidate(); this.repaint(); } diff --git a/02_Calcul/Activite_calcul/src/main/java/beans/Addition.java b/src/main/java/beans/Addition.java similarity index 76% rename from 02_Calcul/Activite_calcul/src/main/java/beans/Addition.java rename to src/main/java/beans/Addition.java index 226cf96d1b420ff3f3558c7c4d6b0f617e8516fd..1681289f49ec46e8cdaeda0529bb912e49c21ad2 100644 --- a/02_Calcul/Activite_calcul/src/main/java/beans/Addition.java +++ b/src/main/java/beans/Addition.java @@ -2,8 +2,12 @@ package beans; import java.awt.BorderLayout; import java.awt.Color; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JLabel; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTextField; @@ -23,8 +27,6 @@ public class Addition extends JPanel { answer = new JPanel(); button = new JPanel(); - - // génération d'un double >= 0.0 et < 1.0 double n1 = Math.random(); double n2 = Math.random(); @@ -57,53 +59,45 @@ public class Addition extends JPanel { JLabel resultA = new JLabel(resultAdd); JLabel propo = new JLabel("Entre ta réponse: "); - if (propo != resultA) { - System.out.println("Retente ta chance"); - } proposition = new JTextField(2); JButton check = new JButton("Vérifie"); check.setBackground(Color.green); + check.addActionListener((ActionEvent e) -> { + int userResponse = Integer.parseInt(proposition.getText()); + if (userResponse == resultatA) { + JOptionPane.showMessageDialog(proposition, "Félicitation"); + } else { + JOptionPane.showMessageDialog(proposition, "Retente ta chance"); + } + }); + JButton solution = new JButton("Solution"); solution.setBackground(Color.red); - JButton other = new JButton("Autre calcul"); - other.setBackground(Color.lightGray); + solution.addActionListener((ActionEvent e) -> { + JOptionPane.showMessageDialog(proposition, "le résultat est " + resultatA); + }); + button.add(check); button.add(solution); - button.add(other); + answer.add(propo); answer.add(proposition); - - createGUI(); } private void createGUI() { -// this.setLayout(new BoxLayout(this, BoxLayout.X_AXIS)); - -// JButton check = new JButton("Vérifie"); -// JButton solution = new JButton("Solution"); -// JButton other = new JButton("Autre calcul"); -// -// addGroup.add(check); -// addGroup.add(solution); -// addGroup.add(other); - place.setLayout(new BorderLayout()); place.add(operation, BorderLayout.WEST); place.add(answer, BorderLayout.EAST); place.add(button, BorderLayout.SOUTH); -// operation.setLayout(new FlowLayout(FlowLayout.LEFT)); -// answer.setLayout(new FlowLayout(FlowLayout.RIGHT)); -// button.setLayout(new FlowLayout()); - this.add(operation); this.add(answer); diff --git a/02_Calcul/Activite_calcul/src/main/java/beans/Substraction.java b/src/main/java/beans/Substraction.java similarity index 82% rename from 02_Calcul/Activite_calcul/src/main/java/beans/Substraction.java rename to src/main/java/beans/Substraction.java index 627d1b88c8dcaa2c3530cdf9da7faf489ac9e86f..f670e5baa08d3be0bccee35cb29ad55c56c56939 100644 --- a/02_Calcul/Activite_calcul/src/main/java/beans/Substraction.java +++ b/src/main/java/beans/Substraction.java @@ -1,7 +1,9 @@ package beans; +import java.awt.BorderLayout; import java.awt.Color; import java.awt.FlowLayout; +import java.awt.GridLayout; import java.awt.event.ActionEvent; import javax.swing.BoxLayout; import javax.swing.JButton; @@ -16,12 +18,13 @@ import javax.swing.JTextField; */ public class Substraction extends JPanel { - private final JPanel operation, answer, button; + private final JPanel place, operation, answer, button; private final JTextField proposition; public Substraction() { + place = new JPanel(); operation = new JPanel(); answer = new JPanel(); button = new JPanel(); @@ -81,18 +84,9 @@ public class Substraction extends JPanel { JOptionPane.showMessageDialog(proposition, "le résultat est " + resultatS); }); - JButton other = new JButton("Autre calcul"); - other.setBackground(Color.lightGray); - other.addActionListener((ActionEvent e) -> { -// JOptionPane.showMessageDialog(proposition, resultS, strC2, resultatS, icon); -// ) - - }); - - button.add(check); button.add(solution); - button.add(other); + answer.add(propo); answer.add(proposition); @@ -102,11 +96,11 @@ public class Substraction extends JPanel { } private void createGUI() { - this.setLayout(new BoxLayout(this, BoxLayout.X_AXIS)); + place.setLayout(new BorderLayout()); - operation.setLayout(new FlowLayout(FlowLayout.LEFT)); - answer.setLayout(new FlowLayout(FlowLayout.RIGHT)); - button.setLayout(new FlowLayout()); + place.add(operation, BorderLayout.WEST); + place.add(answer, BorderLayout.EAST); + place.add(button, BorderLayout.SOUTH); this.add(operation); this.add(answer); diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index a601528fe20d91b94f303b2ff1553accc802cb5b..9c60d4097c87b6494d5133e167ecf0829f0bda84 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,5 +1,4 @@ -beans/Drawing$DrawArea$1.class -beans/Drawing$DrawArea.class -beans/Drawing.class -com/mycompany/groupe_05/Groupe_05.class -beans/Drawing$DrawArea$2.class +beans/Substraction.class +Calcul/Main.class +Calcul/TestCalcul.class +beans/Addition.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index db64fcc2d3b0fa118b3b4582bdd853f37d1be886..f66af9686ffa6c91cc0fc1cf2fab8739022c469d 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,2 +1,4 @@ -/home/stag/Documents/07 - Java JSE/projet/Groupe_05/src/main/java/com/mycompany/groupe_05/Groupe_05.java -/home/stag/Documents/07 - Java JSE/projet/Groupe_05/src/main/java/beans/Drawing.java +/home/stag/Documents/JSE/Exos/projet_Activités/projet_groupe05/02_Calcul/Activite_calcul/src/main/java/beans/Addition.java +/home/stag/Documents/JSE/Exos/projet_Activités/projet_groupe05/02_Calcul/Activite_calcul/src/main/java/beans/Substraction.java +/home/stag/Documents/JSE/Exos/projet_Activités/projet_groupe05/02_Calcul/Activite_calcul/src/main/java/Calcul/Main.java +/home/stag/Documents/JSE/Exos/projet_Activités/projet_groupe05/02_Calcul/Activite_calcul/src/main/java/Calcul/TestCalcul.java