diff --git a/.classpath b/.classpath
index 4b5675b..148593c 100644
--- a/.classpath
+++ b/.classpath
@@ -12,6 +12,6 @@
-
+
diff --git a/analyseWriter.exe b/analyseWriter.exe
index 9f09f12..018139e 100644
Binary files a/analyseWriter.exe and b/analyseWriter.exe differ
diff --git a/analyseWriter.jar b/analyseWriter.jar
index d6d9086..47c3329 100644
Binary files a/analyseWriter.jar and b/analyseWriter.jar differ
diff --git a/bin/.gitignore b/bin/.gitignore
index a474a64..1f05cf0 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -3,70 +3,4 @@
/evaluer/
/fenetres/
/list/
-/structurepage.svg
-/stylepage.png
-/stylepage.svg
-/styleparagraphe.png
-/styleparagraphe.svg
-/supprime.svg
-/supprimemini.png
-/textclean.png
-/textclean.svg
-/textcleanmini.png
-/titre.svg
-/titremini.png
-/totalpoint.png
-/totalpoint.svg
-/totalpointmini.png
-/totalpointnode.png
-/totalpointnode.svg
-/totalpointnodemini.png
-/touslesnodes.png
-/touslesnodes.svg
-/touslesnodesmini.png
-/toutext.png
-/toutext.svg
-/toutextmini.png
-/traduction.png
-/traduction.svg
-/traductionmini.png
-/treeClose.png
-/treeClose.svg
-/treeLeaf.png
-/treeLeaf.svg
-/treeOpen.png
-/treeOpen.svg
-/triche.png
-/triche.svg
-/trichemini.png
-/true.png
-/true.svg
-/truemini.png
-/tutoriel.png
-/tutoriel.svg
-/tutorielmini.png
-/undo.png
-/upnode.png
-/upnode.svg
-/upnodemini.png
-/verifhistorique.png
-/verifhistoriquemax.png
-/verifhistoriquemini.png
-/verifhistoriquestudent.png
-/verifhistoriquestudent.svg
-/verifhistoriquestudentmini.png
-/versevaluate.png
-/versevaluate.svg
-/versevaluatemini.png
-/versfichierAnalyse.png
-/versfichierAnalyseModifmax.svg
-/voir.svg
-/voirmini.png
-/what.svg
-/whatmini.png
-/zip.png
-/zip.svg
-/zipmini.png
-/zipstudent.png
-/zipstudent.svg
-/zipstudentmini.png
+/resources/
diff --git a/bin/MEPTL/rechercherUnNodeStudent.class b/bin/MEPTL/rechercherUnNodeStudent.class
index bb43ecf..6c50cac 100644
Binary files a/bin/MEPTL/rechercherUnNodeStudent.class and b/bin/MEPTL/rechercherUnNodeStudent.class differ
diff --git a/bin/csvstudent.png b/bin/csvstudent.png
new file mode 100644
index 0000000..101bbf3
Binary files /dev/null and b/bin/csvstudent.png differ
diff --git a/bin/csvstudent.svg b/bin/csvstudent.svg
new file mode 100644
index 0000000..33bc529
--- /dev/null
+++ b/bin/csvstudent.svg
@@ -0,0 +1,161 @@
+
+
+
+
diff --git a/bin/csvstudentmini.png b/bin/csvstudentmini.png
new file mode 100644
index 0000000..0e6d2f0
Binary files /dev/null and b/bin/csvstudentmini.png differ
diff --git a/bin/fenetres/create_act/actDownNode.class b/bin/fenetres/create_act/actDownNode.class
index 8dff83d..a327599 100644
Binary files a/bin/fenetres/create_act/actDownNode.class and b/bin/fenetres/create_act/actDownNode.class differ
diff --git a/bin/fenetres/create_act/actNewFichierAnalyse.class b/bin/fenetres/create_act/actNewFichierAnalyse.class
index 0d903aa..78318f4 100644
Binary files a/bin/fenetres/create_act/actNewFichierAnalyse.class and b/bin/fenetres/create_act/actNewFichierAnalyse.class differ
diff --git a/bin/fenetres/create_act/actPaste.class b/bin/fenetres/create_act/actPaste.class
index bf54b40..1b756bf 100644
Binary files a/bin/fenetres/create_act/actPaste.class and b/bin/fenetres/create_act/actPaste.class differ
diff --git a/bin/fenetres/create_act/actUpNode.class b/bin/fenetres/create_act/actUpNode.class
index 437a233..842d9d8 100644
Binary files a/bin/fenetres/create_act/actUpNode.class and b/bin/fenetres/create_act/actUpNode.class differ
diff --git a/bin/fenetres/evaluate$1.class b/bin/fenetres/evaluate$1.class
index 5aaf389..95ccd5c 100644
Binary files a/bin/fenetres/evaluate$1.class and b/bin/fenetres/evaluate$1.class differ
diff --git a/bin/fenetres/evaluate$10.class b/bin/fenetres/evaluate$10.class
index 8b60cb3..8e5bc1b 100644
Binary files a/bin/fenetres/evaluate$10.class and b/bin/fenetres/evaluate$10.class differ
diff --git a/bin/fenetres/evaluate$11.class b/bin/fenetres/evaluate$11.class
index 3014565..826cbea 100644
Binary files a/bin/fenetres/evaluate$11.class and b/bin/fenetres/evaluate$11.class differ
diff --git a/bin/fenetres/evaluate$12.class b/bin/fenetres/evaluate$12.class
index 986a009..5e8ea95 100644
Binary files a/bin/fenetres/evaluate$12.class and b/bin/fenetres/evaluate$12.class differ
diff --git a/bin/fenetres/evaluate$13.class b/bin/fenetres/evaluate$13.class
index e8b39b2..45b1959 100644
Binary files a/bin/fenetres/evaluate$13.class and b/bin/fenetres/evaluate$13.class differ
diff --git a/bin/fenetres/evaluate$14.class b/bin/fenetres/evaluate$14.class
index 3293a43..265cfba 100644
Binary files a/bin/fenetres/evaluate$14.class and b/bin/fenetres/evaluate$14.class differ
diff --git a/bin/fenetres/evaluate$15.class b/bin/fenetres/evaluate$15.class
index ec5165f..2129c4c 100644
Binary files a/bin/fenetres/evaluate$15.class and b/bin/fenetres/evaluate$15.class differ
diff --git a/bin/fenetres/evaluate$16.class b/bin/fenetres/evaluate$16.class
index 5c86514..68ba207 100644
Binary files a/bin/fenetres/evaluate$16.class and b/bin/fenetres/evaluate$16.class differ
diff --git a/bin/fenetres/evaluate$17.class b/bin/fenetres/evaluate$17.class
index 4e89ce9..67e3f03 100644
Binary files a/bin/fenetres/evaluate$17.class and b/bin/fenetres/evaluate$17.class differ
diff --git a/bin/fenetres/evaluate$18.class b/bin/fenetres/evaluate$18.class
index 0bb180f..7cfc465 100644
Binary files a/bin/fenetres/evaluate$18.class and b/bin/fenetres/evaluate$18.class differ
diff --git a/bin/fenetres/evaluate$19.class b/bin/fenetres/evaluate$19.class
index c60f309..577f07c 100644
Binary files a/bin/fenetres/evaluate$19.class and b/bin/fenetres/evaluate$19.class differ
diff --git a/bin/fenetres/evaluate$2.class b/bin/fenetres/evaluate$2.class
index 31be0d5..5114919 100644
Binary files a/bin/fenetres/evaluate$2.class and b/bin/fenetres/evaluate$2.class differ
diff --git a/bin/fenetres/evaluate$20.class b/bin/fenetres/evaluate$20.class
index c60c0e6..c3e43c2 100644
Binary files a/bin/fenetres/evaluate$20.class and b/bin/fenetres/evaluate$20.class differ
diff --git a/bin/fenetres/evaluate$21.class b/bin/fenetres/evaluate$21.class
index f7db9ff..9faf43f 100644
Binary files a/bin/fenetres/evaluate$21.class and b/bin/fenetres/evaluate$21.class differ
diff --git a/bin/fenetres/evaluate$22.class b/bin/fenetres/evaluate$22.class
index 1a486fc..057a67f 100644
Binary files a/bin/fenetres/evaluate$22.class and b/bin/fenetres/evaluate$22.class differ
diff --git a/bin/fenetres/evaluate$23.class b/bin/fenetres/evaluate$23.class
index 4937e22..d690178 100644
Binary files a/bin/fenetres/evaluate$23.class and b/bin/fenetres/evaluate$23.class differ
diff --git a/bin/fenetres/evaluate$24.class b/bin/fenetres/evaluate$24.class
index b10cf47..d456644 100644
Binary files a/bin/fenetres/evaluate$24.class and b/bin/fenetres/evaluate$24.class differ
diff --git a/bin/fenetres/evaluate$25.class b/bin/fenetres/evaluate$25.class
index 2b2598a..8088d1c 100644
Binary files a/bin/fenetres/evaluate$25.class and b/bin/fenetres/evaluate$25.class differ
diff --git a/bin/fenetres/evaluate$26.class b/bin/fenetres/evaluate$26.class
index 2e84d0a..fe6c3b4 100644
Binary files a/bin/fenetres/evaluate$26.class and b/bin/fenetres/evaluate$26.class differ
diff --git a/bin/fenetres/evaluate$27.class b/bin/fenetres/evaluate$27.class
index b6d2207..6875810 100644
Binary files a/bin/fenetres/evaluate$27.class and b/bin/fenetres/evaluate$27.class differ
diff --git a/bin/fenetres/evaluate$28.class b/bin/fenetres/evaluate$28.class
index fe25a86..52a3630 100644
Binary files a/bin/fenetres/evaluate$28.class and b/bin/fenetres/evaluate$28.class differ
diff --git a/bin/fenetres/evaluate$29.class b/bin/fenetres/evaluate$29.class
index a953f9b..0236f4c 100644
Binary files a/bin/fenetres/evaluate$29.class and b/bin/fenetres/evaluate$29.class differ
diff --git a/bin/fenetres/evaluate$3.class b/bin/fenetres/evaluate$3.class
index 57703b4..2a15245 100644
Binary files a/bin/fenetres/evaluate$3.class and b/bin/fenetres/evaluate$3.class differ
diff --git a/bin/fenetres/evaluate$30.class b/bin/fenetres/evaluate$30.class
index ce61941..313c24b 100644
Binary files a/bin/fenetres/evaluate$30.class and b/bin/fenetres/evaluate$30.class differ
diff --git a/bin/fenetres/evaluate$31.class b/bin/fenetres/evaluate$31.class
index f9bc6e7..155f8f2 100644
Binary files a/bin/fenetres/evaluate$31.class and b/bin/fenetres/evaluate$31.class differ
diff --git a/bin/fenetres/evaluate$32.class b/bin/fenetres/evaluate$32.class
index a7100d7..592d7fd 100644
Binary files a/bin/fenetres/evaluate$32.class and b/bin/fenetres/evaluate$32.class differ
diff --git a/bin/fenetres/evaluate$33.class b/bin/fenetres/evaluate$33.class
index 5c5bb5e..88e89a9 100644
Binary files a/bin/fenetres/evaluate$33.class and b/bin/fenetres/evaluate$33.class differ
diff --git a/bin/fenetres/evaluate$4.class b/bin/fenetres/evaluate$4.class
index 094eb6d..172f0b5 100644
Binary files a/bin/fenetres/evaluate$4.class and b/bin/fenetres/evaluate$4.class differ
diff --git a/bin/fenetres/evaluate$5.class b/bin/fenetres/evaluate$5.class
index f5f5126..c837297 100644
Binary files a/bin/fenetres/evaluate$5.class and b/bin/fenetres/evaluate$5.class differ
diff --git a/bin/fenetres/evaluate$6.class b/bin/fenetres/evaluate$6.class
index 03e4f0d..37bff84 100644
Binary files a/bin/fenetres/evaluate$6.class and b/bin/fenetres/evaluate$6.class differ
diff --git a/bin/fenetres/evaluate$7.class b/bin/fenetres/evaluate$7.class
index 2984896..3c3bef7 100644
Binary files a/bin/fenetres/evaluate$7.class and b/bin/fenetres/evaluate$7.class differ
diff --git a/bin/fenetres/evaluate$8.class b/bin/fenetres/evaluate$8.class
index a44eadf..2091954 100644
Binary files a/bin/fenetres/evaluate$8.class and b/bin/fenetres/evaluate$8.class differ
diff --git a/bin/fenetres/evaluate$9.class b/bin/fenetres/evaluate$9.class
index 559ef7f..159486c 100644
Binary files a/bin/fenetres/evaluate$9.class and b/bin/fenetres/evaluate$9.class differ
diff --git a/bin/fenetres/evaluate.class b/bin/fenetres/evaluate.class
index f96f744..f471e15 100644
Binary files a/bin/fenetres/evaluate.class and b/bin/fenetres/evaluate.class differ
diff --git a/icons/csvstudent.png b/icons/csvstudent.png
new file mode 100644
index 0000000..101bbf3
Binary files /dev/null and b/icons/csvstudent.png differ
diff --git a/icons/csvstudent.svg b/icons/csvstudent.svg
new file mode 100644
index 0000000..33bc529
--- /dev/null
+++ b/icons/csvstudent.svg
@@ -0,0 +1,161 @@
+
+
+
+
diff --git a/icons/csvstudentmini.png b/icons/csvstudentmini.png
new file mode 100644
index 0000000..0e6d2f0
Binary files /dev/null and b/icons/csvstudentmini.png differ
diff --git a/icons/nocsvstudent.png b/icons/nocsvstudent.png
new file mode 100644
index 0000000..9346758
Binary files /dev/null and b/icons/nocsvstudent.png differ
diff --git a/icons/nocsvstudentmini.png b/icons/nocsvstudentmini.png
new file mode 100644
index 0000000..5ec3170
Binary files /dev/null and b/icons/nocsvstudentmini.png differ
diff --git a/src/MEPTL/rechercherUnNodeStudent.java b/src/MEPTL/rechercherUnNodeStudent.java
index 98a14e8..4f01c0c 100644
--- a/src/MEPTL/rechercherUnNodeStudent.java
+++ b/src/MEPTL/rechercherUnNodeStudent.java
@@ -83,6 +83,7 @@ public class rechercherUnNodeStudent {
//*************************************************************************************
if(nodSujet.getNomElt().contains("text:")) {
nodStudent = findNodeByContenuTextuel(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a);
+ if(nameNode.equals("text:line-break")) return nodStudent;
if(nodStudent!=null) return nodStudent;
}
@@ -92,7 +93,8 @@ public class rechercherUnNodeStudent {
//*****************************************************************
//** Recherche le node text:p par les différents contenu du node **
//*****************************************************************
- if(nameNode.equals("text:p")||nameNode.equals("text:span")||nameNode.equals("text:list")) {
+ if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")||nameNode.equals("text:list")
+ ||nameNode.equals("text:span")||nameNode.equals("text:line-break")) {
nodStudent = findLeNodeTextpParDesNodesEnfantsSpecifique(nameNode, nodSujet,nod0Student, nod1Student, nod2Student, a );
}
@@ -241,7 +243,7 @@ public class rechercherUnNodeStudent {
if(nodSujet.retourneLesContenusEnfants("").length()<1) return null;
String valueAttribut = evaluation.withoutCodeAndPointPourRechercheContenuExact(nodSujet.retourneLesContenusEnfants(""));
- Pattern p = Pattern.compile("^text:p|^text:h|^text:span|^text:list"); //le node qui peuvent rechercher par le contenu textuel
+ Pattern p = Pattern.compile("^text:p|^text:h|^text:span|^text:list|^text:line-break"); //le node qui peuvent rechercher par le contenu textuel
Matcher m = p.matcher(nameNode);
if(m.find()) {
@@ -287,14 +289,14 @@ public class rechercherUnNodeStudent {
//méthode texte rigoureusement exact
if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeDoublonStudent(nod2Student.getNodes(), valueAttribut, nameNode, nodSujet);
- if(nod2Student!=null) if(nodStudent==null) {
- ArrayList tousLesfreres = nod2Student.retourneTousLesFreres(); //Retourne tous les frère d'une même page
- for(int i = 0 ; i < tousLesfreres.size();i++) {
- if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeDoublonStudent(tousLesfreres.get(i).getNodes(), valueAttribut, nameNode, nodSujet);
- }
- }
- if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeDoublonStudent(nod1Student.getNodes(), valueAttribut, nameNode, nodSujet);
- if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeDoublonStudent(nod0Student.getNodes(), valueAttribut, nameNode, nodSujet);
+// if(nod2Student!=null) if(nodStudent==null) {
+// ArrayList tousLesfreres = nod2Student.retourneTousLesFreres(); //Retourne tous les frère d'une même page
+// for(int i = 0 ; i < tousLesfreres.size();i++) {
+// if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeDoublonStudent(tousLesfreres.get(i).getNodes(), valueAttribut, nameNode, nodSujet);
+// }
+// }
+// if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeDoublonStudent(nod1Student.getNodes(), valueAttribut, nameNode, nodSujet);
+// if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeDoublonStudent(nod0Student.getNodes(), valueAttribut, nameNode, nodSujet);
}
diff --git a/src/fenetres/create_act/actDownNode.java b/src/fenetres/create_act/actDownNode.java
index b2722ee..a02235a 100644
--- a/src/fenetres/create_act/actDownNode.java
+++ b/src/fenetres/create_act/actDownNode.java
@@ -51,8 +51,9 @@ public class actDownNode extends AbstractAction{
treeModel.insertNodeInto(selectNode, selectParentNode, selectedNodeIndex+1);
String nameNode = nod.getNomElt();
- if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")) {
- actNewFichierAnalyse.placeIsDoublon(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
+ if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")||nameNode.equals("text:list")
+ ||nameNode.equals("text:span")||nameNode.equals("text:line-break")) {
+ actNewFichierAnalyse.placeIsDoublonInStructure(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
}
DefaultMutableTreeNode root = (DefaultMutableTreeNode) treeModel.getRoot();
diff --git a/src/fenetres/create_act/actNewFichierAnalyse.java b/src/fenetres/create_act/actNewFichierAnalyse.java
index d8ff735..9434bee 100644
--- a/src/fenetres/create_act/actNewFichierAnalyse.java
+++ b/src/fenetres/create_act/actNewFichierAnalyse.java
@@ -97,7 +97,7 @@ public class actNewFichierAnalyse extends AbstractAction{
//Pour les sujets, il faut rechercher les nodes en doublons (par exemple : text:p, text:h, text:list-item)
//L'information sera portée par l'attribut isDoublon="1" ou isDoublon="2", etc..
// Cela permet de recherche par le numéro du child.
- placeIsDoublon(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
+ placeIsDoublonInStructure(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
commandes.sujet.getAttributs().put("analysis_filename","sujet.xml");
@@ -141,12 +141,12 @@ public class actNewFichierAnalyse extends AbstractAction{
}
- public static void placeIsDoublon(node nod) {
+ public static void placeIsDoublonInStructure(node nod) {
if(nod.getNomElt().equals("structurepage")) {
Enumeration pages = Collections.enumeration(nod.getNodes());
while(pages.hasMoreElements()) {
node nodLaPage = pages.nextElement();
- Pattern p = Pattern.compile("^text:p|^text:h|^text:list|^text:list-item"); //le node qui peuvent rechercher par le contenu textuel
+ Pattern p = Pattern.compile("^text:p$|^text:h$|^text:list$|^text:list-item$|^text:line-break$|^text:span$"); //le node qui peuvent rechercher par le contenu textuel
ArrayList listTextesInPage = new ArrayList();
for(int i = 0 ; i < nodLaPage.getNodes().size();i++) {
Matcher m = p.matcher(nodLaPage.getNodes().get(i).getNomElt());
@@ -158,11 +158,39 @@ public class actNewFichierAnalyse extends AbstractAction{
nodLaPage.getNodes().get(i).getAttributs().remove("isDoublon");
listTextesInPage.add(content);
}
+ if(nodLaPage.getNodes().get(i).getNodes().size()>0) {
+ placeIsDoublon(nodLaPage.getNodes().get(i));
+ }
}
}
}
- }
+ }
}
+ /**
+ *
+ * @param nod
+ */
+ private static void placeIsDoublon(node nod) {
+ Pattern p = Pattern.compile("^text:p$|^text:h$|^text:list$|^text:list-item$|^text:line-break$|^text:span$"); //le node qui peuvent rechercher par le contenu textuel
+ ArrayList listTextesInPage = new ArrayList();
+ for(int i = 0 ; i < nod.getNodes().size();i++) {
+ Matcher m = p.matcher(nod.getNodes().get(i).getNomElt());
+ if(m.find()) {
+ String content = nod.getNodes().get(i).retourneLesContenusEnfants("");
+ if(listTextesInPage.contains(content)) {
+ nod.getNodes().get(i).getAttributs().put("isDoublon", "true");
+ }else {
+ nod.getNodes().get(i).getAttributs().remove("isDoublon");
+ listTextesInPage.add(content);
+ }
+ if(nod.getNodes().get(i).getNodes().size()>0) {
+ placeIsDoublon(nod.getNodes().get(i));
+ }
+ }
+ }
+ }
+
+
}
diff --git a/src/fenetres/create_act/actPaste.java b/src/fenetres/create_act/actPaste.java
index 37c9f0a..e56cbe4 100644
--- a/src/fenetres/create_act/actPaste.java
+++ b/src/fenetres/create_act/actPaste.java
@@ -101,8 +101,9 @@ public class actPaste extends AbstractAction{
nodChild = MiseAJoutInfoChild(nodChild);
}
String nameNode = nodePaste.getNomElt();
- if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")) {
- actNewFichierAnalyse.placeIsDoublon(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
+ if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")||nameNode.equals("text:list")
+ ||nameNode.equals("text:span")||nameNode.equals("text:line-break")) {
+ actNewFichierAnalyse.placeIsDoublonInStructure(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
}
}
return nodePaste;
diff --git a/src/fenetres/create_act/actUpNode.java b/src/fenetres/create_act/actUpNode.java
index 4b9b9a0..25473e5 100644
--- a/src/fenetres/create_act/actUpNode.java
+++ b/src/fenetres/create_act/actUpNode.java
@@ -57,8 +57,9 @@ public class actUpNode extends AbstractAction{
treeModel.insertNodeInto(selectNode, selectParentNode, selectedNodeIndex-1);
String nameNode = nod.getNomElt();
- if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")) {
- actNewFichierAnalyse.placeIsDoublon(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
+ if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")||nameNode.equals("text:list")
+ ||nameNode.equals("text:span")||nameNode.equals("text:line-break")) {
+ actNewFichierAnalyse.placeIsDoublonInStructure(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
}
DefaultMutableTreeNode root = (DefaultMutableTreeNode) treeModel.getRoot();
diff --git a/src/fenetres/evaluate.java b/src/fenetres/evaluate.java
index 0b6f593..e799206 100644
--- a/src/fenetres/evaluate.java
+++ b/src/fenetres/evaluate.java
@@ -74,6 +74,7 @@ public class evaluate extends JFrame {
private JLabel lblnozip;
private JLabel lblVerifHistorique;
private JLabel lblnologo;
+ private JLabel lblCsvNote;
private JCheckBox chckbxfichiersEtudiants;
private JCheckBox chckbxZipfeedback;
private JCheckBox chckbxnoFeedback;
@@ -274,18 +275,23 @@ public class evaluate extends JFrame {
panelWest.add(lblFichierCSV, "cell 1 9,grow");
chckCSVNotes = new JCheckBox("Créer un fichier CSV des notes");
+ lblCsvNote = new JLabel("");
+ lblCsvNote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nocsvstudent.png")));
+ panelWest.add(lblCsvNote, "cell 0 10");
+ chckCSVNotes.setToolTipText("Cochez si vous voulez importer les notes dans un fichier CSV.");
+ panelWest.add(chckCSVNotes, "flowx,cell 1 10,grow");
+ chckCSVNotes.setSelected(commandes.ecritNoteCSV);
chckCSVNotes.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
if(chckCSVNotes.isSelected()) {
+ lblCsvNote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/csvstudent.png")));
commandes.ecritNoteCSV=true;
}else {
+ lblCsvNote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nocsvstudent.png")));
commandes.ecritNoteCSV=false;
}
}
});
- chckCSVNotes.setToolTipText("Cochez si vous voulez importer les notes dans un fichier CSV.");
- panelWest.add(chckCSVNotes, "flowx,cell 1 10,grow");
- chckCSVNotes.setSelected(commandes.ecritNoteCSV);
lblFichierSVG = new JLabel("Fichier SVG :");
lblFichierSVG.setFont(new Font("Tahoma", Font.BOLD, 14));
diff --git a/src/resources/csvstudent.png b/src/resources/csvstudent.png
new file mode 100644
index 0000000..101bbf3
Binary files /dev/null and b/src/resources/csvstudent.png differ
diff --git a/src/resources/csvstudentmini.png b/src/resources/csvstudentmini.png
new file mode 100644
index 0000000..0e6d2f0
Binary files /dev/null and b/src/resources/csvstudentmini.png differ
diff --git a/src/resources/nocsvstudent.png b/src/resources/nocsvstudent.png
new file mode 100644
index 0000000..9346758
Binary files /dev/null and b/src/resources/nocsvstudent.png differ
diff --git a/src/resources/nocsvstudentmini.png b/src/resources/nocsvstudentmini.png
new file mode 100644
index 0000000..5ec3170
Binary files /dev/null and b/src/resources/nocsvstudentmini.png differ