MAJ extension méthode permettant d'ajouter ou de supprimer la méthode

analyse à travers analyseStyle directement sur le node style:style.
This commit is contained in:
pablo rodriguez 2022-12-13 12:59:49 +01:00
parent df0b181f95
commit f22f63fb2a
18 changed files with 371 additions and 34 deletions

View File

@ -12,6 +12,6 @@
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/miglayout15-swing.jar"/>
<classpathentry kind="lib" path="jgoodies-forms-1.8.0.jar" sourcepath="jgoodies-forms-1.8.0-sources.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/Exportation documentation analyseWriter/plugins/documentation.analyseWriter_1.0.0.202212032022.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar" sourcepath="/cXML"/>
<classpathentry kind="output" path="bin"/>
</classpath>

Binary file not shown.

Binary file not shown.

View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
inkscape:export-ydpi="51.200001"
inkscape:export-xdpi="51.200001"
inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\evaluertouslesenfantsmini.png"
inkscape:export-ydpi="196.27"
inkscape:export-xdpi="196.27"
inkscape:export-filename="evaluertouslesenfantsmaxi.png"
sodipodi:docname="evaluertouslesenfants.svg"
inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
id="svg8"
version="1.1"
viewBox="0 0 11.90625 11.90625"
@ -51,7 +51,7 @@
inkscape:current-layer="g18818"
inkscape:document-units="mm"
inkscape:cy="19.378904"
inkscape:cx="-7.4534245"
inkscape:cx="8.987953"
inkscape:zoom="11.404154"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
@ -61,23 +61,29 @@
id="base"
inkscape:pagecheckerboard="0"
showguides="true"
inkscape:guide-bbox="true">
inkscape:guide-bbox="true"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1">
<sodipodi:guide
position="3.6888971,8.449359"
orientation="0,-1"
id="guide1163" />
id="guide1163"
inkscape:locked="false" />
<sodipodi:guide
position="9.0482382,5.0852704"
orientation="0,-1"
id="guide1165" />
id="guide1165"
inkscape:locked="false" />
<sodipodi:guide
position="9.0482382,1.6051788"
orientation="0,-1"
id="guide1167" />
id="guide1167"
inkscape:locked="false" />
<sodipodi:guide
position="6.380168,7.2197266"
orientation="1,0"
id="guide1169" />
id="guide1169"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata
id="metadata5">

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
inkscape:export-ydpi="96"
inkscape:export-xdpi="96"
inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\lesnodes evaluer.png"
inkscape:export-ydpi="196.27"
inkscape:export-xdpi="196.27"
inkscape:export-filename="lesnodesevaluermaxi.png"
sodipodi:docname="lesnodesevaluer.svg"
inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
id="svg8"
version="1.1"
viewBox="0 0 11.90625 11.90625"
@ -51,7 +51,7 @@
inkscape:current-layer="g956"
inkscape:document-units="mm"
inkscape:cy="24.45067"
inkscape:cx="22.681898"
inkscape:cx="9.1039728"
inkscape:zoom="9.6111886"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
@ -59,7 +59,9 @@
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:pagecheckerboard="0" />
inkscape:pagecheckerboard="0"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1" />
<metadata
id="metadata5">
<rdf:RDF>

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 204 KiB

View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
inkscape:export-ydpi="51.200001"
inkscape:export-xdpi="51.200001"
inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\evaluertouslesenfantsmini.png"
inkscape:export-ydpi="196.27"
inkscape:export-xdpi="196.27"
inkscape:export-filename="evaluertouslesenfantsmaxi.png"
sodipodi:docname="evaluertouslesenfants.svg"
inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
id="svg8"
version="1.1"
viewBox="0 0 11.90625 11.90625"
@ -51,7 +51,7 @@
inkscape:current-layer="g18818"
inkscape:document-units="mm"
inkscape:cy="19.378904"
inkscape:cx="-7.4534245"
inkscape:cx="8.987953"
inkscape:zoom="11.404154"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
@ -61,23 +61,29 @@
id="base"
inkscape:pagecheckerboard="0"
showguides="true"
inkscape:guide-bbox="true">
inkscape:guide-bbox="true"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1">
<sodipodi:guide
position="3.6888971,8.449359"
orientation="0,-1"
id="guide1163" />
id="guide1163"
inkscape:locked="false" />
<sodipodi:guide
position="9.0482382,5.0852704"
orientation="0,-1"
id="guide1165" />
id="guide1165"
inkscape:locked="false" />
<sodipodi:guide
position="9.0482382,1.6051788"
orientation="0,-1"
id="guide1167" />
id="guide1167"
inkscape:locked="false" />
<sodipodi:guide
position="6.380168,7.2197266"
orientation="1,0"
id="guide1169" />
id="guide1169"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata
id="metadata5">

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
inkscape:export-ydpi="96"
inkscape:export-xdpi="96"
inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\lesnodes evaluer.png"
inkscape:export-ydpi="196.27"
inkscape:export-xdpi="196.27"
inkscape:export-filename="lesnodesevaluermaxi.png"
sodipodi:docname="lesnodesevaluer.svg"
inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
id="svg8"
version="1.1"
viewBox="0 0 11.90625 11.90625"
@ -51,7 +51,7 @@
inkscape:current-layer="g956"
inkscape:document-units="mm"
inkscape:cy="24.45067"
inkscape:cx="22.681898"
inkscape:cx="9.1039728"
inkscape:zoom="9.6111886"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
@ -59,7 +59,9 @@
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:pagecheckerboard="0" />
inkscape:pagecheckerboard="0"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1" />
<metadata
id="metadata5">
<rdf:RDF>

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@ -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.</br>
* @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.</br>
* @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());

View File

@ -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();
}

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -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;
}