MAJ V4.5.0

ajout du bouton evalSautPageColonne
This commit is contained in:
pablo rodriguez 2024-04-10 13:43:43 +02:00
parent 0f8d77d3f0
commit b5230a665f
26 changed files with 118 additions and 18 deletions

1
bin/.gitignore vendored
View File

@ -205,3 +205,4 @@
/zipstudent.png
/zipstudent.svg
/zipstudentmini.png
/resources/

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -7,11 +7,11 @@
viewBox="0 0 11.90625 11.90625"
version="1.1"
id="svg5"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="sautpageColonne.svg"
inkscape:export-filename="sautpagecolonnemini.png"
inkscape:export-xdpi="51.200001"
inkscape:export-ydpi="51.200001"
inkscape:export-filename="sautpagecolonne.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
@ -28,9 +28,9 @@
inkscape:document-units="mm"
showgrid="false"
showguides="true"
inkscape:zoom="16.511111"
inkscape:cx="22.5"
inkscape:cy="22.076043"
inkscape:zoom="15.822222"
inkscape:cx="19.813904"
inkscape:cy="22.5"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
@ -97,5 +97,46 @@
d="m 2.7722493,5.6887196 0,-4.3586809 6.265604,3e-7 0,4.3907297"
id="path400"
sodipodi:nodetypes="cccc" />
<g
id="g919"
transform="matrix(1.077757,0,0,1.1015764,-6.0773944,3.0118424)"
style="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
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 1.6159,5.0384659 3.9724208,7.4062084"
id="path841" />
<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(1.0781672,0,0,1.1004826,-6.2327503,2.9294226)"
style="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>
</svg>

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

@ -7,11 +7,11 @@
viewBox="0 0 11.90625 11.90625"
version="1.1"
id="svg5"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="sautpageColonne.svg"
inkscape:export-filename="sautpagecolonnemini.png"
inkscape:export-xdpi="51.200001"
inkscape:export-ydpi="51.200001"
inkscape:export-filename="sautpagecolonne.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
@ -28,9 +28,9 @@
inkscape:document-units="mm"
showgrid="false"
showguides="true"
inkscape:zoom="16.511111"
inkscape:cx="22.5"
inkscape:cy="22.076043"
inkscape:zoom="15.822222"
inkscape:cx="19.813904"
inkscape:cy="22.5"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
@ -97,5 +97,46 @@
d="m 2.7722493,5.6887196 0,-4.3586809 6.265604,3e-7 0,4.3907297"
id="path400"
sodipodi:nodetypes="cccc" />
<g
id="g919"
transform="matrix(1.077757,0,0,1.1015764,-6.0773944,3.0118424)"
style="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
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 1.6159,5.0384659 3.9724208,7.4062084"
id="path841" />
<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(1.0781672,0,0,1.1004826,-6.2327503,2.9294226)"
style="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>
</svg>

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 766 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 732 B

View File

