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 378f636..aae13f0 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index 3b396f0..e31edf2 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/evaluertouslesenfants.svg b/bin/evaluertouslesenfants.svg index 94ee162..d9297b2 100644 --- a/bin/evaluertouslesenfants.svg +++ b/bin/evaluertouslesenfants.svg @@ -1,10 +1,10 @@ + inkscape:guide-bbox="true" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1"> + id="guide1163" + inkscape:locked="false" /> + id="guide1165" + inkscape:locked="false" /> + id="guide1167" + inkscape:locked="false" /> + id="guide1169" + inkscape:locked="false" /> diff --git a/bin/fenetres/createPopupMenu.class b/bin/fenetres/createPopupMenu.class index a5f34b8..ad3cae9 100644 Binary files a/bin/fenetres/createPopupMenu.class and b/bin/fenetres/createPopupMenu.class differ diff --git a/bin/fenetres/create_act/actEvaluerStyleTrue.class b/bin/fenetres/create_act/actEvaluerStyleTrue.class index 7eb1a1e..a08dfc2 100644 Binary files a/bin/fenetres/create_act/actEvaluerStyleTrue.class and b/bin/fenetres/create_act/actEvaluerStyleTrue.class differ diff --git a/bin/lesnodesevaluer.svg b/bin/lesnodesevaluer.svg index 1c61ca6..43abc48 100644 --- a/bin/lesnodesevaluer.svg +++ b/bin/lesnodesevaluer.svg @@ -1,10 +1,10 @@ + inkscape:pagecheckerboard="0" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1" /> diff --git a/bin/list/listeDesNotesAEvaluer.class b/bin/list/listeDesNotesAEvaluer.class index be4d658..b67a590 100644 Binary files a/bin/list/listeDesNotesAEvaluer.class and b/bin/list/listeDesNotesAEvaluer.class differ diff --git a/icons/dessin.svgparamètres évaluation et feedback.svg b/icons/dessin.svgparamètres évaluation et feedback.svg new file mode 100644 index 0000000..4edf861 --- /dev/null +++ b/icons/dessin.svgparamètres évaluation et feedback.svg @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/evaluertouslesenfants.svg b/icons/evaluertouslesenfants.svg index 94ee162..d9297b2 100644 --- a/icons/evaluertouslesenfants.svg +++ b/icons/evaluertouslesenfants.svg @@ -1,10 +1,10 @@ + inkscape:guide-bbox="true" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1"> + id="guide1163" + inkscape:locked="false" /> + id="guide1165" + inkscape:locked="false" /> + id="guide1167" + inkscape:locked="false" /> + id="guide1169" + inkscape:locked="false" /> diff --git a/icons/evaluertouslesenfantsmaxi.png b/icons/evaluertouslesenfantsmaxi.png new file mode 100644 index 0000000..2c31e90 Binary files /dev/null and b/icons/evaluertouslesenfantsmaxi.png differ diff --git a/icons/lesnodesevaluer.svg b/icons/lesnodesevaluer.svg index 1c61ca6..43abc48 100644 --- a/icons/lesnodesevaluer.svg +++ b/icons/lesnodesevaluer.svg @@ -1,10 +1,10 @@ + inkscape:pagecheckerboard="0" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1" /> diff --git a/icons/lesnodesevaluermaxi.png b/icons/lesnodesevaluermaxi.png new file mode 100644 index 0000000..b0377d1 Binary files /dev/null and b/icons/lesnodesevaluermaxi.png differ diff --git a/src/fenetres/createPopupMenu.java b/src/fenetres/createPopupMenu.java index 8d15c15..69fb8d0 100644 --- a/src/fenetres/createPopupMenu.java +++ b/src/fenetres/createPopupMenu.java @@ -74,6 +74,8 @@ import fenetres.create_act.actsautfalse; import fenetres.create_act.actsautmultiplefalse; import fenetres.create_act.actsautmultipletrue; import fenetres.create_act.actsauttrue; +import fenetres.create_act.mnEvaluerATraversAnalyseStyleFalse; +import fenetres.create_act.mnEvaluerATraversAnalyseStyleTrue; import list.listeDesNodesAllContent; import list.listeDesNodesAnalyseStyle; import list.listeDesNodesAvecEvalNameNode; @@ -327,6 +329,18 @@ if(nod!=null) { return mnAnalyseStyle; } + /** + * Manue Evaluer un style dans la structure.
+ * @return + */ + private JMenu mnEvaluerATraversAnalyseStyle() { + JMenu mnEvaluerATraversAnalyseStyle = new JMenu("Evaluer le style dans la structure"); + mnEvaluerATraversAnalyseStyle.setIcon(new ImageIcon(create.class.getResource("/resources/atraversanalysestylemini.png"))); + mnEvaluerATraversAnalyseStyle.add(new mnEvaluerATraversAnalyseStyleTrue()); + mnEvaluerATraversAnalyseStyle.add( new mnEvaluerATraversAnalyseStyleFalse()); + return mnEvaluerATraversAnalyseStyle; + } + /** * Menu entête active.
* @return @@ -671,6 +685,11 @@ if(nod!=null) { mnGroupeMethodeEvaluer.add(mnEvalPiedPagePasActive()); } + if(nod.getNomElt().equals("style:style")) { + mnGroupeMethodeEvaluer.addSeparator(); + mnGroupeMethodeEvaluer.add(mnEvaluerATraversAnalyseStyle()); + } + if(nod.getNomElt().equals("meta:initial-creator")) { mnGroupeMethodeEvaluer.addSeparator(); mnGroupeMethodeEvaluer.add(new actEvalInitialCreator()); diff --git a/src/fenetres/create_act/actEvaluerStyleTrue.java b/src/fenetres/create_act/actEvaluerStyleTrue.java index 2ffb7fa..09fb164 100644 --- a/src/fenetres/create_act/actEvaluerStyleTrue.java +++ b/src/fenetres/create_act/actEvaluerStyleTrue.java @@ -36,7 +36,7 @@ public class actEvaluerStyleTrue extends AbstractAction{ node nodStyle = commandes.sujet.retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nod.getAttributs().get("text:style-name")); if(nodStyle!=null) { nodStyle.getAttributs().put("EvaluerATraversAnalyseStyle", "true"); - nodStyle.evaluerTrue(); +// nodStyle.evaluerTrue(); nodStyle.changeLesCodesEvaluateursVersCodeATraversAnalyseStyle(); } diff --git a/src/fenetres/create_act/mnEvaluerATraversAnalyseStyleFalse.java b/src/fenetres/create_act/mnEvaluerATraversAnalyseStyleFalse.java new file mode 100644 index 0000000..3e10c34 --- /dev/null +++ b/src/fenetres/create_act/mnEvaluerATraversAnalyseStyleFalse.java @@ -0,0 +1,44 @@ +package fenetres.create_act; + +import java.awt.event.ActionEvent; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.ImageIcon; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreePath; +import cXML.node; +import fenetres.create; + +public class mnEvaluerATraversAnalyseStyleFalse extends AbstractAction{ + { + putValue( Action.NAME, "N'évaluer pas le style dans la structure." ); + putValue( Action.SHORT_DESCRIPTION, "N'évaluer pas le style:name de ce node dans la struture du fichier de l'étudiant" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); + } + /** + * + */ + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { + node nod = (node) fenetres.create.getSelectNode().getUserObject(); + nod.getAttributs().put("EvaluerATraversAnalyseStyle", "false"); + nod.changeLesCodesEvaluateursVersCodeEvaluateurDirect(); + TreePath path = fenetres.create.getTree().getSelectionPath(); + + DefaultTreeModel model = (DefaultTreeModel) fenetres.create.getTree().getModel(); + DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); + model.reload(root); + + fenetres.create.getTree().setSelectionPath(path); + fenetres.create.getTree().expandPath(path); + + + fenetres.create.getTextNodeSelect().refreshAffichage(nod); + + } + +} diff --git a/src/fenetres/create_act/mnEvaluerATraversAnalyseStyleTrue.java b/src/fenetres/create_act/mnEvaluerATraversAnalyseStyleTrue.java new file mode 100644 index 0000000..08b15eb --- /dev/null +++ b/src/fenetres/create_act/mnEvaluerATraversAnalyseStyleTrue.java @@ -0,0 +1,47 @@ +package fenetres.create_act; + +import java.awt.event.ActionEvent; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.ImageIcon; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreePath; + +import cXML.node; +import fenetres.create; + +public class mnEvaluerATraversAnalyseStyleTrue extends AbstractAction{ + { + putValue( Action.NAME, "Evaluer le style dans la structure." ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer le style:name de ce node dans la struture du fichier de l'étudiant"); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); + } + /** + * + */ + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { + node nod = (node) fenetres.create.getSelectNode().getUserObject(); + nod.getAttributs().put("EvaluerATraversAnalyseStyle", "true"); + nod.changeLesCodesEvaluateursVersCodeATraversAnalyseStyle(); + + + TreePath path = fenetres.create.getTree().getSelectionPath(); + + DefaultTreeModel model = (DefaultTreeModel) fenetres.create.getTree().getModel(); + DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); + model.reload(root); + + fenetres.create.getTree().setSelectionPath(path); + fenetres.create.getTree().expandPath(path); + + + fenetres.create.getTextNodeSelect().refreshAffichage(nod); + + } + +} diff --git a/src/list/listeDesNotesAEvaluer.java b/src/list/listeDesNotesAEvaluer.java index f475b63..bfec363 100644 --- a/src/list/listeDesNotesAEvaluer.java +++ b/src/list/listeDesNotesAEvaluer.java @@ -14,6 +14,7 @@ public class listeDesNotesAEvaluer { if(nod.getNomElt().equals("dc:creator")) return true; if(nod.getNomElt().equals("text:sequence-decl")) return true; if(nod.getNomElt().equals("text:user-defined")) return true; + if(nod.getNomElt().equals("style:style")) return true; return false; }