MAJ V4.4.1

This commit is contained in:
pablo rodriguez 2022-12-15 08:52:32 +01:00
parent cb570af758
commit 19bdce3ef8
25 changed files with 249 additions and 20 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" sourcepath="/cXML"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

Binary file not shown.

Binary file not shown.

16
bin/.gitignore vendored
View File

@ -1,16 +1,4 @@
/calcul/
/evaluer/
/fenetres/
/list/
/evaluer/
/MEPTL/
/resources/
/dernierenfant.png
/dernierenfant.svg
/dernierenfantmini.png
/information.png
/information.svg
/informationmaxi.png
/informationmini.png
/premierenfant.png
/premierenfant.svg
/premierenfantmini.png
/calcul/

BIN
bin/dernierenfant.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 697 B

82
bin/dernierenfant.svg Normal file
View File

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="45"
height="45"
viewBox="0 0 11.90625 11.90625"
version="1.1"
id="svg5"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="dernierenfant.svg"
inkscape:export-filename="dernierenfantmini.png"
inkscape:export-xdpi="51.200001"
inkscape:export-ydpi="51.200001"
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"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview7"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="16.511111"
inkscape:cx="22.5"
inkscape:cy="22.802826"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" />
<defs
id="defs2" />
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1">
<g
id="g589"
transform="translate(-0.48073688,-0.46471231)">
<rect
style="fill:#000000;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect263"
width="1.5543826"
height="9.9512548"
x="1.8428249"
y="1.0095441" />
<rect
style="fill:#000000;stroke:#000000;stroke-width:0.999997;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect373"
width="1.5543826"
height="4.3907304"
x="9.4064178"
y="-6.2335539"
transform="rotate(90)"
ry="0"
rx="0" />
<rect
style="fill:#000000;stroke:#000000;stroke-width:0.999997;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect375"
width="1.5543826"
height="4.3907304"
x="3.8458955"
y="-6.2976522"
transform="rotate(90)" />
</g>
<ellipse
style="fill:#00ff00;stroke:#00ff00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="path483"
cx="7.5155201"
cy="9.2862339"
rx="2.0671687"
ry="2.0751808" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
bin/dernierenfantmini.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 443 B

BIN
bin/information.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

72
bin/information.svg Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 14 KiB

BIN
bin/informationmaxi.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
bin/informationmini.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
bin/premierenfant.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 711 B

82
bin/premierenfant.svg Normal file
View File

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="45"
height="45"
viewBox="0 0 11.90625 11.90625"
version="1.1"
id="svg5"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="premierenfant.svg"
inkscape:export-filename="premierenfant.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"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview7"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="16.511111"
inkscape:cx="14.565949"
inkscape:cy="22.802827"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" />
<defs
id="defs2" />
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1">
<g
id="g589"
transform="translate(-0.48073688,-0.46471231)">
<rect
style="fill:#000000;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect263"
width="1.5543826"
height="9.9512548"
x="1.8428249"
y="1.0095441" />
<rect
style="fill:#000000;stroke:#000000;stroke-width:0.999997;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect373"
width="1.5543826"
height="4.3907304"
x="9.4064178"
y="-6.2335539"
transform="rotate(90)"
ry="0"
rx="0" />
<rect
style="fill:#000000;stroke:#000000;stroke-width:0.999997;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect375"
width="1.5543826"
height="4.3907304"
x="3.8458955"
y="-6.2976522"
transform="rotate(90)" />
</g>
<ellipse
style="fill:#00ff00;stroke:#00ff00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="path483"
cx="7.7078147"
cy="4.0301771"
rx="2.0671687"
ry="2.0751808" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
bin/premierenfantmini.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 452 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 697 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 443 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 711 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 452 B

View File

@ -79,11 +79,11 @@ public class actNewFichierAnalyse extends AbstractAction{
//Supprime l'historique des modifications
commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes");
// commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:deletion");
// commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change-start");
// commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change-end");
// commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes");
// commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change");
commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:deletion");
commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change-start");
commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change-end");
commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes");
commandes.sujet.supprimeTousLesNodesEnfantWithThisName("text:change");
commandes.sujet = meptl.LectureFichierEtudiantSousFormeDeNode(commandes.sujet,b,0);

View File

@ -152,6 +152,11 @@ public class evaluerLesFichiersEtudiants implements Runnable{
try {
//Supprime l'historique des modifications
nod.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes");
nod.supprimeTousLesNodesEnfantWithThisName("text:deletion");
nod.supprimeTousLesNodesEnfantWithThisName("text:change-start");
nod.supprimeTousLesNodesEnfantWithThisName("text:change-end");
nod.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes");
nod.supprimeTousLesNodesEnfantWithThisName("text:change");
//Création du node de l'étudiant
nodStudent = meptl.LectureFichierEtudiantSousFormeDeNode(nod,a,i);
} catch (IOException e1) {