diff --git a/analyseWriter.exe b/analyseWriter.exe
index 6ff6592..d2014d3 100644
Binary files a/analyseWriter.exe and b/analyseWriter.exe differ
diff --git a/analyseWriter.jar b/analyseWriter.jar
index df869ae..5855432 100644
Binary files a/analyseWriter.jar and b/analyseWriter.jar differ
diff --git a/bin/.gitignore b/bin/.gitignore
index b1c64a5..27c8b35 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -3,3 +3,14 @@
/evaluer/
/MEPTL/
/resources/
+/dernierenfant.png
+/dernierenfant.svg
+/dernierenfantmini.png
+/information.png
+/information.svg
+/informationmaxi.png
+/informationmini.png
+/premierenfant.png
+/premierenfant.svg
+/premierenfantmini.png
+/calcul/
diff --git a/bin/calcul/calculNombrePointEvaluation.class b/bin/calcul/calculNombrePointEvaluation.class
index 0d47c70..f87945a 100644
Binary files a/bin/calcul/calculNombrePointEvaluation.class and b/bin/calcul/calculNombrePointEvaluation.class differ
diff --git a/bin/fenetres/afficheText.class b/bin/fenetres/afficheText.class
index 3e75a7d..bb05a41 100644
Binary files a/bin/fenetres/afficheText.class and b/bin/fenetres/afficheText.class differ
diff --git a/bin/fenetres/evaluate$1.class b/bin/fenetres/evaluate$1.class
index 96232ca..21f8147 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 caf88aa..ba57353 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 eaf7477..cfd29a5 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 e07df3d..7703924 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 94082c2..1b06899 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 135a3fd..48ca0bf 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 3dea44d..bd3acbe 100644
Binary files a/bin/fenetres/evaluate$15.class and b/bin/fenetres/evaluate$15.class differ
diff --git a/bin/fenetres/evaluate$2.class b/bin/fenetres/evaluate$2.class
index 6ec2237..cb9cce2 100644
Binary files a/bin/fenetres/evaluate$2.class and b/bin/fenetres/evaluate$2.class differ
diff --git a/bin/fenetres/evaluate$3.class b/bin/fenetres/evaluate$3.class
index 5462735..e2609d3 100644
Binary files a/bin/fenetres/evaluate$3.class and b/bin/fenetres/evaluate$3.class differ
diff --git a/bin/fenetres/evaluate$4.class b/bin/fenetres/evaluate$4.class
index e10f518..da8e300 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 535616d..0d9a8ab 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 10ac3af..79917d0 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 c259e60..19acabe 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 ae5e265..19c9c74 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 cc216a8..e8d428b 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 4aeeb86..00156b4 100644
Binary files a/bin/fenetres/evaluate.class and b/bin/fenetres/evaluate.class differ
diff --git a/bin/list/listeDesNodesAnalyseStyle.class b/bin/list/listeDesNodesAnalyseStyle.class
index 9640223..7206cec 100644
Binary files a/bin/list/listeDesNodesAnalyseStyle.class and b/bin/list/listeDesNodesAnalyseStyle.class differ
diff --git a/icons/dernierenfant.png b/icons/dernierenfant.png
new file mode 100644
index 0000000..9194d93
Binary files /dev/null and b/icons/dernierenfant.png differ
diff --git a/icons/dernierenfant.svg b/icons/dernierenfant.svg
new file mode 100644
index 0000000..51943c2
--- /dev/null
+++ b/icons/dernierenfant.svg
@@ -0,0 +1,82 @@
+
+
+
+
diff --git a/icons/dernierenfantmini.png b/icons/dernierenfantmini.png
new file mode 100644
index 0000000..8ec0970
Binary files /dev/null and b/icons/dernierenfantmini.png differ
diff --git a/icons/premierenfant.png b/icons/premierenfant.png
new file mode 100644
index 0000000..f5cfc58
Binary files /dev/null and b/icons/premierenfant.png differ
diff --git a/icons/premierenfant.svg b/icons/premierenfant.svg
new file mode 100644
index 0000000..2df4fd4
--- /dev/null
+++ b/icons/premierenfant.svg
@@ -0,0 +1,82 @@
+
+
+
+
diff --git a/icons/premierenfantmini.png b/icons/premierenfantmini.png
new file mode 100644
index 0000000..4e6241c
Binary files /dev/null and b/icons/premierenfantmini.png differ
diff --git a/src/calcul/calculNombrePointEvaluation.java b/src/calcul/calculNombrePointEvaluation.java
index 55329c2..1d2987b 100644
--- a/src/calcul/calculNombrePointEvaluation.java
+++ b/src/calcul/calculNombrePointEvaluation.java
@@ -126,6 +126,22 @@ public class calculNombrePointEvaluation {
}
}
+ if(nod.getAttributs().get("evalFirstChild")!=null) {
+ try {
+ point = point + Integer.valueOf(nod.getAttributs().get("evalFirstChild"));
+ } catch (Exception e) {
+ JOptionPane.showInternalMessageDialog(null, "Erreur dans la valeur de l'attribut evalFirstChild");
+ }
+ }
+
+ if(nod.getAttributs().get("evalLastChild")!=null) {
+ try {
+ point = point + Integer.valueOf(nod.getAttributs().get("evalLastChild"));
+ } catch (Exception e) {
+ JOptionPane.showInternalMessageDialog(null, "Erreur dans la valeur de l'attribut evalLastChild");
+ }
+ }
+
//***********************************************
//** Les points par la méthode analyseStyle *****
//***********************************************
@@ -177,13 +193,48 @@ public class calculNombrePointEvaluation {
* @return
*/
private static int calculNombreDepointDeAnalyseStyle(node nod, int point) {
+ if(nod!=null) {
+ if(nod.getAttributs().get("evaluer")!=null) if(nod.getAttributs().get("evaluer").equals("true")){
+
+ Enumeration key = nod.getAttributs().keys();
+ while(key.hasMoreElements()) {
+ String k = key.nextElement();
+ if(nod.getAttributs().get(k).contains("‼")) {
+ Pattern pt = Pattern.compile("[0-9]{1,}$");
+ Matcher match= pt.matcher(nod.getAttributs().get(k));
+ if(match.find()) {
+ String s= match.group();
+ try {
+ point = point + Integer.valueOf(s);
+ } catch (Exception e) {
+ JOptionPane.showInternalMessageDialog(null, "Erreur dans la valeur de l'attribut "+ k);
+ }
+ }
+ }
+ }
+ if(nod.getNodes().size()>0) {
+ for(int i = 0 ; i < nod.getNodes().size();i++) {
+ point = calculNombreDepointDeAnalyseStyle(nod.getNodes().get(i), point);
+ }
+ }
+ }
+ }
+ return point;
+ }
- if(nod.getAttributs().get("evaluer")!=null) if(nod.getAttributs().get("evaluer").equals("true")){
-
+ /**
+ * Calcul les points d'un style évalué par la méthode analyseStyle et qui hérite du node nod.
+ * @param nod
+ * @param point
+ * @return
+ */
+ @SuppressWarnings("unused")
+ private static int calculNombreDepointDepuisUnStyleDeAnalyseStyle(node nod, int point) {
+
Enumeration key = nod.getAttributs().keys();
while(key.hasMoreElements()) {
String k = key.nextElement();
- if(nod.getAttributs().get(k).contains("‼")) {
+ if(nod.getAttributs().get(k).contains("‼")||nod.getAttributs().get(k).contains("‽")) {
Pattern pt = Pattern.compile("[0-9]{1,}$");
Matcher match= pt.matcher(nod.getAttributs().get(k));
if(match.find()) {
@@ -199,61 +250,12 @@ public class calculNombrePointEvaluation {
if(nod.getNodes().size()>0) {
for(int i = 0 ; i < nod.getNodes().size();i++) {
- point = calculNombreDepointDeAnalyseStyle(nod.getNodes().get(i), point);
+ point = calculNombreDepointDepuisUnStyleDeAnalyseStyle(nod.getNodes().get(i), point);
}
}
-// //****************************
-// //*** Héritage d'un style ****
-// //****************************
-// if(nod.getAttributs().get("style:parent-style-name")!=null) {
-// String nomDuStyleParent = nod.getAttributs().get("style:parent-style-name");
-// Pattern p = Pattern.compile("^P[0-9]{1,}|^T[0-9]{1,}");
-// Matcher m = p.matcher(nod.getAttributs().get("style:name"));
-// if(m.find()) {
-// point = calculNombreDepointDepuisUnStyleDeAnalyseStyle(commandes.sujet.retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nomDuStyleParent), point);
-// }
-// }
- }
-
-
- return point;
-
- }
-
- /**
- * Calcul les points d'un style évalué par la méthode analyseStyle et qui hérite du node nod.
- * @param nod
- * @param point
- * @return
- */
- @SuppressWarnings("unused")
- private static int calculNombreDepointDepuisUnStyleDeAnalyseStyle(node nod, int point) {
+ return point;
- Enumeration key = nod.getAttributs().keys();
- while(key.hasMoreElements()) {
- String k = key.nextElement();
- if(nod.getAttributs().get(k).contains("‼")||nod.getAttributs().get(k).contains("‽")) {
- Pattern pt = Pattern.compile("[0-9]{1,}$");
- Matcher match= pt.matcher(nod.getAttributs().get(k));
- if(match.find()) {
- String s= match.group();
- try {
- point = point + Integer.valueOf(s);
- } catch (Exception e) {
- JOptionPane.showInternalMessageDialog(null, "Erreur dans la valeur de l'attribut "+ k);
- }
- }
- }
- }
-
- if(nod.getNodes().size()>0) {
- for(int i = 0 ; i < nod.getNodes().size();i++) {
- point = calculNombreDepointDepuisUnStyleDeAnalyseStyle(nod.getNodes().get(i), point);
- }
- }
-
- return point;
}
}
diff --git a/src/fenetres/afficheText.java b/src/fenetres/afficheText.java
index 71a383c..05ac861 100644
--- a/src/fenetres/afficheText.java
+++ b/src/fenetres/afficheText.java
@@ -434,6 +434,15 @@ public class afficheText extends JEditorPane {
setContentType("text/html");
setText(text.toString());
}
+
+
+ /**
+ *
+ * @param TextErreur
+ */
+ public void afficheErreur(String TextErreur) {
+ setText(TextErreur);
+ }
}
diff --git a/src/fenetres/evaluate.java b/src/fenetres/evaluate.java
index 1d3003a..3289db1 100644
--- a/src/fenetres/evaluate.java
+++ b/src/fenetres/evaluate.java
@@ -579,6 +579,23 @@ public class evaluate extends JFrame {
}
+ /**
+ * Getter du texteField txtmessages.
+ * @return
+ */
+ public static afficheText getTxtpnmessages() {
+ return txtpnmessages;
+ }
+
+ /**
+ * Setter du texteField txtmessages.
+ * @param txtpnmessages
+ */
+ public static void setTxtpnmessages(afficheText txtpnmessages) {
+ evaluate.txtpnmessages = txtpnmessages;
+ }
+
+
/**
*
* Evaluer l'ensemble des fichiers des étudiants.
diff --git a/src/list/listeDesNodesAnalyseStyle.java b/src/list/listeDesNodesAnalyseStyle.java
index 40b9d8d..09fd5f3 100644
--- a/src/list/listeDesNodesAnalyseStyle.java
+++ b/src/list/listeDesNodesAnalyseStyle.java
@@ -11,10 +11,14 @@ public class listeDesNodesAnalyseStyle {
*/
public static Boolean isAnalyseStyle(node nod) {
if(nod.getAttributs().get("text:style-name")!=null) return true;
- if(nod.getNomElt().contains("text:database-display")) return false;
- if(nod.getNomElt().contains("text:bookmark")) return false;
-
- if(nod.getNomElt().contains("text:")) return true;
+
+// if(nod.getAttributs().get("text:style-name")!=null) return true;
+// if(nod.getNomElt().contains("text:database-display")) return false;
+// if(nod.getNomElt().contains("text:bookmark")) return false;
+//
+// if(nod.getNomElt().contains("text:p")) return true;
+// if(nod.getNomElt().contains("text:list")) return true;
+// if(nod.getNomElt().contains("text:span")) return true;
return false;