@ -692,7 +692,6 @@ public class meptl {
public static node attributLesParentsAuxNodes(node nod){
for(int i = 0 ; i<nod.getNodes().size();i++) {
nod.getNodes().get(i).setParent(nod);
// nod = attributLesParentsAuxNodes(nod.getNodes().get(i));
for(int j = 0 ; j<nod.getNodes().get(i).getNodes().size();j++) {
if(nod.getNodes().get(i).getNodes().get(j)!=null) {
node A = nod.getNodes().get(i).getNodes().get(j);

View File

@ -13,7 +13,7 @@ public class actEvalSautPageColonneNon extends AbstractAction{
{
putValue( Action.NAME, "Supprime l'évaluation du saut dans le paragraphe" );
putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du saut dans le paragraphe." );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/sautpagecolonnefalsemini.png")) );
}
/**
*

View File

@ -15,7 +15,7 @@ public class actEvalSautPageColonneOui extends AbstractAction{
{
putValue( Action.NAME, "Oui, combien de point?" );
putValue( Action.SHORT_DESCRIPTION, "Evaluer la présence ou l'absence d'un saut" );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")) );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/sautpagecolonnetruemini.png")) );
}
/**
*

View File

@ -18,7 +18,6 @@ import javax.swing.JLabel;
import javax.swing.JOptionPane;
import MEPTL.commandes;
import cXML.Run;
import cXML.node;
public class removeEvaluation {

View File

@ -48,6 +48,8 @@ import action.actCollapseNode;
import action.actDeleteNode;
import action.actDocumentation;
import action.actDownNode;
import action.actEvalSautPageColonneNon;
import action.actEvalSautPageColonneOui;
import action.actEvalueFalse;
import action.actEvalueTrue;
import action.actEvaluer;
@ -114,6 +116,8 @@ public final class create extends JFrame {
private final JButton btnevalNameLegacyStyleFalse = new JButton(new actEvaluerNomDuStyleHeriteFalse());
private final JButton btnanalyseStyletrue = new JButton(new actEvaluerStyleTrue());
private final JButton btnanalyseStylefalse = new JButton(new actEvaluerStyleFalse());
private final JButton btnevalSautPageColonnetrue = new JButton(new actEvalSautPageColonneOui());
private final JButton btnevalSautPageColonnefalse = new JButton(new actEvalSautPageColonneNon());
// private AbstractAction allContent = new actAllContent();
// private static JTable table = new JTable();
@ -130,6 +134,10 @@ public final class create extends JFrame {
btnanalyseStyletrue.setEnabled(false);
btnanalyseStylefalse.setIcon(new ImageIcon(create.class.getResource("/resources/evaluerstylefalse.png")));
btnanalyseStylefalse.setEnabled(false);
btnevalSautPageColonnetrue.setIcon(new ImageIcon(create.class.getResource("/resources/sautpagecolonnetrue.png")));
btnevalSautPageColonnetrue.setEnabled(false);
btnevalSautPageColonnefalse.setIcon(new ImageIcon(create.class.getResource("/resources/sautpagecolonnefalse.png")));
btnevalSautPageColonnefalse.setEnabled(false);
setBackground(new Color(255, 255, 255));
try {
@ -264,7 +272,13 @@ public final class create extends JFrame {
btnanalyseStylefalse.setText("");
panelDroiteBoutons.add(btnanalyseStylefalse, "cell 3 2");
btnevalSautPageColonnetrue.setText("");
panelDroiteBoutons.add(btnevalSautPageColonnetrue, "cell 0 3");
btnevalSautPageColonnefalse.setText("");
panelDroiteBoutons.add(btnevalSautPageColonnefalse, "cell 1 3");
JSplitPane splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, rightScrollPane, ScrollPaneTableBouton );
splitPane2.setBounds(10, 10, 1364, 783);
splitPane2.setBounds(10, 10, 1364, 783);
@ -344,6 +358,8 @@ public final class create extends JFrame {
btnanalyseStyletrue.setEnabled(false);
btnanalyseStylefalse.setEnabled(false);
btnAllContent.setEnabled(false);
btnevalSautPageColonnetrue.setEnabled(false);
btnevalSautPageColonnefalse.setEnabled(false);
if(listeDesNodesAllContent.isAllContent(nod)) {
btnAllContent.setEnabled(true);
@ -351,11 +367,14 @@ public final class create extends JFrame {
if(listeDesNodesFormatageDirect.isFormatageDirect(nod)) {
btnevalNameLegacyStyleTrue.setEnabled(true);
btnevalNameLegacyStyleFalse.setEnabled(true);
btnevalSautPageColonnetrue.setEnabled(true);
btnevalSautPageColonnefalse.setEnabled(true);
}
if(listeDesNodesAnalyseStyle.isAnalyseStyle(nod)) {
btnanalyseStyletrue.setEnabled(true);
btnanalyseStylefalse.setEnabled(true);
}
}
}
});

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 766 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 732 B