MAJ V4.5.0 ajoute le bouton evaluer à travars analyse style.

This commit is contained in:
pablo rodriguez 2024-04-15 13:45:22 +02:00
parent 8bc6f68af5
commit e842a6b17f
19 changed files with 175 additions and 28 deletions

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg <svg
inkscape:export-ydpi="51.200001" inkscape:export-ydpi="96"
inkscape:export-xdpi="51.200001" inkscape:export-xdpi="96"
inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\atraversanalysestylemini.png" inkscape:export-filename="atraversanalysestylefalse.png"
sodipodi:docname="atraversanalysestyle.svg" sodipodi:docname="atraversanalysestyle.svg"
inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
id="svg8" id="svg8"
version="1.1" version="1.1"
viewBox="0 0 11.90625 11.90625" viewBox="0 0 11.90625 11.90625"
@ -62,7 +62,21 @@
id="base" id="base"
inkscape:pagecheckerboard="0" inkscape:pagecheckerboard="0"
inkscape:object-paths="true" inkscape:object-paths="true"
inkscape:snap-intersection-paths="true" /> inkscape:snap-intersection-paths="true"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1"
showguides="true">
<sodipodi:guide
position="11.074566,7.2294907"
orientation="1,0"
id="guide1"
inkscape:locked="false" />
<sodipodi:guide
position="7.0338459,0.60719965"
orientation="0,-1"
id="guide2"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata <metadata
id="metadata5"> id="metadata5">
<rdf:RDF> <rdf:RDF>
@ -85,7 +99,12 @@
<g <g
id="g1030"> id="g1030">
<path <path
style="fill:#ffff00;stroke:#000000;stroke-width:2.31646px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="fill:none;stroke:#ff0000;stroke-width:8.07278;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M -25.541842,185.0038 -3.5668547,164.97776"
id="path1473"
sodipodi:nodetypes="cc" />
<path
style="fill:#ffff00;stroke:#000000;stroke-width:4.06065284;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -8.81245,105.86292 h 51.052112 l 20.534924,32.54802 -44.777547,54.34903 -46.774001,-54.34903 z" d="m -8.81245,105.86292 h 51.052112 l 20.534924,32.54802 -44.777547,54.34903 -46.774001,-54.34903 z"
id="path3908" id="path3908"
sodipodi:nodetypes="cccccc" /> sodipodi:nodetypes="cccccc" />
@ -102,15 +121,59 @@
x="17.992798" x="17.992798"
y="162.66893">S</tspan></text> y="162.66893">S</tspan></text>
<path <path
style="fill:#ff0000;stroke:#ff0000;stroke-width:5.40067;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Mstart)" style="fill:#ff0000;stroke:#ff0000;stroke-width:8.12130567;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Mstart)"
d="M 55.58641,110.56027 19.731976,143.07235" d="M 55.58641,110.56027 19.731976,143.07235"
id="path1066" id="path1066"
sodipodi:nodetypes="cc" /> sodipodi:nodetypes="cc" />
<ellipse
style="fill:none;stroke:#ff0000;stroke-width:4.92652;stroke-linecap:round;stroke-linejoin:bevel"
id="path1"
cx="118.87125"
cy="91.072762"
rx="11.874482"
ry="7.8738527"
transform="matrix(0.7205252,0.69342876,-0.73546929,0.67755806,0,0)" />
<g
id="g919"
transform="matrix(8.7527942,0,0,8.9462388,-26.171277,184.68619)"
style="fill:#0000ff;stroke:#000000;stroke-width:0.57493;stroke-opacity:1">
<rect
ry="0.56339979"
y="4.3255968"
x="0.92013353"
height="3.7594025"
width="3.8382711"
id="rect12"
style="fill:#de0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0373705;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
rx="0.5800662" />
<path <path
style="fill:none;stroke:#ff0000;stroke-width:5.40067;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:#ffffff;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M -27.364949,185.6115 -5.487668,165.25348" d="M 1.6159,5.0384659 3.9724208,7.4062084"
id="path1473" id="path841" />
sodipodi:nodetypes="cc" /> <path
id="path843"
d="M 3.9724208,5.0384659 1.6159,7.4062084"
style="fill:none;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="g923-4"
transform="matrix(8.7561255,0,0,8.9373557,16.655881,220.66679)"
style="fill:#0000ff;stroke-width:0.553289">
<rect
style="fill:#00bf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0359638;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
id="rect10-6"
width="3.8382711"
height="3.7594025"
x="0.92013353"
y="0.34176376"
ry="0.56339979"
rx="0.5800662" />
<path
style="fill:#ffffff;stroke:none;stroke-width:0.146391px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 1.4619106,1.7500935 C 1.3627577,2.4034195 1.7869697,2.7038331 2.3820759,3.4752278 2.7236407,3.2105071 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.3467309,1.6796751 2.3752981,2.7432214 1.891109,2.378332 1.7782083,2.0571129 1.4619106,1.7500935 Z"
id="path16-3"
sodipodi:nodetypes="ccccc" />
</g>
</g> </g>
</g> </g>
</g> </g>

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg <svg
inkscape:export-ydpi="51.200001" inkscape:export-ydpi="96"
inkscape:export-xdpi="51.200001" inkscape:export-xdpi="96"
inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\atraversanalysestylemini.png" inkscape:export-filename="atraversanalysestylefalse.png"
sodipodi:docname="atraversanalysestyle.svg" sodipodi:docname="atraversanalysestyle.svg"
inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
id="svg8" id="svg8"
version="1.1" version="1.1"
viewBox="0 0 11.90625 11.90625" viewBox="0 0 11.90625 11.90625"
@ -62,7 +62,21 @@
id="base" id="base"
inkscape:pagecheckerboard="0" inkscape:pagecheckerboard="0"
inkscape:object-paths="true" inkscape:object-paths="true"
inkscape:snap-intersection-paths="true" /> inkscape:snap-intersection-paths="true"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1"
showguides="true">
<sodipodi:guide
position="11.074566,7.2294907"
orientation="1,0"
id="guide1"
inkscape:locked="false" />
<sodipodi:guide
position="7.0338459,0.60719965"
orientation="0,-1"
id="guide2"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata <metadata
id="metadata5"> id="metadata5">
<rdf:RDF> <rdf:RDF>
@ -85,7 +99,12 @@
<g <g
id="g1030"> id="g1030">
<path <path
style="fill:#ffff00;stroke:#000000;stroke-width:2.31646px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="fill:none;stroke:#ff0000;stroke-width:8.07278;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M -25.541842,185.0038 -3.5668547,164.97776"
id="path1473"
sodipodi:nodetypes="cc" />
<path
style="fill:#ffff00;stroke:#000000;stroke-width:4.06065284;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -8.81245,105.86292 h 51.052112 l 20.534924,32.54802 -44.777547,54.34903 -46.774001,-54.34903 z" d="m -8.81245,105.86292 h 51.052112 l 20.534924,32.54802 -44.777547,54.34903 -46.774001,-54.34903 z"
id="path3908" id="path3908"
sodipodi:nodetypes="cccccc" /> sodipodi:nodetypes="cccccc" />
@ -102,15 +121,59 @@
x="17.992798" x="17.992798"
y="162.66893">S</tspan></text> y="162.66893">S</tspan></text>
<path <path
style="fill:#ff0000;stroke:#ff0000;stroke-width:5.40067;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Mstart)" style="fill:#ff0000;stroke:#ff0000;stroke-width:8.12130567;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Mstart)"
d="M 55.58641,110.56027 19.731976,143.07235" d="M 55.58641,110.56027 19.731976,143.07235"
id="path1066" id="path1066"
sodipodi:nodetypes="cc" /> sodipodi:nodetypes="cc" />
<ellipse
style="fill:none;stroke:#ff0000;stroke-width:4.92652;stroke-linecap:round;stroke-linejoin:bevel"
id="path1"
cx="118.87125"
cy="91.072762"
rx="11.874482"
ry="7.8738527"
transform="matrix(0.7205252,0.69342876,-0.73546929,0.67755806,0,0)" />
<g
id="g919"
transform="matrix(8.7527942,0,0,8.9462388,-26.171277,184.68619)"
style="fill:#0000ff;stroke:#000000;stroke-width:0.57493;stroke-opacity:1">
<rect
ry="0.56339979"
y="4.3255968"
x="0.92013353"
height="3.7594025"
width="3.8382711"
id="rect12"
style="fill:#de0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0373705;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
rx="0.5800662" />
<path <path
style="fill:none;stroke:#ff0000;stroke-width:5.40067;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:#ffffff;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M -27.364949,185.6115 -5.487668,165.25348" d="M 1.6159,5.0384659 3.9724208,7.4062084"
id="path1473" id="path841" />
sodipodi:nodetypes="cc" /> <path
id="path843"
d="M 3.9724208,5.0384659 1.6159,7.4062084"
style="fill:none;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="g923-4"
transform="matrix(8.7561255,0,0,8.9373557,16.655881,220.66679)"
style="fill:#0000ff;stroke-width:0.553289">
<rect
style="fill:#00bf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0359638;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
id="rect10-6"
width="3.8382711"
height="3.7594025"
x="0.92013353"
y="0.34176376"
ry="0.56339979"
rx="0.5800662" />
<path
style="fill:#ffffff;stroke:none;stroke-width:0.146391px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 1.4619106,1.7500935 C 1.3627577,2.4034195 1.7869697,2.7038331 2.3820759,3.4752278 2.7236407,3.2105071 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.3467309,1.6796751 2.3752981,2.7432214 1.891109,2.378332 1.7782083,2.0571129 1.4619106,1.7500935 Z"
id="path16-3"
sodipodi:nodetypes="ccccc" />
</g>
</g> </g>
</g> </g>
</g> </g>

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -16,7 +16,7 @@ public class actEvaluerATraversAnalyseStyleFalse extends AbstractAction{
{ {
putValue( Action.NAME, "N'évaluer pas le style dans la structure." ); 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.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"))); putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/atraversanalysestylefalsemini.png")));
} }
/** /**
* *

View File

@ -16,7 +16,7 @@ public class actEvaluerATraversAnalyseStyleTrue extends AbstractAction{
{ {
putValue( Action.NAME, "Evaluer le style dans la structure." ); 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.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"))); putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/atraversanalysestyletruemini.png")));
} }
/** /**
* *

View File

@ -13,7 +13,7 @@ public class actEvaluerLegacyStyleParentFalse extends AbstractAction{
{ {
putValue( Action.NAME, "Supprime l'évaluation de la présence ou absence du style Parent." ); putValue( Action.NAME, "Supprime l'évaluation de la présence ou absence du style Parent." );
putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la présence ou absence du style Parent." ); putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la présence ou absence du style Parent." );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/heritagestylefalse.png")) ); putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) );
} }
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

View File

@ -86,6 +86,8 @@ import action.actEvalTabDefautStyleLeaderOui;
import action.actEvalueFalse; import action.actEvalueFalse;
import action.actEvalueTrue; import action.actEvalueTrue;
import action.actEvaluer; import action.actEvaluer;
import action.actEvaluerATraversAnalyseStyleFalse;
import action.actEvaluerATraversAnalyseStyleTrue;
import action.actEvaluerNomDuStyleHeriteFalse; import action.actEvaluerNomDuStyleHeriteFalse;
import action.actEvaluerNomDuStyleHeriteTrue; import action.actEvaluerNomDuStyleHeriteTrue;
import action.actEvaluerStyleFalse; import action.actEvaluerStyleFalse;
@ -186,6 +188,8 @@ public final class create extends JFrame {
private final JButton btnevalTABAlignementAGauchefalse = new JButton(new actEvalTabAlignementGaucheNon()); private final JButton btnevalTABAlignementAGauchefalse = new JButton(new actEvalTabAlignementGaucheNon());
private final JButton btnevalTABStyleLeaderDefaulttrue = new JButton(new actEvalTabDefautStyleLeaderOui()); private final JButton btnevalTABStyleLeaderDefaulttrue = new JButton(new actEvalTabDefautStyleLeaderOui());
private final JButton btnevalTABStyleLeaderDefaultfalse = new JButton(new actEvalTabDefautStyleLeaderNon()); private final JButton btnevalTABStyleLeaderDefaultfalse = new JButton(new actEvalTabDefautStyleLeaderNon());
private final JButton btnEvaluerATraversAnalyseStyletrue = new JButton(new actEvaluerATraversAnalyseStyleTrue());
private final JButton btnEvaluerATraversAnalyseStylefalse = new JButton(new actEvaluerATraversAnalyseStyleFalse());
// private AbstractAction allContent = new actAllContent(); // private AbstractAction allContent = new actAllContent();
@ -271,6 +275,10 @@ public final class create extends JFrame {
btnevalTABStyleLeaderDefaulttrue.setEnabled(false); btnevalTABStyleLeaderDefaulttrue.setEnabled(false);
btnevalTABStyleLeaderDefaultfalse.setIcon(new ImageIcon(create.class.getResource("/resources/EvalTabDefautStyleLeaderfalse.png"))); btnevalTABStyleLeaderDefaultfalse.setIcon(new ImageIcon(create.class.getResource("/resources/EvalTabDefautStyleLeaderfalse.png")));
btnevalTABStyleLeaderDefaultfalse.setEnabled(false); btnevalTABStyleLeaderDefaultfalse.setEnabled(false);
btnEvaluerATraversAnalyseStyletrue.setIcon(new ImageIcon(create.class.getResource("/resources/atraversanalysestyletrue.png")));
btnEvaluerATraversAnalyseStyletrue.setEnabled(false);
btnEvaluerATraversAnalyseStylefalse.setIcon(new ImageIcon(create.class.getResource("/resources/atraversanalysestylefalse.png")));
btnEvaluerATraversAnalyseStylefalse.setEnabled(false);
setBackground(new Color(255, 255, 255)); setBackground(new Color(255, 255, 255));
try { try {
@ -512,6 +520,12 @@ public final class create extends JFrame {
btnevalTABStyleLeaderDefaultfalse.setText(""); btnevalTABStyleLeaderDefaultfalse.setText("");
panelDroiteBoutons.add(btnevalTABStyleLeaderDefaultfalse, "cell 3 7"); panelDroiteBoutons.add(btnevalTABStyleLeaderDefaultfalse, "cell 3 7");
btnEvaluerATraversAnalyseStyletrue.setText("");
panelDroiteBoutons.add(btnEvaluerATraversAnalyseStyletrue, "cell 4 7");
btnEvaluerATraversAnalyseStylefalse.setText("");
panelDroiteBoutons.add(btnEvaluerATraversAnalyseStylefalse, "cell 5 7");
JSplitPane splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, rightScrollPane, ScrollPaneTableBouton ); JSplitPane splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, rightScrollPane, ScrollPaneTableBouton );
splitPane2.setBounds(10, 10, 1364, 783); splitPane2.setBounds(10, 10, 1364, 783);
@ -626,6 +640,9 @@ public final class create extends JFrame {
btnevalTABAlignementAGauchefalse.setEnabled(false); btnevalTABAlignementAGauchefalse.setEnabled(false);
btnevalTABStyleLeaderDefaulttrue.setEnabled(false); btnevalTABStyleLeaderDefaulttrue.setEnabled(false);
btnevalTABStyleLeaderDefaultfalse.setEnabled(false); btnevalTABStyleLeaderDefaultfalse.setEnabled(false);
btnEvaluerATraversAnalyseStyletrue.setEnabled(false);
btnEvaluerATraversAnalyseStylefalse.setEnabled(false);
if(listeDesNodesAllContent.isAllContent(nod)) { if(listeDesNodesAllContent.isAllContent(nod)) {
btnAllContent.setEnabled(true); btnAllContent.setEnabled(true);
@ -692,6 +709,10 @@ public final class create extends JFrame {
btnevalTABStyleLeaderDefaulttrue.setEnabled(true); btnevalTABStyleLeaderDefaulttrue.setEnabled(true);
btnevalTABStyleLeaderDefaultfalse.setEnabled(true); btnevalTABStyleLeaderDefaultfalse.setEnabled(true);
} }
if(nod.getNomElt().equals("style:style")) {
btnEvaluerATraversAnalyseStyletrue.setEnabled(true);
btnEvaluerATraversAnalyseStylefalse.setEnabled(true);
}
} }
} }
}); });
@ -1012,7 +1033,7 @@ public final class create extends JFrame {
System.out.println( "Cut" ); System.out.println( "Cut" );
} }
}; };
private final JLabel lblNewLabel_1 = new JLabel("Les méthodes d'évaluations d'un node"); private final JLabel lblNewLabel_1 = new JLabel("Les méthodes d'évaluation d'un node");
/** /**

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB