MAJ V4.4.1 (nettoyage code, modifications d'icones, prise en compte de
l'ordre des nodes principaux dans le feedback, affichage de la distance de levenshtein)
This commit is contained in:
pablo rodriguez
parent
81fee169ed
commit
438f9130d8
@ -12,6 +12,6 @@
|
|||||||
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/miglayout15-swing.jar"/>
|
<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="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/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"/>
|
<classpathentry kind="output" path="bin"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|||||||
BIN
Comment ajouter une nouvelle méthode dans analyseWriter.odt
Normal file
BIN
Comment ajouter une nouvelle méthode dans analyseWriter.odt
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
4
bin/.gitignore
vendored
4
bin/.gitignore
vendored
@ -1,5 +1,5 @@
|
|||||||
/calcul/
|
|
||||||
/evaluer/
|
|
||||||
/fenetres/
|
/fenetres/
|
||||||
/list/
|
/list/
|
||||||
/MEPTL/
|
/MEPTL/
|
||||||
|
/evaluer/
|
||||||
|
/resources/
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.3 KiB |
@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<svg
|
<svg
|
||||||
inkscape:export-ydpi="96"
|
inkscape:export-ydpi="51.200001"
|
||||||
inkscape:export-xdpi="96"
|
inkscape:export-xdpi="51.200001"
|
||||||
inkscape:export-filename="ou.png"
|
inkscape:export-filename="dossieretudiantmin.png"
|
||||||
sodipodi:docname="dossieretudiant.svg"
|
sodipodi:docname="dossieretudiant.svg"
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
id="svg8"
|
id="svg8"
|
||||||
@ -38,10 +38,10 @@
|
|||||||
showguides="true"
|
showguides="true"
|
||||||
showgrid="false"
|
showgrid="false"
|
||||||
inkscape:document-rotation="0"
|
inkscape:document-rotation="0"
|
||||||
inkscape:current-layer="layer1"
|
inkscape:current-layer="g478"
|
||||||
inkscape:document-units="mm"
|
inkscape:document-units="mm"
|
||||||
inkscape:cy="29.257603"
|
inkscape:cy="29.401492"
|
||||||
inkscape:cx="27.962594"
|
inkscape:cx="10.120253"
|
||||||
inkscape:zoom="10.424641"
|
inkscape:zoom="10.424641"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:pageopacity="0.0"
|
inkscape:pageopacity="0.0"
|
||||||
@ -93,48 +93,60 @@
|
|||||||
id="layer1"
|
id="layer1"
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
inkscape:label="Calque 1">
|
inkscape:label="Calque 1">
|
||||||
|
<path
|
||||||
|
id="path576"
|
||||||
|
style="fill:#786721;stroke:#a0892c;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
|
||||||
|
d="M 2.1052428,1.1137087 1.7770914,3.064063 0.63276537,9.8653165 C 0.6016851,10.2186 0.64683054,10.505997 1.0228574,10.64565 H 9.474303 c 0.4966042,-0.135427 0.553384,-0.28128 0.766037,-0.7337815 l 1.233592,-7.3318 C 11.585399,2.1838499 11.370236,1.972458 10.997462,1.9957335 H 6.4327077 L 6.5771943,1.1369842 C 6.5996475,0.70652435 6.4810977,0.49756215 6.1159967,0.52083775 H 2.952354 C 2.5254768,0.53863905 2.1522775,0.69985285 2.1052428,1.1137087 Z"
|
||||||
|
sodipodi:nodetypes="ccccccccccccc" />
|
||||||
<path
|
<path
|
||||||
id="rect363"
|
id="rect363"
|
||||||
style="fill:#ffdd55;stroke:#d4aa00;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
|
style="fill:#ffdd55;stroke:#d4aa00;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
|
||||||
d="M 0.58190715,0.41949439 V 3.1927264 11.459984 H 11.381558 V 2.0277783 H 5.6090268 V 0.41949439 Z"
|
d="m 0.55639053,1.4205009 v 1.9503543 6.8012538 c 0.0292204,0.353283 0.12555739,0.64068 0.53719937,0.780333 H 9.8013835 C 10.289573,10.817015 10.32279,10.671162 10.463451,10.218661 V 2.8868607 C 10.509612,2.4906421 10.251276,2.2792502 9.8712315,2.3025257 H 5.1680194 V 1.4437764 C 5.116531,1.0133166 4.9581606,0.80435439 4.5860203,0.82762989 H 1.3264186 C 0.88967954,0.84543129 0.53310766,1.0066451 0.55639053,1.4205009 Z"
|
||||||
sodipodi:nodetypes="cccccccc" />
|
sodipodi:nodetypes="ccccccccccccc" />
|
||||||
<g
|
<g
|
||||||
id="g379"
|
id="g478">
|
||||||
transform="matrix(0.01113254,0,0,0.01113254,0.33749402,1.6862516)"
|
<path
|
||||||
style="fill:#000000;stroke-width:23.7666">
|
style="fill:#ffccaa;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
d="m 4.4649331,3.6987471 2.1436896,0.299894 2.0437247,-0.4887164 -0.033322,0.8996834 0.3554304,0.488717 v 1.032969 L 8.5968114,6.2645101 7.9637011,7.4529811 6.8863027,8.1971631 5.6422961,8.0527701 4.8314707,7.1864081 4.3427538,6.2311891 4.0317523,6.0534731 3.7762867,5.3981491 4.0317523,4.7428241 4.2316817,4.4762511 4.2427887,3.6987471 Z"
|
||||||
|
id="path455" />
|
||||||
<g
|
<g
|
||||||
transform="matrix(0.08797553,0,0,-0.08797553,110.05744,434.06317)"
|
id="g379"
|
||||||
id="g377"
|
transform="matrix(0.01113254,0,0,0.01113254,0.33749402,1.6862516)"
|
||||||
style="fill:#000000;stroke-width:27.0149">
|
style="fill:#000000;stroke-width:23.7666">
|
||||||
<path
|
<g
|
||||||
d="M 3122.6,4604.2 C 2231.7,4380.5 1476.5,4187.4 1444,4174 c -68.8,-28.7 -114.7,-107.1 -114.7,-193.1 0,-42.1 19.1,-76.5 63.1,-120.4 l 61.2,-61.2 554.4,-63.1 c 305.9,-34.4 1152.8,-128.1 1883.1,-210.3 l 1328.7,-149.1 1508.4,380.5 c 827.8,208.4 1514.1,378.5 1523.7,378.5 9.6,0 17.2,-275.3 17.2,-636.6 V 2864.5 L 8078,2673.3 c -286.8,-284.9 -286.8,-237.1 -3.8,-804.9 191.2,-382.4 242.8,-470.3 290.6,-495.2 78.4,-40.1 158.7,-36.3 217.9,11.5 68.8,53.5 489.4,892.8 489.4,973.1 0,89.9 -40.1,147.2 -227.5,334.6 l -174,172.1 v 806.8 808.7 l -53.5,59.3 -53.5,61.2 L 6690,4807 c -1028.6,114.7 -1888.9,206.5 -1909.9,206.5 -21,-0.2 -766.6,-185.6 -1657.5,-409.3 z"
|
transform="matrix(0.08797553,0,0,-0.08797553,110.05744,434.06317)"
|
||||||
id="path367"
|
id="g377"
|
||||||
style="fill:#000000;stroke-width:27.0149" />
|
style="fill:#000000;stroke-width:27.0149">
|
||||||
<path
|
<path
|
||||||
d="m 6340.2,3243 -1099.3,-275.3 -1344,149.1 -1344,149.1 v -569.7 -569.7 l -103.2,-99.4 C 2260.4,1839.7 2170.6,1596.9 2157.2,1218.4 2140,816.9 2229.9,493.8 2411.5,293.1 2484,212.7 2642.7,121 2711.5,121 c 17.2,0 32.5,-15.3 32.5,-32.5 0,-63.1 191.2,-510.5 298.2,-697.8 369,-651.9 892.8,-1091.7 1491.2,-1248.4 290.6,-76.5 642.4,-76.5 933,0 728.4,191.2 1345.9,803 1693.9,1676.7 51.7,133.7 95.7,256.1 95.7,273.3 0,15.3 15.3,28.7 34.4,28.7 66.9,0 225.6,91.8 298.3,172.1 181.6,200.7 271.5,523.8 256.2,925.3 -15.3,380.5 -110.9,629 -307.8,808.7 l -80.3,70.7 -9.6,709.3 -9.6,709.3 z M 3222,2375 c 229.4,-65 602.2,-135.7 908.1,-174 137.7,-15.3 435.9,-24.8 869.9,-24.8 694,0 869.9,13.4 1328.7,97.5 216,38.2 575.5,130 686.4,172.1 34.4,13.4 36.3,3.8 22.9,-273.4 l -13.4,-286.8 49.7,-59.3 c 32.5,-40.1 76.5,-65 130,-74.6 70.7,-15.3 86,-26.8 133.8,-114.7 149.1,-277.2 135.8,-812.5 -22.9,-1036.2 -40.1,-57.4 -45.9,-57.4 -154.9,-45.9 -107.1,9.6 -114.7,7.6 -170.2,-45.9 -30.6,-32.5 -65,-95.6 -78.4,-141.5 -239,-948.3 -887.1,-1692 -1604,-1844.9 -166.3,-34.4 -443.6,-34.4 -613.7,1.9 -671,141.5 -1267.5,774.3 -1540.9,1634.6 -38.2,120.4 -78.4,244.7 -89.9,275.3 -36.3,99.4 -187.4,156.8 -281,107.1 -51.6,-28.7 -124.3,66.9 -175.9,235.2 -63.1,196.9 -61.2,560.2 1.9,739.9 61.2,174 99.4,221.8 191.2,237.1 51.6,7.6 89.9,30.6 124.3,70.7 l 49.7,59.3 -11.5,288.7 c -13.4,277.2 -13.4,286.8 22.9,273.4 19.3,-7.7 126.3,-40.2 237.2,-70.8 z"
|
d="M 3122.6,4604.2 C 2231.7,4380.5 1476.5,4187.4 1444,4174 c -68.8,-28.7 -114.7,-107.1 -114.7,-193.1 0,-42.1 19.1,-76.5 63.1,-120.4 l 61.2,-61.2 554.4,-63.1 c 305.9,-34.4 1152.8,-128.1 1883.1,-210.3 l 1328.7,-149.1 1508.4,380.5 c 827.8,208.4 1514.1,378.5 1523.7,378.5 9.6,0 17.2,-275.3 17.2,-636.6 V 2864.5 L 8078,2673.3 c -286.8,-284.9 -286.8,-237.1 -3.8,-804.9 191.2,-382.4 242.8,-470.3 290.6,-495.2 78.4,-40.1 158.7,-36.3 217.9,11.5 68.8,53.5 489.4,892.8 489.4,973.1 0,89.9 -40.1,147.2 -227.5,334.6 l -174,172.1 v 806.8 808.7 l -53.5,59.3 -53.5,61.2 L 6690,4807 c -1028.6,114.7 -1888.9,206.5 -1909.9,206.5 -21,-0.2 -766.6,-185.6 -1657.5,-409.3 z"
|
||||||
id="path369"
|
id="path367"
|
||||||
style="fill:#000000;stroke-width:27.0149" />
|
style="fill:#000000;stroke-width:27.0149" />
|
||||||
<path
|
<path
|
||||||
d="m 3841.4,1279.5 c -72.6,-72.7 -84.1,-147.2 -38.2,-239 44,-82.2 103.2,-97.5 391.9,-97.5 233.2,0 269.6,3.8 311.6,38.2 114.7,89.9 109,254.3 -11.5,326.9 -51.6,30.6 -97.5,36.3 -323.1,36.3 h -265.7 z"
|
d="m 6340.2,3243 -1099.3,-275.3 -1344,149.1 -1344,149.1 v -569.7 -569.7 l -103.2,-99.4 C 2260.4,1839.7 2170.6,1596.9 2157.2,1218.4 2140,816.9 2229.9,493.8 2411.5,293.1 2484,212.7 2642.7,121 2711.5,121 c 17.2,0 32.5,-15.3 32.5,-32.5 0,-63.1 191.2,-510.5 298.2,-697.8 369,-651.9 892.8,-1091.7 1491.2,-1248.4 290.6,-76.5 642.4,-76.5 933,0 728.4,191.2 1345.9,803 1693.9,1676.7 51.7,133.7 95.7,256.1 95.7,273.3 0,15.3 15.3,28.7 34.4,28.7 66.9,0 225.6,91.8 298.3,172.1 181.6,200.7 271.5,523.8 256.2,925.3 -15.3,380.5 -110.9,629 -307.8,808.7 l -80.3,70.7 -9.6,709.3 -9.6,709.3 z M 3222,2375 c 229.4,-65 602.2,-135.7 908.1,-174 137.7,-15.3 435.9,-24.8 869.9,-24.8 694,0 869.9,13.4 1328.7,97.5 216,38.2 575.5,130 686.4,172.1 34.4,13.4 36.3,3.8 22.9,-273.4 l -13.4,-286.8 49.7,-59.3 c 32.5,-40.1 76.5,-65 130,-74.6 70.7,-15.3 86,-26.8 133.8,-114.7 149.1,-277.2 135.8,-812.5 -22.9,-1036.2 -40.1,-57.4 -45.9,-57.4 -154.9,-45.9 -107.1,9.6 -114.7,7.6 -170.2,-45.9 -30.6,-32.5 -65,-95.6 -78.4,-141.5 -239,-948.3 -887.1,-1692 -1604,-1844.9 -166.3,-34.4 -443.6,-34.4 -613.7,1.9 -671,141.5 -1267.5,774.3 -1540.9,1634.6 -38.2,120.4 -78.4,244.7 -89.9,275.3 -36.3,99.4 -187.4,156.8 -281,107.1 -51.6,-28.7 -124.3,66.9 -175.9,235.2 -63.1,196.9 -61.2,560.2 1.9,739.9 61.2,174 99.4,221.8 191.2,237.1 51.6,7.6 89.9,30.6 124.3,70.7 l 49.7,59.3 -11.5,288.7 c -13.4,277.2 -13.4,286.8 22.9,273.4 19.3,-7.7 126.3,-40.2 237.2,-70.8 z"
|
||||||
id="path371"
|
id="path369"
|
||||||
style="fill:#000000;stroke-width:27.0149" />
|
style="fill:#000000;stroke-width:27.0149" />
|
||||||
<path
|
<path
|
||||||
d="m 5504.7,1308.2 c -68.8,-42.1 -110.9,-143.4 -91.7,-219.9 5.7,-26.8 38.2,-70.7 68.8,-97.5 53.5,-45.9 66.9,-47.8 321.2,-47.8 288.7,0 340.3,13.4 388.1,95.6 53.5,87.9 42.1,166.3 -32.5,240.9 l -65,65 h -263.8 c -227.6,0 -273.5,-5.7 -325.1,-36.3 z"
|
d="m 3841.4,1279.5 c -72.6,-72.7 -84.1,-147.2 -38.2,-239 44,-82.2 103.2,-97.5 391.9,-97.5 233.2,0 269.6,3.8 311.6,38.2 114.7,89.9 109,254.3 -11.5,326.9 -51.6,30.6 -97.5,36.3 -323.1,36.3 h -265.7 z"
|
||||||
id="path373"
|
id="path371"
|
||||||
style="fill:#000000;stroke-width:27.0149" />
|
style="fill:#000000;stroke-width:27.0149" />
|
||||||
<path
|
<path
|
||||||
d="m 2352.1,-1601.6 c -326.9,-114.7 -663.4,-242.8 -749.4,-282.9 -265.7,-128.1 -478,-281 -713.1,-518.1 C 576,-2714.3 381,-3025.9 251,-3415.9 145.9,-3735.2 122.9,-3869 111.4,-4270.5 l -11.4,-367.1 68.8,-68.8 66.9,-66.9 H 5000 9764.3 l 66.9,66.9 68.8,68.8 -11.5,367.1 c -9.6,296.3 -19.1,405.3 -57.4,567.8 -128.1,535.3 -344.1,927.2 -728.4,1309.6 -233.2,233.3 -420.6,367.1 -709.3,506.6 -214.1,103.3 -1332.5,497.1 -1412.8,497.1 -36.3,0 -95.6,-42 -227.5,-166.3 -409.1,-384.3 -759,-585 -1229.3,-705.5 -183.5,-47.8 -244.7,-53.5 -504.7,-55.4 -424.4,0 -674.9,57.4 -1061.1,248.5 -242.8,120.5 -462.7,277.2 -711.2,512.4 -151,141.5 -187.4,166.3 -239,164.4 -34.3,-1.9 -328.8,-95.6 -655.7,-210.3 z"
|
d="m 5504.7,1308.2 c -68.8,-42.1 -110.9,-143.4 -91.7,-219.9 5.7,-26.8 38.2,-70.7 68.8,-97.5 53.5,-45.9 66.9,-47.8 321.2,-47.8 288.7,0 340.3,13.4 388.1,95.6 53.5,87.9 42.1,166.3 -32.5,240.9 l -65,65 h -263.8 c -227.6,0 -273.5,-5.7 -325.1,-36.3 z"
|
||||||
id="path375"
|
id="path373"
|
||||||
style="fill:#000000;stroke-width:27.0149" />
|
style="fill:#000000;stroke-width:27.0149" />
|
||||||
|
<path
|
||||||
|
d="m 2352.1,-1601.6 c -326.9,-114.7 -663.4,-242.8 -749.4,-282.9 -265.7,-128.1 -478,-281 -713.1,-518.1 C 576,-2714.3 381,-3025.9 251,-3415.9 145.9,-3735.2 122.9,-3869 111.4,-4270.5 l -11.4,-367.1 68.8,-68.8 66.9,-66.9 H 5000 9764.3 l 66.9,66.9 68.8,68.8 -11.5,367.1 c -9.6,296.3 -19.1,405.3 -57.4,567.8 -128.1,535.3 -344.1,927.2 -728.4,1309.6 -233.2,233.3 -420.6,367.1 -709.3,506.6 -214.1,103.3 -1332.5,497.1 -1412.8,497.1 -36.3,0 -95.6,-42 -227.5,-166.3 -409.1,-384.3 -759,-585 -1229.3,-705.5 -183.5,-47.8 -244.7,-53.5 -504.7,-55.4 -424.4,0 -674.9,57.4 -1061.1,248.5 -242.8,120.5 -462.7,277.2 -711.2,512.4 -151,141.5 -187.4,166.3 -239,164.4 -34.3,-1.9 -328.8,-95.6 -655.7,-210.3 z"
|
||||||
|
id="path375"
|
||||||
|
style="fill:#000000;stroke-width:27.0149" />
|
||||||
|
</g>
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
<path
|
<path
|
||||||
style="fill:none;stroke:#ff0000;stroke-width:0.965;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
style="fill:none;stroke:#ff0000;stroke-width:0.965;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
d="M 3.5278992,6.2436203 9.388521,11.365016 v 0"
|
d="m 3.5786603,13.223277 5.8606218,5.121396 v 0"
|
||||||
id="path817" />
|
id="path817" />
|
||||||
<path
|
<path
|
||||||
style="fill:none;stroke:#ff0000;stroke-width:0.965;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
style="fill:none;stroke:#ff0000;stroke-width:0.965;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
d="M 9.4139013,6.2943814 3.5532799,11.415776 v 0"
|
d="M 9.2869984,13.400941 3.426377,18.522336 v 0"
|
||||||
id="path1376" />
|
id="path1376" />
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 9.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.0 KiB |
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.
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.
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.
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.
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.
Binary file not shown.
Binary file not shown.
311
bin/nodetail.svg
311
bin/nodetail.svg
@ -1,8 +1,8 @@
|
|||||||
<?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="nofeedback.png"
|
inkscape:export-filename="nodetailfeedback.png"
|
||||||
sodipodi:docname="nodetail.svg"
|
sodipodi:docname="nodetail.svg"
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
id="svg8"
|
id="svg8"
|
||||||
@ -40,8 +40,8 @@
|
|||||||
inkscape:document-rotation="0"
|
inkscape:document-rotation="0"
|
||||||
inkscape:current-layer="layer1"
|
inkscape:current-layer="layer1"
|
||||||
inkscape:document-units="mm"
|
inkscape:document-units="mm"
|
||||||
inkscape:cy="23.659557"
|
inkscape:cy="13.892407"
|
||||||
inkscape:cx="67.399406"
|
inkscape:cx="39.37193"
|
||||||
inkscape:zoom="8.2419125"
|
inkscape:zoom="8.2419125"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:pageopacity="0.0"
|
inkscape:pageopacity="0.0"
|
||||||
@ -103,78 +103,255 @@
|
|||||||
id="layer1"
|
id="layer1"
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
inkscape:label="Calque 1">
|
inkscape:label="Calque 1">
|
||||||
<rect
|
|
||||||
style="fill:#ffffff;stroke:none;stroke-width:0.965;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
|
|
||||||
id="rect377"
|
|
||||||
width="10.678919"
|
|
||||||
height="11.017167"
|
|
||||||
x="0.61403924"
|
|
||||||
y="0.46577585" />
|
|
||||||
<g
|
<g
|
||||||
id="g3526"
|
id="g1090"
|
||||||
transform="translate(-0.32102177,-0.51363483)">
|
transform="translate(-15.023818,4.2053852)">
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:3.22953px;line-height:1.2;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ff0000;stroke:#000000;stroke-width:0.264583"
|
style="font-size:5.13476px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;stroke-width:0.264583"
|
||||||
x="4.3559556"
|
x="14.924755"
|
||||||
y="7.7761049"
|
y="4.3282943"
|
||||||
id="text3444"><tspan
|
id="text1080"
|
||||||
|
transform="scale(1.0214293,0.97902028)"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan3442"
|
id="tspan1078"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ff0000;stroke:#000000;stroke-width:0.264583"
|
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:5.13476px;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ff0000;stroke-width:0.264583"
|
||||||
x="4.3559556"
|
x="14.924755"
|
||||||
y="7.7761049">ERR</tspan></text>
|
y="4.3282943">?</tspan></text>
|
||||||
<ellipse
|
|
||||||
style="fill:#ff0000;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke;stop-color:#000000"
|
|
||||||
id="path3510"
|
|
||||||
cx="2.1668973"
|
|
||||||
cy="6.6202235"
|
|
||||||
rx="1.4285469"
|
|
||||||
ry="1.444598" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g3521"
|
|
||||||
transform="translate(-0.32102177,-0.64204354)">
|
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:3.22953px;line-height:1.2;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ff0000;stroke:#000000;stroke-width:0.264583"
|
style="font-size:5.13476px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;fill:#ffcc00;stroke-width:0.264583"
|
||||||
x="4.0991383"
|
x="18.036194"
|
||||||
y="4.2448654"
|
y="4.3282943"
|
||||||
id="text3450"><tspan
|
id="text1084"
|
||||||
|
transform="scale(1.0214293,0.97902028)"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan3448"
|
id="tspan1082"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#00ff00;stroke:#000000;stroke-width:0.264583"
|
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:5.13476px;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ffcc00;stroke-width:0.264583"
|
||||||
x="4.0991383"
|
x="18.036194"
|
||||||
y="4.2448654">COR</tspan></text>
|
y="4.3282943">?</tspan></text>
|
||||||
<ellipse
|
|
||||||
style="fill:#00ff00;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke;stop-color:#000000"
|
|
||||||
id="ellipse3512"
|
|
||||||
cx="2.1668973"
|
|
||||||
cy="3.0897722"
|
|
||||||
rx="1.4285469"
|
|
||||||
ry="1.444598" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g3542"
|
|
||||||
transform="translate(-0.35312395,6.7414572)">
|
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:3.22953px;line-height:1.2;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ff0000;stroke:#000000;stroke-width:0.264583"
|
style="font-size:5.13476px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;fill:#00ff00;stroke-width:0.264583"
|
||||||
x="4.0991383"
|
x="21.304777"
|
||||||
y="4.2448654"
|
y="4.3610845"
|
||||||
id="text3538"><tspan
|
id="text1088"
|
||||||
|
transform="scale(1.0214293,0.97902028)"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan3536"
|
id="tspan1086"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#00ff00;stroke:#000000;stroke-width:0.264583"
|
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:5.13476px;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#00ff00;stroke-width:0.264583"
|
||||||
x="4.0991383"
|
x="21.304777"
|
||||||
y="4.2448654">COR</tspan></text>
|
y="4.3610845">?</tspan></text>
|
||||||
<ellipse
|
|
||||||
style="fill:#00ff00;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke;stop-color:#000000"
|
|
||||||
id="ellipse3540"
|
|
||||||
cx="2.1668973"
|
|
||||||
cy="3.0897722"
|
|
||||||
rx="1.4285469"
|
|
||||||
ry="1.444598" />
|
|
||||||
</g>
|
</g>
|
||||||
|
<g
|
||||||
|
id="g1011"
|
||||||
|
transform="translate(-36.692788,-0.48153265)">
|
||||||
|
<g
|
||||||
|
id="g999"
|
||||||
|
transform="translate(0.16051088,4.3337939)">
|
||||||
|
<g
|
||||||
|
id="g997">
|
||||||
|
<path
|
||||||
|
sodipodi:type="star"
|
||||||
|
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59402;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
|
||||||
|
id="path991"
|
||||||
|
inkscape:flatsided="false"
|
||||||
|
sodipodi:sides="5"
|
||||||
|
sodipodi:cx="1.2519848"
|
||||||
|
sodipodi:cy="1.444598"
|
||||||
|
sodipodi:r1="1.4517142"
|
||||||
|
sodipodi:r2="0.72585714"
|
||||||
|
sodipodi:arg1="0.95825877"
|
||||||
|
sodipodi:arg2="1.5865773"
|
||||||
|
inkscape:rounded="0"
|
||||||
|
inkscape:randomized="0"
|
||||||
|
d="M 2.0866414,2.6323784 1.2405306,2.1703647 0.38026154,2.6054479 0.55820007,1.6579786 -0.12142634,0.97426218 0.83465653,0.85070768 1.2748933,-0.00693544 1.6878465,0.86417296 2.6395542,1.0178368 1.9386905,1.6797659 Z"
|
||||||
|
inkscape:transform-center-x="-0.011933649"
|
||||||
|
inkscape:transform-center-y="-0.22170183"
|
||||||
|
transform="matrix(1.6857602,0,0,1.6811323,0.30798457,0.13313262)" />
|
||||||
|
<path
|
||||||
|
sodipodi:type="star"
|
||||||
|
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59402;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
|
||||||
|
id="path993"
|
||||||
|
inkscape:flatsided="false"
|
||||||
|
sodipodi:sides="5"
|
||||||
|
sodipodi:cx="1.2519848"
|
||||||
|
sodipodi:cy="1.444598"
|
||||||
|
sodipodi:r1="1.4517142"
|
||||||
|
sodipodi:r2="0.72585714"
|
||||||
|
sodipodi:arg1="0.95825877"
|
||||||
|
sodipodi:arg2="1.5865773"
|
||||||
|
inkscape:rounded="0"
|
||||||
|
inkscape:randomized="0"
|
||||||
|
d="M 2.0866414,2.6323784 1.2405306,2.1703647 0.38026154,2.6054479 0.55820007,1.6579786 -0.12142634,0.97426218 0.83465653,0.85070768 1.2748933,-0.00693544 1.6878465,0.86417296 2.6395542,1.0178368 1.9386905,1.6797659 Z"
|
||||||
|
inkscape:transform-center-x="-0.011933601"
|
||||||
|
inkscape:transform-center-y="-0.22170183"
|
||||||
|
transform="matrix(1.6857602,0,0,1.6811323,3.2777648,0.13313262)" />
|
||||||
|
<path
|
||||||
|
sodipodi:type="star"
|
||||||
|
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59402;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
|
||||||
|
id="path995"
|
||||||
|
inkscape:flatsided="false"
|
||||||
|
sodipodi:sides="5"
|
||||||
|
sodipodi:cx="1.2519848"
|
||||||
|
sodipodi:cy="1.444598"
|
||||||
|
sodipodi:r1="1.4517142"
|
||||||
|
sodipodi:r2="0.72585714"
|
||||||
|
sodipodi:arg1="0.95825877"
|
||||||
|
sodipodi:arg2="1.5865773"
|
||||||
|
inkscape:rounded="0"
|
||||||
|
inkscape:randomized="0"
|
||||||
|
d="M 2.0866414,2.6323784 1.2405306,2.1703647 0.38026154,2.6054479 0.55820007,1.6579786 -0.12142634,0.97426218 0.83465653,0.85070768 1.2748933,-0.00693544 1.6878465,0.86417296 2.6395542,1.0178368 1.9386905,1.6797659 Z"
|
||||||
|
inkscape:transform-center-x="-0.011933682"
|
||||||
|
inkscape:transform-center-y="-0.22170183"
|
||||||
|
transform="matrix(1.6857602,0,0,1.6811323,6.2475451,0.13313262)" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
id="g976"
|
||||||
|
transform="translate(0.09630653,-0.03210218)">
|
||||||
|
<g
|
||||||
|
id="g989">
|
||||||
|
<path
|
||||||
|
sodipodi:type="star"
|
||||||
|
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59402;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
|
||||||
|
id="path967"
|
||||||
|
inkscape:flatsided="false"
|
||||||
|
sodipodi:sides="5"
|
||||||
|
sodipodi:cx="1.2519848"
|
||||||
|
sodipodi:cy="1.444598"
|
||||||
|
sodipodi:r1="1.4517142"
|
||||||
|
sodipodi:r2="0.72585714"
|
||||||
|
sodipodi:arg1="0.95825877"
|
||||||
|
sodipodi:arg2="1.5865773"
|
||||||
|
inkscape:rounded="0"
|
||||||
|
inkscape:randomized="0"
|
||||||
|
d="M 2.0866414,2.6323784 1.2405306,2.1703647 0.38026154,2.6054479 0.55820007,1.6579786 -0.12142634,0.97426218 0.83465653,0.85070768 1.2748933,-0.00693544 1.6878465,0.86417296 2.6395542,1.0178368 1.9386905,1.6797659 Z"
|
||||||
|
inkscape:transform-center-x="-0.011933649"
|
||||||
|
inkscape:transform-center-y="-0.22170183"
|
||||||
|
transform="matrix(1.6857602,0,0,1.6811323,0.30798457,0.13313262)" />
|
||||||
|
<path
|
||||||
|
sodipodi:type="star"
|
||||||
|
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59402;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
|
||||||
|
id="path969"
|
||||||
|
inkscape:flatsided="false"
|
||||||
|
sodipodi:sides="5"
|
||||||
|
sodipodi:cx="1.2519848"
|
||||||
|
sodipodi:cy="1.444598"
|
||||||
|
sodipodi:r1="1.4517142"
|
||||||
|
sodipodi:r2="0.72585714"
|
||||||
|
sodipodi:arg1="0.95825877"
|
||||||
|
sodipodi:arg2="1.5865773"
|
||||||
|
inkscape:rounded="0"
|
||||||
|
inkscape:randomized="0"
|
||||||
|
d="M 2.0866414,2.6323784 1.2405306,2.1703647 0.38026154,2.6054479 0.55820007,1.6579786 -0.12142634,0.97426218 0.83465653,0.85070768 1.2748933,-0.00693544 1.6878465,0.86417296 2.6395542,1.0178368 1.9386905,1.6797659 Z"
|
||||||
|
inkscape:transform-center-x="-0.011933601"
|
||||||
|
inkscape:transform-center-y="-0.22170183"
|
||||||
|
transform="matrix(1.6857602,0,0,1.6811323,3.2777648,0.13313262)" />
|
||||||
|
<path
|
||||||
|
sodipodi:type="star"
|
||||||
|
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59402;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
|
||||||
|
id="path971"
|
||||||
|
inkscape:flatsided="false"
|
||||||
|
sodipodi:sides="5"
|
||||||
|
sodipodi:cx="1.2519848"
|
||||||
|
sodipodi:cy="1.444598"
|
||||||
|
sodipodi:r1="1.4517142"
|
||||||
|
sodipodi:r2="0.72585714"
|
||||||
|
sodipodi:arg1="0.95825877"
|
||||||
|
sodipodi:arg2="1.5865773"
|
||||||
|
inkscape:rounded="0"
|
||||||
|
inkscape:randomized="0"
|
||||||
|
d="M 2.0866414,2.6323784 1.2405306,2.1703647 0.38026154,2.6054479 0.55820007,1.6579786 -0.12142634,0.97426218 0.83465653,0.85070768 1.2748933,-0.00693544 1.6878465,0.86417296 2.6395542,1.0178368 1.9386905,1.6797659 Z"
|
||||||
|
inkscape:transform-center-x="-0.011933682"
|
||||||
|
inkscape:transform-center-y="-0.22170183"
|
||||||
|
transform="matrix(1.6857602,0,0,1.6811323,6.2475451,0.13313262)" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<path
|
||||||
|
style="fill:#0000ff;stroke-width:0.999999"
|
||||||
|
d="m 15.325643,4.4644597 c -0.22723,-0.07141 -0.441899,-0.298159 -0.497266,-0.525248 -0.01751,-0.07181 -0.02338,-0.557037 -0.01872,-1.546417 l 0.0068,-1.44177248 0.05692,-0.1156655 c 0.0726,-0.1475279 0.21474,-0.2896713 0.362268,-0.3622681 l 0.115666,-0.056917 h 4.47647 5.534804 l 0.109211,0.050463 c 0.139563,0.0644878 0.295986,0.2209107 0.368722,0.3687226 l 0.05692,0.1156655 V 2.4509312 3.9508397 l -0.05692,0.115665 c -0.07253,0.147393 -0.213281,0.2881246 -0.361661,0.361605 l -0.116272,0.05758 -5.499922,0.0044 c -3.570913,0.0035 -4.460296,-0.0015 -4.537018,-0.02561 z"
|
||||||
|
id="path703"
|
||||||
|
sodipodi:nodetypes="ccccsccccscccccscccc" />
|
||||||
|
<g
|
||||||
|
id="g1076"
|
||||||
|
transform="translate(-14.959614,-0.16051088)">
|
||||||
|
<text
|
||||||
|
xml:space="preserve"
|
||||||
|
style="font-size:5.13476px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;stroke-width:0.264583"
|
||||||
|
x="14.924755"
|
||||||
|
y="4.3282943"
|
||||||
|
id="text875"
|
||||||
|
transform="scale(1.0214293,0.97902028)"><tspan
|
||||||
|
sodipodi:role="line"
|
||||||
|
id="tspan873"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:5.13476px;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ff0000;stroke-width:0.264583"
|
||||||
|
x="14.924755"
|
||||||
|
y="4.3282943">?</tspan></text>
|
||||||
|
<text
|
||||||
|
xml:space="preserve"
|
||||||
|
style="font-size:5.13476px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;fill:#ffcc00;stroke-width:0.264583"
|
||||||
|
x="18.036194"
|
||||||
|
y="4.3282943"
|
||||||
|
id="text879"
|
||||||
|
transform="scale(1.0214293,0.97902028)"><tspan
|
||||||
|
sodipodi:role="line"
|
||||||
|
id="tspan877"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:5.13476px;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ffcc00;stroke-width:0.264583"
|
||||||
|
x="18.036194"
|
||||||
|
y="4.3282943">?</tspan></text>
|
||||||
|
<text
|
||||||
|
xml:space="preserve"
|
||||||
|
style="font-size:5.13476px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;fill:#00ff00;stroke-width:0.264583"
|
||||||
|
x="21.304777"
|
||||||
|
y="4.3610845"
|
||||||
|
id="text883"
|
||||||
|
transform="scale(1.0214293,0.97902028)"><tspan
|
||||||
|
sodipodi:role="line"
|
||||||
|
id="tspan881"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:5.13476px;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#00ff00;stroke-width:0.264583"
|
||||||
|
x="21.304777"
|
||||||
|
y="4.3610845">?</tspan></text>
|
||||||
|
</g>
|
||||||
|
<path
|
||||||
|
style="fill:#ffccaa;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
d="m 6.2036714,5.5920243 1.7273844,0.241655 1.6468323,-0.393808 -0.026849,0.724965 0.2864061,0.393808 v 0.832366 L 9.5331373,7.6595153 9.0229775,8.6171853 8.1548102,9.2168463 7.1523901,9.1004953 6.4990272,8.4023803 6.1052193,7.6326653 5.8546144,7.4894623 l -0.2058541,-0.52806 0.2058541,-0.528061 0.161103,-0.214804 0.00895,-0.626513 z"
|
||||||
|
id="path455" />
|
||||||
|
<g
|
||||||
|
id="g379-4"
|
||||||
|
transform="matrix(0.00893625,0,0,0.00893625,2.9185737,3.9521473)"
|
||||||
|
style="fill:#000000;stroke-width:29.6078">
|
||||||
|
<g
|
||||||
|
transform="matrix(0.08797553,0,0,-0.08797553,110.05744,434.06317)"
|
||||||
|
id="g377-5"
|
||||||
|
style="fill:#000000;stroke-width:33.6545">
|
||||||
|
<path
|
||||||
|
d="M 3122.6,4604.2 C 2231.7,4380.5 1476.5,4187.4 1444,4174 c -68.8,-28.7 -114.7,-107.1 -114.7,-193.1 0,-42.1 19.1,-76.5 63.1,-120.4 l 61.2,-61.2 554.4,-63.1 c 305.9,-34.4 1152.8,-128.1 1883.1,-210.3 l 1328.7,-149.1 1508.4,380.5 c 827.8,208.4 1514.1,378.5 1523.7,378.5 9.6,0 17.2,-275.3 17.2,-636.6 V 2864.5 L 8078,2673.3 c -286.8,-284.9 -286.8,-237.1 -3.8,-804.9 191.2,-382.4 242.8,-470.3 290.6,-495.2 78.4,-40.1 158.7,-36.3 217.9,11.5 68.8,53.5 489.4,892.8 489.4,973.1 0,89.9 -40.1,147.2 -227.5,334.6 l -174,172.1 v 806.8 808.7 l -53.5,59.3 -53.5,61.2 L 6690,4807 c -1028.6,114.7 -1888.9,206.5 -1909.9,206.5 -21,-0.2 -766.6,-185.6 -1657.5,-409.3 z"
|
||||||
|
id="path367-3"
|
||||||
|
style="fill:#000000;stroke-width:33.6545" />
|
||||||
|
<path
|
||||||
|
d="m 6340.2,3243 -1099.3,-275.3 -1344,149.1 -1344,149.1 v -569.7 -569.7 l -103.2,-99.4 C 2260.4,1839.7 2170.6,1596.9 2157.2,1218.4 2140,816.9 2229.9,493.8 2411.5,293.1 2484,212.7 2642.7,121 2711.5,121 c 17.2,0 32.5,-15.3 32.5,-32.5 0,-63.1 191.2,-510.5 298.2,-697.8 369,-651.9 892.8,-1091.7 1491.2,-1248.4 290.6,-76.5 642.4,-76.5 933,0 728.4,191.2 1345.9,803 1693.9,1676.7 51.7,133.7 95.7,256.1 95.7,273.3 0,15.3 15.3,28.7 34.4,28.7 66.9,0 225.6,91.8 298.3,172.1 181.6,200.7 271.5,523.8 256.2,925.3 -15.3,380.5 -110.9,629 -307.8,808.7 l -80.3,70.7 -9.6,709.3 -9.6,709.3 z M 3222,2375 c 229.4,-65 602.2,-135.7 908.1,-174 137.7,-15.3 435.9,-24.8 869.9,-24.8 694,0 869.9,13.4 1328.7,97.5 216,38.2 575.5,130 686.4,172.1 34.4,13.4 36.3,3.8 22.9,-273.4 l -13.4,-286.8 49.7,-59.3 c 32.5,-40.1 76.5,-65 130,-74.6 70.7,-15.3 86,-26.8 133.8,-114.7 149.1,-277.2 135.8,-812.5 -22.9,-1036.2 -40.1,-57.4 -45.9,-57.4 -154.9,-45.9 -107.1,9.6 -114.7,7.6 -170.2,-45.9 -30.6,-32.5 -65,-95.6 -78.4,-141.5 -239,-948.3 -887.1,-1692 -1604,-1844.9 -166.3,-34.4 -443.6,-34.4 -613.7,1.9 -671,141.5 -1267.5,774.3 -1540.9,1634.6 -38.2,120.4 -78.4,244.7 -89.9,275.3 -36.3,99.4 -187.4,156.8 -281,107.1 -51.6,-28.7 -124.3,66.9 -175.9,235.2 -63.1,196.9 -61.2,560.2 1.9,739.9 61.2,174 99.4,221.8 191.2,237.1 51.6,7.6 89.9,30.6 124.3,70.7 l 49.7,59.3 -11.5,288.7 c -13.4,277.2 -13.4,286.8 22.9,273.4 19.3,-7.7 126.3,-40.2 237.2,-70.8 z"
|
||||||
|
id="path369-2"
|
||||||
|
style="fill:#000000;stroke-width:33.6545" />
|
||||||
|
<path
|
||||||
|
d="m 3841.4,1279.5 c -72.6,-72.7 -84.1,-147.2 -38.2,-239 44,-82.2 103.2,-97.5 391.9,-97.5 233.2,0 269.6,3.8 311.6,38.2 114.7,89.9 109,254.3 -11.5,326.9 -51.6,30.6 -97.5,36.3 -323.1,36.3 h -265.7 z"
|
||||||
|
id="path371-8"
|
||||||
|
style="fill:#000000;stroke-width:33.6545" />
|
||||||
|
<path
|
||||||
|
d="m 5504.7,1308.2 c -68.8,-42.1 -110.9,-143.4 -91.7,-219.9 5.7,-26.8 38.2,-70.7 68.8,-97.5 53.5,-45.9 66.9,-47.8 321.2,-47.8 288.7,0 340.3,13.4 388.1,95.6 53.5,87.9 42.1,166.3 -32.5,240.9 l -65,65 h -263.8 c -227.6,0 -273.5,-5.7 -325.1,-36.3 z"
|
||||||
|
id="path373-4"
|
||||||
|
style="fill:#000000;stroke-width:33.6545" />
|
||||||
|
<path
|
||||||
|
d="m 2352.1,-1601.6 c -326.9,-114.7 -663.4,-242.8 -749.4,-282.9 -265.7,-128.1 -478,-281 -713.1,-518.1 C 576,-2714.3 381,-3025.9 251,-3415.9 145.9,-3735.2 122.9,-3869 111.4,-4270.5 l -11.4,-367.1 68.8,-68.8 66.9,-66.9 H 5000 9764.3 l 66.9,66.9 68.8,68.8 -11.5,367.1 c -9.6,296.3 -19.1,405.3 -57.4,567.8 -128.1,535.3 -344.1,927.2 -728.4,1309.6 -233.2,233.3 -420.6,367.1 -709.3,506.6 -214.1,103.3 -1332.5,497.1 -1412.8,497.1 -36.3,0 -95.6,-42 -227.5,-166.3 -409.1,-384.3 -759,-585 -1229.3,-705.5 -183.5,-47.8 -244.7,-53.5 -504.7,-55.4 -424.4,0 -674.9,57.4 -1061.1,248.5 -242.8,120.5 -462.7,277.2 -711.2,512.4 -151,141.5 -187.4,166.3 -239,164.4 -34.3,-1.9 -328.8,-95.6 -655.7,-210.3 z"
|
||||||
|
id="path375-2"
|
||||||
|
style="fill:#000000;stroke-width:33.6545" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<path
|
||||||
|
style="fill:#0000ff;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
d="m 15.356691,4.2026247 1.670874,-0.02321 c -0.196557,1.394818 0.371729,2.872365 1.485222,3.898706 l 0.672991,-1.322772 2.088592,3.5506073 -5.082242,-0.232065 1.485221,-1.2067433 c -1.310045,-1.060518 -2.119624,-2.864664 -2.320658,-4.664523 z"
|
||||||
|
id="path775"
|
||||||
|
sodipodi:nodetypes="cccccccc" />
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
@ -1,178 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<svg
|
|
||||||
inkscape:export-ydpi="96"
|
|
||||||
inkscape:export-xdpi="96"
|
|
||||||
inkscape:export-filename="nofeedback.png"
|
|
||||||
sodipodi:docname="nofeedback.svg"
|
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
|
||||||
id="svg8"
|
|
||||||
version="1.1"
|
|
||||||
viewBox="0 0 11.90625 11.90625"
|
|
||||||
height="45"
|
|
||||||
width="45"
|
|
||||||
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"
|
|
||||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
||||||
xmlns:cc="http://creativecommons.org/ns#"
|
|
||||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
|
||||||
<defs
|
|
||||||
id="defs2">
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto-start-reverse"
|
|
||||||
inkscape:stockid="Arrow1"
|
|
||||||
markerWidth="7"
|
|
||||||
markerHeight="7"
|
|
||||||
viewBox="0 0 4.0606602 6.7071068"
|
|
||||||
inkscape:isstock="true"
|
|
||||||
inkscape:collect="always"
|
|
||||||
preserveAspectRatio="xMidYMid">
|
|
||||||
<path
|
|
||||||
style="fill:none;stroke:context-stroke;stroke-width:1;stroke-linecap:butt"
|
|
||||||
d="M 3,-3 0,0 3,3"
|
|
||||||
id="path5057"
|
|
||||||
transform="rotate(180,0.125,0)"
|
|
||||||
sodipodi:nodetypes="ccc" />
|
|
||||||
</marker>
|
|
||||||
<pattern
|
|
||||||
id="EMFhbasepattern"
|
|
||||||
patternUnits="userSpaceOnUse"
|
|
||||||
width="6"
|
|
||||||
height="6"
|
|
||||||
x="0"
|
|
||||||
y="0" />
|
|
||||||
</defs>
|
|
||||||
<sodipodi:namedview
|
|
||||||
inkscape:window-maximized="1"
|
|
||||||
inkscape:window-y="-8"
|
|
||||||
inkscape:window-x="-8"
|
|
||||||
inkscape:window-height="1009"
|
|
||||||
inkscape:window-width="1920"
|
|
||||||
units="px"
|
|
||||||
inkscape:guide-bbox="true"
|
|
||||||
showguides="true"
|
|
||||||
showgrid="false"
|
|
||||||
inkscape:document-rotation="0"
|
|
||||||
inkscape:current-layer="layer1"
|
|
||||||
inkscape:document-units="mm"
|
|
||||||
inkscape:cy="23.659557"
|
|
||||||
inkscape:cx="68.734047"
|
|
||||||
inkscape:zoom="8.2419125"
|
|
||||||
inkscape:pageshadow="2"
|
|
||||||
inkscape:pageopacity="0.0"
|
|
||||||
borderopacity="1.0"
|
|
||||||
bordercolor="#666666"
|
|
||||||
pagecolor="#ffffff"
|
|
||||||
id="base"
|
|
||||||
inkscape:pagecheckerboard="0"
|
|
||||||
inkscape:showpageshadow="2"
|
|
||||||
inkscape:deskcolor="#d1d1d1">
|
|
||||||
<sodipodi:guide
|
|
||||||
id="guide25"
|
|
||||||
orientation="0,-1"
|
|
||||||
position="94.049365,180.07197"
|
|
||||||
inkscape:locked="false" />
|
|
||||||
<sodipodi:guide
|
|
||||||
position="8.9572181,11.534441"
|
|
||||||
orientation="0,-1"
|
|
||||||
id="guide4043"
|
|
||||||
inkscape:locked="false" />
|
|
||||||
<sodipodi:guide
|
|
||||||
position="-4.2589037,4.1320607"
|
|
||||||
orientation="0,-1"
|
|
||||||
id="guide315"
|
|
||||||
inkscape:locked="false" />
|
|
||||||
<sodipodi:guide
|
|
||||||
position="1.0787715,2.8911402"
|
|
||||||
orientation="0,-1"
|
|
||||||
id="guide373"
|
|
||||||
inkscape:locked="false" />
|
|
||||||
<sodipodi:guide
|
|
||||||
position="11.558135,1.7718565"
|
|
||||||
orientation="1,0"
|
|
||||||
id="guide428"
|
|
||||||
inkscape:locked="false" />
|
|
||||||
</sodipodi:namedview>
|
|
||||||
<metadata
|
|
||||||
id="metadata5">
|
|
||||||
<rdf:RDF>
|
|
||||||
<cc:Work
|
|
||||||
rdf:about="">
|
|
||||||
<dc:format>image/svg+xml</dc:format>
|
|
||||||
<dc:type
|
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|
||||||
</cc:Work>
|
|
||||||
</rdf:RDF>
|
|
||||||
</metadata>
|
|
||||||
<g
|
|
||||||
id="layer1"
|
|
||||||
inkscape:groupmode="layer"
|
|
||||||
inkscape:label="Calque 1">
|
|
||||||
<rect
|
|
||||||
style="fill:#ffffff;stroke:none;stroke-width:0.965;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
|
|
||||||
id="rect377"
|
|
||||||
width="10.678919"
|
|
||||||
height="11.017167"
|
|
||||||
x="0.61403924"
|
|
||||||
y="0.46577585" />
|
|
||||||
<g
|
|
||||||
id="g379"
|
|
||||||
transform="matrix(0.00882858,0,0,0.00882858,2.7664564,4.0629307)"
|
|
||||||
style="fill:#000000;stroke-width:29.9689">
|
|
||||||
<g
|
|
||||||
transform="matrix(0.08797553,0,0,-0.08797553,110.05744,434.06317)"
|
|
||||||
id="g377"
|
|
||||||
style="fill:#000000;stroke-width:34.0649">
|
|
||||||
<path
|
|
||||||
d="M 3122.6,4604.2 C 2231.7,4380.5 1476.5,4187.4 1444,4174 c -68.8,-28.7 -114.7,-107.1 -114.7,-193.1 0,-42.1 19.1,-76.5 63.1,-120.4 l 61.2,-61.2 554.4,-63.1 c 305.9,-34.4 1152.8,-128.1 1883.1,-210.3 l 1328.7,-149.1 1508.4,380.5 c 827.8,208.4 1514.1,378.5 1523.7,378.5 9.6,0 17.2,-275.3 17.2,-636.6 V 2864.5 L 8078,2673.3 c -286.8,-284.9 -286.8,-237.1 -3.8,-804.9 191.2,-382.4 242.8,-470.3 290.6,-495.2 78.4,-40.1 158.7,-36.3 217.9,11.5 68.8,53.5 489.4,892.8 489.4,973.1 0,89.9 -40.1,147.2 -227.5,334.6 l -174,172.1 v 806.8 808.7 l -53.5,59.3 -53.5,61.2 L 6690,4807 c -1028.6,114.7 -1888.9,206.5 -1909.9,206.5 -21,-0.2 -766.6,-185.6 -1657.5,-409.3 z"
|
|
||||||
id="path367"
|
|
||||||
style="fill:#000000;stroke-width:34.0649" />
|
|
||||||
<path
|
|
||||||
d="m 6340.2,3243 -1099.3,-275.3 -1344,149.1 -1344,149.1 v -569.7 -569.7 l -103.2,-99.4 C 2260.4,1839.7 2170.6,1596.9 2157.2,1218.4 2140,816.9 2229.9,493.8 2411.5,293.1 2484,212.7 2642.7,121 2711.5,121 c 17.2,0 32.5,-15.3 32.5,-32.5 0,-63.1 191.2,-510.5 298.2,-697.8 369,-651.9 892.8,-1091.7 1491.2,-1248.4 290.6,-76.5 642.4,-76.5 933,0 728.4,191.2 1345.9,803 1693.9,1676.7 51.7,133.7 95.7,256.1 95.7,273.3 0,15.3 15.3,28.7 34.4,28.7 66.9,0 225.6,91.8 298.3,172.1 181.6,200.7 271.5,523.8 256.2,925.3 -15.3,380.5 -110.9,629 -307.8,808.7 l -80.3,70.7 -9.6,709.3 -9.6,709.3 z M 3222,2375 c 229.4,-65 602.2,-135.7 908.1,-174 137.7,-15.3 435.9,-24.8 869.9,-24.8 694,0 869.9,13.4 1328.7,97.5 216,38.2 575.5,130 686.4,172.1 34.4,13.4 36.3,3.8 22.9,-273.4 l -13.4,-286.8 49.7,-59.3 c 32.5,-40.1 76.5,-65 130,-74.6 70.7,-15.3 86,-26.8 133.8,-114.7 149.1,-277.2 135.8,-812.5 -22.9,-1036.2 -40.1,-57.4 -45.9,-57.4 -154.9,-45.9 -107.1,9.6 -114.7,7.6 -170.2,-45.9 -30.6,-32.5 -65,-95.6 -78.4,-141.5 -239,-948.3 -887.1,-1692 -1604,-1844.9 -166.3,-34.4 -443.6,-34.4 -613.7,1.9 -671,141.5 -1267.5,774.3 -1540.9,1634.6 -38.2,120.4 -78.4,244.7 -89.9,275.3 -36.3,99.4 -187.4,156.8 -281,107.1 -51.6,-28.7 -124.3,66.9 -175.9,235.2 -63.1,196.9 -61.2,560.2 1.9,739.9 61.2,174 99.4,221.8 191.2,237.1 51.6,7.6 89.9,30.6 124.3,70.7 l 49.7,59.3 -11.5,288.7 c -13.4,277.2 -13.4,286.8 22.9,273.4 19.3,-7.7 126.3,-40.2 237.2,-70.8 z"
|
|
||||||
id="path369"
|
|
||||||
style="fill:#000000;stroke-width:34.0649" />
|
|
||||||
<path
|
|
||||||
d="m 3841.4,1279.5 c -72.6,-72.7 -84.1,-147.2 -38.2,-239 44,-82.2 103.2,-97.5 391.9,-97.5 233.2,0 269.6,3.8 311.6,38.2 114.7,89.9 109,254.3 -11.5,326.9 -51.6,30.6 -97.5,36.3 -323.1,36.3 h -265.7 z"
|
|
||||||
id="path371"
|
|
||||||
style="fill:#000000;stroke-width:34.0649" />
|
|
||||||
<path
|
|
||||||
d="m 5504.7,1308.2 c -68.8,-42.1 -110.9,-143.4 -91.7,-219.9 5.7,-26.8 38.2,-70.7 68.8,-97.5 53.5,-45.9 66.9,-47.8 321.2,-47.8 288.7,0 340.3,13.4 388.1,95.6 53.5,87.9 42.1,166.3 -32.5,240.9 l -65,65 h -263.8 c -227.6,0 -273.5,-5.7 -325.1,-36.3 z"
|
|
||||||
id="path373"
|
|
||||||
style="fill:#000000;stroke-width:34.0649" />
|
|
||||||
<path
|
|
||||||
d="m 2352.1,-1601.6 c -326.9,-114.7 -663.4,-242.8 -749.4,-282.9 -265.7,-128.1 -478,-281 -713.1,-518.1 C 576,-2714.3 381,-3025.9 251,-3415.9 145.9,-3735.2 122.9,-3869 111.4,-4270.5 l -11.4,-367.1 68.8,-68.8 66.9,-66.9 H 5000 9764.3 l 66.9,66.9 68.8,68.8 -11.5,367.1 c -9.6,296.3 -19.1,405.3 -57.4,567.8 -128.1,535.3 -344.1,927.2 -728.4,1309.6 -233.2,233.3 -420.6,367.1 -709.3,506.6 -214.1,103.3 -1332.5,497.1 -1412.8,497.1 -36.3,0 -95.6,-42 -227.5,-166.3 -409.1,-384.3 -759,-585 -1229.3,-705.5 -183.5,-47.8 -244.7,-53.5 -504.7,-55.4 -424.4,0 -674.9,57.4 -1061.1,248.5 -242.8,120.5 -462.7,277.2 -711.2,512.4 -151,141.5 -187.4,166.3 -239,164.4 -34.3,-1.9 -328.8,-95.6 -655.7,-210.3 z"
|
|
||||||
id="path375"
|
|
||||||
style="fill:#000000;stroke-width:34.0649" />
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.41635px;line-height:1.2;font-family:arial;-inkscape-font-specification:'arial Bold';fill:#000000;stroke-width:0.264584"
|
|
||||||
x="0.17541941"
|
|
||||||
y="3.558949"
|
|
||||||
id="text537"
|
|
||||||
transform="scale(0.94131726,1.0623411)"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan535"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:arial;-inkscape-font-specification:'arial Bold';fill:#000000;stroke-width:0.264584"
|
|
||||||
x="0.17541941"
|
|
||||||
y="3.558949">HTML</tspan></text>
|
|
||||||
<path
|
|
||||||
style="fill:none;stroke:#00ff00;stroke-width:0.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1)"
|
|
||||||
d="M 0.83465664,4.1090786 0.80255444,6.7735594 H 3.788057"
|
|
||||||
id="path643" />
|
|
||||||
<path
|
|
||||||
style="fill:none;stroke:#ff0000;stroke-width:0.665;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="M 4.3387058,6.8843952 C 11.075251,11.428376 11.075251,11.428376 11.075251,11.428376"
|
|
||||||
id="path2422" />
|
|
||||||
<path
|
|
||||||
style="fill:none;stroke:#ff0000;stroke-width:0.665;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 11.038238,6.772658 c -6.7365462,4.54398 -6.7365462,4.54398 -6.7365462,4.54398"
|
|
||||||
id="path2426" />
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 8.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.3 KiB |
@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<svg
|
<svg
|
||||||
inkscape:export-ydpi="96"
|
inkscape:export-ydpi="51.200001"
|
||||||
inkscape:export-xdpi="96"
|
inkscape:export-xdpi="51.200001"
|
||||||
inkscape:export-filename="ou.png"
|
inkscape:export-filename="dossieretudiantmin.png"
|
||||||
sodipodi:docname="dossieretudiant.svg"
|
sodipodi:docname="dossieretudiant.svg"
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
id="svg8"
|
id="svg8"
|
||||||
@ -38,10 +38,10 @@
|
|||||||
showguides="true"
|
showguides="true"
|
||||||
showgrid="false"
|
showgrid="false"
|
||||||
inkscape:document-rotation="0"
|
inkscape:document-rotation="0"
|
||||||
inkscape:current-layer="layer1"
|
inkscape:current-layer="g478"
|
||||||
inkscape:document-units="mm"
|
inkscape:document-units="mm"
|
||||||
inkscape:cy="29.257603"
|
inkscape:cy="29.401492"
|
||||||
inkscape:cx="27.962594"
|
inkscape:cx="10.120253"
|
||||||
inkscape:zoom="10.424641"
|
inkscape:zoom="10.424641"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:pageopacity="0.0"
|
inkscape:pageopacity="0.0"
|
||||||
@ -93,48 +93,60 @@
|
|||||||
id="layer1"
|
id="layer1"
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
inkscape:label="Calque 1">
|
inkscape:label="Calque 1">
|
||||||
|
<path
|
||||||
|
id="path576"
|
||||||
|
style="fill:#786721;stroke:#a0892c;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
|
||||||
|
d="M 2.1052428,1.1137087 1.7770914,3.064063 0.63276537,9.8653165 C 0.6016851,10.2186 0.64683054,10.505997 1.0228574,10.64565 H 9.474303 c 0.4966042,-0.135427 0.553384,-0.28128 0.766037,-0.7337815 l 1.233592,-7.3318 C 11.585399,2.1838499 11.370236,1.972458 10.997462,1.9957335 H 6.4327077 L 6.5771943,1.1369842 C 6.5996475,0.70652435 6.4810977,0.49756215 6.1159967,0.52083775 H 2.952354 C 2.5254768,0.53863905 2.1522775,0.69985285 2.1052428,1.1137087 Z"
|
||||||
|
sodipodi:nodetypes="ccccccccccccc" />
|
||||||
<path
|
<path
|
||||||
id="rect363"
|
id="rect363"
|
||||||
style="fill:#ffdd55;stroke:#d4aa00;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
|
style="fill:#ffdd55;stroke:#d4aa00;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
|
||||||
d="M 0.58190715,0.41949439 V 3.1927264 11.459984 H 11.381558 V 2.0277783 H 5.6090268 V 0.41949439 Z"
|
d="m 0.55639053,1.4205009 v 1.9503543 6.8012538 c 0.0292204,0.353283 0.12555739,0.64068 0.53719937,0.780333 H 9.8013835 C 10.289573,10.817015 10.32279,10.671162 10.463451,10.218661 V 2.8868607 C 10.509612,2.4906421 10.251276,2.2792502 9.8712315,2.3025257 H 5.1680194 V 1.4437764 C 5.116531,1.0133166 4.9581606,0.80435439 4.5860203,0.82762989 H 1.3264186 C 0.88967954,0.84543129 0.53310766,1.0066451 0.55639053,1.4205009 Z"
|
||||||
sodipodi:nodetypes="cccccccc" />
|
sodipodi:nodetypes="ccccccccccccc" />
|
||||||
<g
|
<g
|
||||||
id="g379"
|
id="g478">
|
||||||
transform="matrix(0.01113254,0,0,0.01113254,0.33749402,1.6862516)"
|
<path
|
||||||
style="fill:#000000;stroke-width:23.7666">
|
style="fill:#ffccaa;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
d="m 4.4649331,3.6987471 2.1436896,0.299894 2.0437247,-0.4887164 -0.033322,0.8996834 0.3554304,0.488717 v 1.032969 L 8.5968114,6.2645101 7.9637011,7.4529811 6.8863027,8.1971631 5.6422961,8.0527701 4.8314707,7.1864081 4.3427538,6.2311891 4.0317523,6.0534731 3.7762867,5.3981491 4.0317523,4.7428241 4.2316817,4.4762511 4.2427887,3.6987471 Z"
|
||||||
|
id="path455" />
|
||||||
<g
|
<g
|
||||||
transform="matrix(0.08797553,0,0,-0.08797553,110.05744,434.06317)"
|
id="g379"
|
||||||
id="g377"
|
transform="matrix(0.01113254,0,0,0.01113254,0.33749402,1.6862516)"
|
||||||
style="fill:#000000;stroke-width:27.0149">
|
style="fill:#000000;stroke-width:23.7666">
|
||||||
<path
|
<g
|
||||||
d="M 3122.6,4604.2 C 2231.7,4380.5 1476.5,4187.4 1444,4174 c -68.8,-28.7 -114.7,-107.1 -114.7,-193.1 0,-42.1 19.1,-76.5 63.1,-120.4 l 61.2,-61.2 554.4,-63.1 c 305.9,-34.4 1152.8,-128.1 1883.1,-210.3 l 1328.7,-149.1 1508.4,380.5 c 827.8,208.4 1514.1,378.5 1523.7,378.5 9.6,0 17.2,-275.3 17.2,-636.6 V 2864.5 L 8078,2673.3 c -286.8,-284.9 -286.8,-237.1 -3.8,-804.9 191.2,-382.4 242.8,-470.3 290.6,-495.2 78.4,-40.1 158.7,-36.3 217.9,11.5 68.8,53.5 489.4,892.8 489.4,973.1 0,89.9 -40.1,147.2 -227.5,334.6 l -174,172.1 v 806.8 808.7 l -53.5,59.3 -53.5,61.2 L 6690,4807 c -1028.6,114.7 -1888.9,206.5 -1909.9,206.5 -21,-0.2 -766.6,-185.6 -1657.5,-409.3 z"
|
transform="matrix(0.08797553,0,0,-0.08797553,110.05744,434.06317)"
|
||||||
id="path367"
|
id="g377"
|
||||||
style="fill:#000000;stroke-width:27.0149" />
|
style="fill:#000000;stroke-width:27.0149">
|
||||||
<path
|
<path
|
||||||
d="m 6340.2,3243 -1099.3,-275.3 -1344,149.1 -1344,149.1 v -569.7 -569.7 l -103.2,-99.4 C 2260.4,1839.7 2170.6,1596.9 2157.2,1218.4 2140,816.9 2229.9,493.8 2411.5,293.1 2484,212.7 2642.7,121 2711.5,121 c 17.2,0 32.5,-15.3 32.5,-32.5 0,-63.1 191.2,-510.5 298.2,-697.8 369,-651.9 892.8,-1091.7 1491.2,-1248.4 290.6,-76.5 642.4,-76.5 933,0 728.4,191.2 1345.9,803 1693.9,1676.7 51.7,133.7 95.7,256.1 95.7,273.3 0,15.3 15.3,28.7 34.4,28.7 66.9,0 225.6,91.8 298.3,172.1 181.6,200.7 271.5,523.8 256.2,925.3 -15.3,380.5 -110.9,629 -307.8,808.7 l -80.3,70.7 -9.6,709.3 -9.6,709.3 z M 3222,2375 c 229.4,-65 602.2,-135.7 908.1,-174 137.7,-15.3 435.9,-24.8 869.9,-24.8 694,0 869.9,13.4 1328.7,97.5 216,38.2 575.5,130 686.4,172.1 34.4,13.4 36.3,3.8 22.9,-273.4 l -13.4,-286.8 49.7,-59.3 c 32.5,-40.1 76.5,-65 130,-74.6 70.7,-15.3 86,-26.8 133.8,-114.7 149.1,-277.2 135.8,-812.5 -22.9,-1036.2 -40.1,-57.4 -45.9,-57.4 -154.9,-45.9 -107.1,9.6 -114.7,7.6 -170.2,-45.9 -30.6,-32.5 -65,-95.6 -78.4,-141.5 -239,-948.3 -887.1,-1692 -1604,-1844.9 -166.3,-34.4 -443.6,-34.4 -613.7,1.9 -671,141.5 -1267.5,774.3 -1540.9,1634.6 -38.2,120.4 -78.4,244.7 -89.9,275.3 -36.3,99.4 -187.4,156.8 -281,107.1 -51.6,-28.7 -124.3,66.9 -175.9,235.2 -63.1,196.9 -61.2,560.2 1.9,739.9 61.2,174 99.4,221.8 191.2,237.1 51.6,7.6 89.9,30.6 124.3,70.7 l 49.7,59.3 -11.5,288.7 c -13.4,277.2 -13.4,286.8 22.9,273.4 19.3,-7.7 126.3,-40.2 237.2,-70.8 z"
|
d="M 3122.6,4604.2 C 2231.7,4380.5 1476.5,4187.4 1444,4174 c -68.8,-28.7 -114.7,-107.1 -114.7,-193.1 0,-42.1 19.1,-76.5 63.1,-120.4 l 61.2,-61.2 554.4,-63.1 c 305.9,-34.4 1152.8,-128.1 1883.1,-210.3 l 1328.7,-149.1 1508.4,380.5 c 827.8,208.4 1514.1,378.5 1523.7,378.5 9.6,0 17.2,-275.3 17.2,-636.6 V 2864.5 L 8078,2673.3 c -286.8,-284.9 -286.8,-237.1 -3.8,-804.9 191.2,-382.4 242.8,-470.3 290.6,-495.2 78.4,-40.1 158.7,-36.3 217.9,11.5 68.8,53.5 489.4,892.8 489.4,973.1 0,89.9 -40.1,147.2 -227.5,334.6 l -174,172.1 v 806.8 808.7 l -53.5,59.3 -53.5,61.2 L 6690,4807 c -1028.6,114.7 -1888.9,206.5 -1909.9,206.5 -21,-0.2 -766.6,-185.6 -1657.5,-409.3 z"
|
||||||
id="path369"
|
id="path367"
|
||||||
style="fill:#000000;stroke-width:27.0149" />
|
style="fill:#000000;stroke-width:27.0149" />
|
||||||
<path
|
<path
|
||||||
d="m 3841.4,1279.5 c -72.6,-72.7 -84.1,-147.2 -38.2,-239 44,-82.2 103.2,-97.5 391.9,-97.5 233.2,0 269.6,3.8 311.6,38.2 114.7,89.9 109,254.3 -11.5,326.9 -51.6,30.6 -97.5,36.3 -323.1,36.3 h -265.7 z"
|
d="m 6340.2,3243 -1099.3,-275.3 -1344,149.1 -1344,149.1 v -569.7 -569.7 l -103.2,-99.4 C 2260.4,1839.7 2170.6,1596.9 2157.2,1218.4 2140,816.9 2229.9,493.8 2411.5,293.1 2484,212.7 2642.7,121 2711.5,121 c 17.2,0 32.5,-15.3 32.5,-32.5 0,-63.1 191.2,-510.5 298.2,-697.8 369,-651.9 892.8,-1091.7 1491.2,-1248.4 290.6,-76.5 642.4,-76.5 933,0 728.4,191.2 1345.9,803 1693.9,1676.7 51.7,133.7 95.7,256.1 95.7,273.3 0,15.3 15.3,28.7 34.4,28.7 66.9,0 225.6,91.8 298.3,172.1 181.6,200.7 271.5,523.8 256.2,925.3 -15.3,380.5 -110.9,629 -307.8,808.7 l -80.3,70.7 -9.6,709.3 -9.6,709.3 z M 3222,2375 c 229.4,-65 602.2,-135.7 908.1,-174 137.7,-15.3 435.9,-24.8 869.9,-24.8 694,0 869.9,13.4 1328.7,97.5 216,38.2 575.5,130 686.4,172.1 34.4,13.4 36.3,3.8 22.9,-273.4 l -13.4,-286.8 49.7,-59.3 c 32.5,-40.1 76.5,-65 130,-74.6 70.7,-15.3 86,-26.8 133.8,-114.7 149.1,-277.2 135.8,-812.5 -22.9,-1036.2 -40.1,-57.4 -45.9,-57.4 -154.9,-45.9 -107.1,9.6 -114.7,7.6 -170.2,-45.9 -30.6,-32.5 -65,-95.6 -78.4,-141.5 -239,-948.3 -887.1,-1692 -1604,-1844.9 -166.3,-34.4 -443.6,-34.4 -613.7,1.9 -671,141.5 -1267.5,774.3 -1540.9,1634.6 -38.2,120.4 -78.4,244.7 -89.9,275.3 -36.3,99.4 -187.4,156.8 -281,107.1 -51.6,-28.7 -124.3,66.9 -175.9,235.2 -63.1,196.9 -61.2,560.2 1.9,739.9 61.2,174 99.4,221.8 191.2,237.1 51.6,7.6 89.9,30.6 124.3,70.7 l 49.7,59.3 -11.5,288.7 c -13.4,277.2 -13.4,286.8 22.9,273.4 19.3,-7.7 126.3,-40.2 237.2,-70.8 z"
|
||||||
id="path371"
|
id="path369"
|
||||||
style="fill:#000000;stroke-width:27.0149" />
|
style="fill:#000000;stroke-width:27.0149" />
|
||||||
<path
|
<path
|
||||||
d="m 5504.7,1308.2 c -68.8,-42.1 -110.9,-143.4 -91.7,-219.9 5.7,-26.8 38.2,-70.7 68.8,-97.5 53.5,-45.9 66.9,-47.8 321.2,-47.8 288.7,0 340.3,13.4 388.1,95.6 53.5,87.9 42.1,166.3 -32.5,240.9 l -65,65 h -263.8 c -227.6,0 -273.5,-5.7 -325.1,-36.3 z"
|
d="m 3841.4,1279.5 c -72.6,-72.7 -84.1,-147.2 -38.2,-239 44,-82.2 103.2,-97.5 391.9,-97.5 233.2,0 269.6,3.8 311.6,38.2 114.7,89.9 109,254.3 -11.5,326.9 -51.6,30.6 -97.5,36.3 -323.1,36.3 h -265.7 z"
|
||||||
id="path373"
|
id="path371"
|
||||||
style="fill:#000000;stroke-width:27.0149" />
|
style="fill:#000000;stroke-width:27.0149" />
|
||||||
<path
|
<path
|
||||||
d="m 2352.1,-1601.6 c -326.9,-114.7 -663.4,-242.8 -749.4,-282.9 -265.7,-128.1 -478,-281 -713.1,-518.1 C 576,-2714.3 381,-3025.9 251,-3415.9 145.9,-3735.2 122.9,-3869 111.4,-4270.5 l -11.4,-367.1 68.8,-68.8 66.9,-66.9 H 5000 9764.3 l 66.9,66.9 68.8,68.8 -11.5,367.1 c -9.6,296.3 -19.1,405.3 -57.4,567.8 -128.1,535.3 -344.1,927.2 -728.4,1309.6 -233.2,233.3 -420.6,367.1 -709.3,506.6 -214.1,103.3 -1332.5,497.1 -1412.8,497.1 -36.3,0 -95.6,-42 -227.5,-166.3 -409.1,-384.3 -759,-585 -1229.3,-705.5 -183.5,-47.8 -244.7,-53.5 -504.7,-55.4 -424.4,0 -674.9,57.4 -1061.1,248.5 -242.8,120.5 -462.7,277.2 -711.2,512.4 -151,141.5 -187.4,166.3 -239,164.4 -34.3,-1.9 -328.8,-95.6 -655.7,-210.3 z"
|
d="m 5504.7,1308.2 c -68.8,-42.1 -110.9,-143.4 -91.7,-219.9 5.7,-26.8 38.2,-70.7 68.8,-97.5 53.5,-45.9 66.9,-47.8 321.2,-47.8 288.7,0 340.3,13.4 388.1,95.6 53.5,87.9 42.1,166.3 -32.5,240.9 l -65,65 h -263.8 c -227.6,0 -273.5,-5.7 -325.1,-36.3 z"
|
||||||
id="path375"
|
id="path373"
|
||||||
style="fill:#000000;stroke-width:27.0149" />
|
style="fill:#000000;stroke-width:27.0149" />
|
||||||
|
<path
|
||||||
|
d="m 2352.1,-1601.6 c -326.9,-114.7 -663.4,-242.8 -749.4,-282.9 -265.7,-128.1 -478,-281 -713.1,-518.1 C 576,-2714.3 381,-3025.9 251,-3415.9 145.9,-3735.2 122.9,-3869 111.4,-4270.5 l -11.4,-367.1 68.8,-68.8 66.9,-66.9 H 5000 9764.3 l 66.9,66.9 68.8,68.8 -11.5,367.1 c -9.6,296.3 -19.1,405.3 -57.4,567.8 -128.1,535.3 -344.1,927.2 -728.4,1309.6 -233.2,233.3 -420.6,367.1 -709.3,506.6 -214.1,103.3 -1332.5,497.1 -1412.8,497.1 -36.3,0 -95.6,-42 -227.5,-166.3 -409.1,-384.3 -759,-585 -1229.3,-705.5 -183.5,-47.8 -244.7,-53.5 -504.7,-55.4 -424.4,0 -674.9,57.4 -1061.1,248.5 -242.8,120.5 -462.7,277.2 -711.2,512.4 -151,141.5 -187.4,166.3 -239,164.4 -34.3,-1.9 -328.8,-95.6 -655.7,-210.3 z"
|
||||||
|
id="path375"
|
||||||
|
style="fill:#000000;stroke-width:27.0149" />
|
||||||
|
</g>
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
<path
|
<path
|
||||||
style="fill:none;stroke:#ff0000;stroke-width:0.965;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
style="fill:none;stroke:#ff0000;stroke-width:0.965;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
d="M 3.5278992,6.2436203 9.388521,11.365016 v 0"
|
d="m 3.5786603,13.223277 5.8606218,5.121396 v 0"
|
||||||
id="path817" />
|
id="path817" />
|
||||||
<path
|
<path
|
||||||
style="fill:none;stroke:#ff0000;stroke-width:0.965;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
style="fill:none;stroke:#ff0000;stroke-width:0.965;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
||||||
d="M 9.4139013,6.2943814 3.5532799,11.415776 v 0"
|
d="M 9.2869984,13.400941 3.426377,18.522336 v 0"
|
||||||
id="path1376" />
|
id="path1376" />
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 9.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.0 KiB |
@ -1,8 +1,8 @@
|
|||||||
<?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="nofeedback.png"
|
inkscape:export-filename="nodetailfeedback.png"
|
||||||
sodipodi:docname="nodetail.svg"
|
sodipodi:docname="nodetail.svg"
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||||
id="svg8"
|
id="svg8"
|
||||||
@ -40,8 +40,8 @@
|
|||||||
inkscape:document-rotation="0"
|
inkscape:document-rotation="0"
|
||||||
inkscape:current-layer="layer1"
|
inkscape:current-layer="layer1"
|
||||||
inkscape:document-units="mm"
|
inkscape:document-units="mm"
|
||||||
inkscape:cy="23.659557"
|
inkscape:cy="13.892407"
|
||||||
inkscape:cx="67.399406"
|
inkscape:cx="39.37193"
|
||||||
inkscape:zoom="8.2419125"
|
inkscape:zoom="8.2419125"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:pageopacity="0.0"
|
inkscape:pageopacity="0.0"
|
||||||
@ -103,78 +103,255 @@
|
|||||||
id="layer1"
|
id="layer1"
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
inkscape:label="Calque 1">
|
inkscape:label="Calque 1">
|
||||||
<rect
|
|
||||||
style="fill:#ffffff;stroke:none;stroke-width:0.965;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
|
|
||||||
id="rect377"
|
|
||||||
width="10.678919"
|
|
||||||
height="11.017167"
|
|
||||||
x="0.61403924"
|
|
||||||
y="0.46577585" />
|
|
||||||
<g
|
<g
|
||||||
id="g3526"
|
id="g1090"
|
||||||
transform="translate(-0.32102177,-0.51363483)">
|
transform="translate(-15.023818,4.2053852)">
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:3.22953px;line-height:1.2;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ff0000;stroke:#000000;stroke-width:0.264583"
|
style="font-size:5.13476px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;stroke-width:0.264583"
|
||||||
x="4.3559556"
|
x="14.924755"
|
||||||
y="7.7761049"
|
y="4.3282943"
|
||||||
id="text3444"><tspan
|
id="text1080"
|
||||||
|
transform="scale(1.0214293,0.97902028)"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan3442"
|
id="tspan1078"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ff0000;stroke:#000000;stroke-width:0.264583"
|
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:5.13476px;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ff0000;stroke-width:0.264583"
|
||||||
x="4.3559556"
|
x="14.924755"
|
||||||
y="7.7761049">ERR</tspan></text>
|
y="4.3282943">?</tspan></text>
|
||||||
<ellipse
|
|
||||||
style="fill:#ff0000;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke;stop-color:#000000"
|
|
||||||
id="path3510"
|
|
||||||
cx="2.1668973"
|
|
||||||
cy="6.6202235"
|
|
||||||
rx="1.4285469"
|
|
||||||
ry="1.444598" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g3521"
|
|
||||||
transform="translate(-0.32102177,-0.64204354)">
|
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:3.22953px;line-height:1.2;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ff0000;stroke:#000000;stroke-width:0.264583"
|
style="font-size:5.13476px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;fill:#ffcc00;stroke-width:0.264583"
|
||||||
x="4.0991383"
|
x="18.036194"
|
||||||
y="4.2448654"
|
y="4.3282943"
|
||||||
id="text3450"><tspan
|
id="text1084"
|
||||||
|
transform="scale(1.0214293,0.97902028)"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan3448"
|
id="tspan1082"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#00ff00;stroke:#000000;stroke-width:0.264583"
|
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:5.13476px;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ffcc00;stroke-width:0.264583"
|
||||||
x="4.0991383"
|
x="18.036194"
|
||||||
y="4.2448654">COR</tspan></text>
|
y="4.3282943">?</tspan></text>
|
||||||
<ellipse
|
|
||||||
style="fill:#00ff00;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke;stop-color:#000000"
|
|
||||||
id="ellipse3512"
|
|
||||||
cx="2.1668973"
|
|
||||||
cy="3.0897722"
|
|
||||||
rx="1.4285469"
|
|
||||||
ry="1.444598" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g3542"
|
|
||||||
transform="translate(-0.35312395,6.7414572)">
|
|
||||||
<text
|
<text
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:3.22953px;line-height:1.2;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ff0000;stroke:#000000;stroke-width:0.264583"
|
style="font-size:5.13476px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;fill:#00ff00;stroke-width:0.264583"
|
||||||
x="4.0991383"
|
x="21.304777"
|
||||||
y="4.2448654"
|
y="4.3610845"
|
||||||
id="text3538"><tspan
|
id="text1088"
|
||||||
|
transform="scale(1.0214293,0.97902028)"><tspan
|
||||||
sodipodi:role="line"
|
sodipodi:role="line"
|
||||||
id="tspan3536"
|
id="tspan1086"
|
||||||
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#00ff00;stroke:#000000;stroke-width:0.264583"
|
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:5.13476px;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#00ff00;stroke-width:0.264583"
|
||||||
x="4.0991383"
|
x="21.304777"
|
||||||
y="4.2448654">COR</tspan></text>
|
y="4.3610845">?</tspan></text>
|
||||||
<ellipse
|
|
||||||
style="fill:#00ff00;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke;stop-color:#000000"
|
|
||||||
id="ellipse3540"
|
|
||||||
cx="2.1668973"
|
|
||||||
cy="3.0897722"
|
|
||||||
rx="1.4285469"
|
|
||||||
ry="1.444598" />
|
|
||||||
</g>
|
</g>
|
||||||
|
<g
|
||||||
|
id="g1011"
|
||||||
|
transform="translate(-36.692788,-0.48153265)">
|
||||||
|
<g
|
||||||
|
id="g999"
|
||||||
|
transform="translate(0.16051088,4.3337939)">
|
||||||
|
<g
|
||||||
|
id="g997">
|
||||||
|
<path
|
||||||
|
sodipodi:type="star"
|
||||||
|
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59402;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
|
||||||
|
id="path991"
|
||||||
|
inkscape:flatsided="false"
|
||||||
|
sodipodi:sides="5"
|
||||||
|
sodipodi:cx="1.2519848"
|
||||||
|
sodipodi:cy="1.444598"
|
||||||
|
sodipodi:r1="1.4517142"
|
||||||
|
sodipodi:r2="0.72585714"
|
||||||
|
sodipodi:arg1="0.95825877"
|
||||||
|
sodipodi:arg2="1.5865773"
|
||||||
|
inkscape:rounded="0"
|
||||||
|
inkscape:randomized="0"
|
||||||
|
d="M 2.0866414,2.6323784 1.2405306,2.1703647 0.38026154,2.6054479 0.55820007,1.6579786 -0.12142634,0.97426218 0.83465653,0.85070768 1.2748933,-0.00693544 1.6878465,0.86417296 2.6395542,1.0178368 1.9386905,1.6797659 Z"
|
||||||
|
inkscape:transform-center-x="-0.011933649"
|
||||||
|
inkscape:transform-center-y="-0.22170183"
|
||||||
|
transform="matrix(1.6857602,0,0,1.6811323,0.30798457,0.13313262)" />
|
||||||
|
<path
|
||||||
|
sodipodi:type="star"
|
||||||
|
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59402;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
|
||||||
|
id="path993"
|
||||||
|
inkscape:flatsided="false"
|
||||||
|
sodipodi:sides="5"
|
||||||
|
sodipodi:cx="1.2519848"
|
||||||
|
sodipodi:cy="1.444598"
|
||||||
|
sodipodi:r1="1.4517142"
|
||||||
|
sodipodi:r2="0.72585714"
|
||||||
|
sodipodi:arg1="0.95825877"
|
||||||
|
sodipodi:arg2="1.5865773"
|
||||||
|
inkscape:rounded="0"
|
||||||
|
inkscape:randomized="0"
|
||||||
|
d="M 2.0866414,2.6323784 1.2405306,2.1703647 0.38026154,2.6054479 0.55820007,1.6579786 -0.12142634,0.97426218 0.83465653,0.85070768 1.2748933,-0.00693544 1.6878465,0.86417296 2.6395542,1.0178368 1.9386905,1.6797659 Z"
|
||||||
|
inkscape:transform-center-x="-0.011933601"
|
||||||
|
inkscape:transform-center-y="-0.22170183"
|
||||||
|
transform="matrix(1.6857602,0,0,1.6811323,3.2777648,0.13313262)" />
|
||||||
|
<path
|
||||||
|
sodipodi:type="star"
|
||||||
|
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59402;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
|
||||||
|
id="path995"
|
||||||
|
inkscape:flatsided="false"
|
||||||
|
sodipodi:sides="5"
|
||||||
|
sodipodi:cx="1.2519848"
|
||||||
|
sodipodi:cy="1.444598"
|
||||||
|
sodipodi:r1="1.4517142"
|
||||||
|
sodipodi:r2="0.72585714"
|
||||||
|
sodipodi:arg1="0.95825877"
|
||||||
|
sodipodi:arg2="1.5865773"
|
||||||
|
inkscape:rounded="0"
|
||||||
|
inkscape:randomized="0"
|
||||||
|
d="M 2.0866414,2.6323784 1.2405306,2.1703647 0.38026154,2.6054479 0.55820007,1.6579786 -0.12142634,0.97426218 0.83465653,0.85070768 1.2748933,-0.00693544 1.6878465,0.86417296 2.6395542,1.0178368 1.9386905,1.6797659 Z"
|
||||||
|
inkscape:transform-center-x="-0.011933682"
|
||||||
|
inkscape:transform-center-y="-0.22170183"
|
||||||
|
transform="matrix(1.6857602,0,0,1.6811323,6.2475451,0.13313262)" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
id="g976"
|
||||||
|
transform="translate(0.09630653,-0.03210218)">
|
||||||
|
<g
|
||||||
|
id="g989">
|
||||||
|
<path
|
||||||
|
sodipodi:type="star"
|
||||||
|
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59402;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
|
||||||
|
id="path967"
|
||||||
|
inkscape:flatsided="false"
|
||||||
|
sodipodi:sides="5"
|
||||||
|
sodipodi:cx="1.2519848"
|
||||||
|
sodipodi:cy="1.444598"
|
||||||
|
sodipodi:r1="1.4517142"
|
||||||
|
sodipodi:r2="0.72585714"
|
||||||
|
sodipodi:arg1="0.95825877"
|
||||||
|
sodipodi:arg2="1.5865773"
|
||||||
|
inkscape:rounded="0"
|
||||||
|
inkscape:randomized="0"
|
||||||
|
d="M 2.0866414,2.6323784 1.2405306,2.1703647 0.38026154,2.6054479 0.55820007,1.6579786 -0.12142634,0.97426218 0.83465653,0.85070768 1.2748933,-0.00693544 1.6878465,0.86417296 2.6395542,1.0178368 1.9386905,1.6797659 Z"
|
||||||
|
inkscape:transform-center-x="-0.011933649"
|
||||||
|
inkscape:transform-center-y="-0.22170183"
|
||||||
|
transform="matrix(1.6857602,0,0,1.6811323,0.30798457,0.13313262)" />
|
||||||
|
<path
|
||||||
|
sodipodi:type="star"
|
||||||
|
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59402;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
|
||||||
|
id="path969"
|
||||||
|
inkscape:flatsided="false"
|
||||||
|
sodipodi:sides="5"
|
||||||
|
sodipodi:cx="1.2519848"
|
||||||
|
sodipodi:cy="1.444598"
|
||||||
|
sodipodi:r1="1.4517142"
|
||||||
|
sodipodi:r2="0.72585714"
|
||||||
|
sodipodi:arg1="0.95825877"
|
||||||
|
sodipodi:arg2="1.5865773"
|
||||||
|
inkscape:rounded="0"
|
||||||
|
inkscape:randomized="0"
|
||||||
|
d="M 2.0866414,2.6323784 1.2405306,2.1703647 0.38026154,2.6054479 0.55820007,1.6579786 -0.12142634,0.97426218 0.83465653,0.85070768 1.2748933,-0.00693544 1.6878465,0.86417296 2.6395542,1.0178368 1.9386905,1.6797659 Z"
|
||||||
|
inkscape:transform-center-x="-0.011933601"
|
||||||
|
inkscape:transform-center-y="-0.22170183"
|
||||||
|
transform="matrix(1.6857602,0,0,1.6811323,3.2777648,0.13313262)" />
|
||||||
|
<path
|
||||||
|
sodipodi:type="star"
|
||||||
|
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.59402;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
|
||||||
|
id="path971"
|
||||||
|
inkscape:flatsided="false"
|
||||||
|
sodipodi:sides="5"
|
||||||
|
sodipodi:cx="1.2519848"
|
||||||
|
sodipodi:cy="1.444598"
|
||||||
|
sodipodi:r1="1.4517142"
|
||||||
|
sodipodi:r2="0.72585714"
|
||||||
|
sodipodi:arg1="0.95825877"
|
||||||
|
sodipodi:arg2="1.5865773"
|
||||||
|
inkscape:rounded="0"
|
||||||
|
inkscape:randomized="0"
|
||||||
|
d="M 2.0866414,2.6323784 1.2405306,2.1703647 0.38026154,2.6054479 0.55820007,1.6579786 -0.12142634,0.97426218 0.83465653,0.85070768 1.2748933,-0.00693544 1.6878465,0.86417296 2.6395542,1.0178368 1.9386905,1.6797659 Z"
|
||||||
|
inkscape:transform-center-x="-0.011933682"
|
||||||
|
inkscape:transform-center-y="-0.22170183"
|
||||||
|
transform="matrix(1.6857602,0,0,1.6811323,6.2475451,0.13313262)" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<path
|
||||||
|
style="fill:#0000ff;stroke-width:0.999999"
|
||||||
|
d="m 15.325643,4.4644597 c -0.22723,-0.07141 -0.441899,-0.298159 -0.497266,-0.525248 -0.01751,-0.07181 -0.02338,-0.557037 -0.01872,-1.546417 l 0.0068,-1.44177248 0.05692,-0.1156655 c 0.0726,-0.1475279 0.21474,-0.2896713 0.362268,-0.3622681 l 0.115666,-0.056917 h 4.47647 5.534804 l 0.109211,0.050463 c 0.139563,0.0644878 0.295986,0.2209107 0.368722,0.3687226 l 0.05692,0.1156655 V 2.4509312 3.9508397 l -0.05692,0.115665 c -0.07253,0.147393 -0.213281,0.2881246 -0.361661,0.361605 l -0.116272,0.05758 -5.499922,0.0044 c -3.570913,0.0035 -4.460296,-0.0015 -4.537018,-0.02561 z"
|
||||||
|
id="path703"
|
||||||
|
sodipodi:nodetypes="ccccsccccscccccscccc" />
|
||||||
|
<g
|
||||||
|
id="g1076"
|
||||||
|
transform="translate(-14.959614,-0.16051088)">
|
||||||
|
<text
|
||||||
|
xml:space="preserve"
|
||||||
|
style="font-size:5.13476px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;stroke-width:0.264583"
|
||||||
|
x="14.924755"
|
||||||
|
y="4.3282943"
|
||||||
|
id="text875"
|
||||||
|
transform="scale(1.0214293,0.97902028)"><tspan
|
||||||
|
sodipodi:role="line"
|
||||||
|
id="tspan873"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:5.13476px;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ff0000;stroke-width:0.264583"
|
||||||
|
x="14.924755"
|
||||||
|
y="4.3282943">?</tspan></text>
|
||||||
|
<text
|
||||||
|
xml:space="preserve"
|
||||||
|
style="font-size:5.13476px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;fill:#ffcc00;stroke-width:0.264583"
|
||||||
|
x="18.036194"
|
||||||
|
y="4.3282943"
|
||||||
|
id="text879"
|
||||||
|
transform="scale(1.0214293,0.97902028)"><tspan
|
||||||
|
sodipodi:role="line"
|
||||||
|
id="tspan877"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:5.13476px;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ffcc00;stroke-width:0.264583"
|
||||||
|
x="18.036194"
|
||||||
|
y="4.3282943">?</tspan></text>
|
||||||
|
<text
|
||||||
|
xml:space="preserve"
|
||||||
|
style="font-size:5.13476px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;fill:#00ff00;stroke-width:0.264583"
|
||||||
|
x="21.304777"
|
||||||
|
y="4.3610845"
|
||||||
|
id="text883"
|
||||||
|
transform="scale(1.0214293,0.97902028)"><tspan
|
||||||
|
sodipodi:role="line"
|
||||||
|
id="tspan881"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:5.13476px;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#00ff00;stroke-width:0.264583"
|
||||||
|
x="21.304777"
|
||||||
|
y="4.3610845">?</tspan></text>
|
||||||
|
</g>
|
||||||
|
<path
|
||||||
|
style="fill:#ffccaa;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
d="m 6.2036714,5.5920243 1.7273844,0.241655 1.6468323,-0.393808 -0.026849,0.724965 0.2864061,0.393808 v 0.832366 L 9.5331373,7.6595153 9.0229775,8.6171853 8.1548102,9.2168463 7.1523901,9.1004953 6.4990272,8.4023803 6.1052193,7.6326653 5.8546144,7.4894623 l -0.2058541,-0.52806 0.2058541,-0.528061 0.161103,-0.214804 0.00895,-0.626513 z"
|
||||||
|
id="path455" />
|
||||||
|
<g
|
||||||
|
id="g379-4"
|
||||||
|
transform="matrix(0.00893625,0,0,0.00893625,2.9185737,3.9521473)"
|
||||||
|
style="fill:#000000;stroke-width:29.6078">
|
||||||
|
<g
|
||||||
|
transform="matrix(0.08797553,0,0,-0.08797553,110.05744,434.06317)"
|
||||||
|
id="g377-5"
|
||||||
|
style="fill:#000000;stroke-width:33.6545">
|
||||||
|
<path
|
||||||
|
d="M 3122.6,4604.2 C 2231.7,4380.5 1476.5,4187.4 1444,4174 c -68.8,-28.7 -114.7,-107.1 -114.7,-193.1 0,-42.1 19.1,-76.5 63.1,-120.4 l 61.2,-61.2 554.4,-63.1 c 305.9,-34.4 1152.8,-128.1 1883.1,-210.3 l 1328.7,-149.1 1508.4,380.5 c 827.8,208.4 1514.1,378.5 1523.7,378.5 9.6,0 17.2,-275.3 17.2,-636.6 V 2864.5 L 8078,2673.3 c -286.8,-284.9 -286.8,-237.1 -3.8,-804.9 191.2,-382.4 242.8,-470.3 290.6,-495.2 78.4,-40.1 158.7,-36.3 217.9,11.5 68.8,53.5 489.4,892.8 489.4,973.1 0,89.9 -40.1,147.2 -227.5,334.6 l -174,172.1 v 806.8 808.7 l -53.5,59.3 -53.5,61.2 L 6690,4807 c -1028.6,114.7 -1888.9,206.5 -1909.9,206.5 -21,-0.2 -766.6,-185.6 -1657.5,-409.3 z"
|
||||||
|
id="path367-3"
|
||||||
|
style="fill:#000000;stroke-width:33.6545" />
|
||||||
|
<path
|
||||||
|
d="m 6340.2,3243 -1099.3,-275.3 -1344,149.1 -1344,149.1 v -569.7 -569.7 l -103.2,-99.4 C 2260.4,1839.7 2170.6,1596.9 2157.2,1218.4 2140,816.9 2229.9,493.8 2411.5,293.1 2484,212.7 2642.7,121 2711.5,121 c 17.2,0 32.5,-15.3 32.5,-32.5 0,-63.1 191.2,-510.5 298.2,-697.8 369,-651.9 892.8,-1091.7 1491.2,-1248.4 290.6,-76.5 642.4,-76.5 933,0 728.4,191.2 1345.9,803 1693.9,1676.7 51.7,133.7 95.7,256.1 95.7,273.3 0,15.3 15.3,28.7 34.4,28.7 66.9,0 225.6,91.8 298.3,172.1 181.6,200.7 271.5,523.8 256.2,925.3 -15.3,380.5 -110.9,629 -307.8,808.7 l -80.3,70.7 -9.6,709.3 -9.6,709.3 z M 3222,2375 c 229.4,-65 602.2,-135.7 908.1,-174 137.7,-15.3 435.9,-24.8 869.9,-24.8 694,0 869.9,13.4 1328.7,97.5 216,38.2 575.5,130 686.4,172.1 34.4,13.4 36.3,3.8 22.9,-273.4 l -13.4,-286.8 49.7,-59.3 c 32.5,-40.1 76.5,-65 130,-74.6 70.7,-15.3 86,-26.8 133.8,-114.7 149.1,-277.2 135.8,-812.5 -22.9,-1036.2 -40.1,-57.4 -45.9,-57.4 -154.9,-45.9 -107.1,9.6 -114.7,7.6 -170.2,-45.9 -30.6,-32.5 -65,-95.6 -78.4,-141.5 -239,-948.3 -887.1,-1692 -1604,-1844.9 -166.3,-34.4 -443.6,-34.4 -613.7,1.9 -671,141.5 -1267.5,774.3 -1540.9,1634.6 -38.2,120.4 -78.4,244.7 -89.9,275.3 -36.3,99.4 -187.4,156.8 -281,107.1 -51.6,-28.7 -124.3,66.9 -175.9,235.2 -63.1,196.9 -61.2,560.2 1.9,739.9 61.2,174 99.4,221.8 191.2,237.1 51.6,7.6 89.9,30.6 124.3,70.7 l 49.7,59.3 -11.5,288.7 c -13.4,277.2 -13.4,286.8 22.9,273.4 19.3,-7.7 126.3,-40.2 237.2,-70.8 z"
|
||||||
|
id="path369-2"
|
||||||
|
style="fill:#000000;stroke-width:33.6545" />
|
||||||
|
<path
|
||||||
|
d="m 3841.4,1279.5 c -72.6,-72.7 -84.1,-147.2 -38.2,-239 44,-82.2 103.2,-97.5 391.9,-97.5 233.2,0 269.6,3.8 311.6,38.2 114.7,89.9 109,254.3 -11.5,326.9 -51.6,30.6 -97.5,36.3 -323.1,36.3 h -265.7 z"
|
||||||
|
id="path371-8"
|
||||||
|
style="fill:#000000;stroke-width:33.6545" />
|
||||||
|
<path
|
||||||
|
d="m 5504.7,1308.2 c -68.8,-42.1 -110.9,-143.4 -91.7,-219.9 5.7,-26.8 38.2,-70.7 68.8,-97.5 53.5,-45.9 66.9,-47.8 321.2,-47.8 288.7,0 340.3,13.4 388.1,95.6 53.5,87.9 42.1,166.3 -32.5,240.9 l -65,65 h -263.8 c -227.6,0 -273.5,-5.7 -325.1,-36.3 z"
|
||||||
|
id="path373-4"
|
||||||
|
style="fill:#000000;stroke-width:33.6545" />
|
||||||
|
<path
|
||||||
|
d="m 2352.1,-1601.6 c -326.9,-114.7 -663.4,-242.8 -749.4,-282.9 -265.7,-128.1 -478,-281 -713.1,-518.1 C 576,-2714.3 381,-3025.9 251,-3415.9 145.9,-3735.2 122.9,-3869 111.4,-4270.5 l -11.4,-367.1 68.8,-68.8 66.9,-66.9 H 5000 9764.3 l 66.9,66.9 68.8,68.8 -11.5,367.1 c -9.6,296.3 -19.1,405.3 -57.4,567.8 -128.1,535.3 -344.1,927.2 -728.4,1309.6 -233.2,233.3 -420.6,367.1 -709.3,506.6 -214.1,103.3 -1332.5,497.1 -1412.8,497.1 -36.3,0 -95.6,-42 -227.5,-166.3 -409.1,-384.3 -759,-585 -1229.3,-705.5 -183.5,-47.8 -244.7,-53.5 -504.7,-55.4 -424.4,0 -674.9,57.4 -1061.1,248.5 -242.8,120.5 -462.7,277.2 -711.2,512.4 -151,141.5 -187.4,166.3 -239,164.4 -34.3,-1.9 -328.8,-95.6 -655.7,-210.3 z"
|
||||||
|
id="path375-2"
|
||||||
|
style="fill:#000000;stroke-width:33.6545" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<path
|
||||||
|
style="fill:#0000ff;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
d="m 15.356691,4.2026247 1.670874,-0.02321 c -0.196557,1.394818 0.371729,2.872365 1.485222,3.898706 l 0.672991,-1.322772 2.088592,3.5506073 -5.082242,-0.232065 1.485221,-1.2067433 c -1.310045,-1.060518 -2.119624,-2.864664 -2.320658,-4.664523 z"
|
||||||
|
id="path775"
|
||||||
|
sodipodi:nodetypes="cccccccc" />
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.2 KiB |
@ -1,178 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<svg
|
|
||||||
inkscape:export-ydpi="96"
|
|
||||||
inkscape:export-xdpi="96"
|
|
||||||
inkscape:export-filename="nofeedback.png"
|
|
||||||
sodipodi:docname="nofeedback.svg"
|
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
|
||||||
id="svg8"
|
|
||||||
version="1.1"
|
|
||||||
viewBox="0 0 11.90625 11.90625"
|
|
||||||
height="45"
|
|
||||||
width="45"
|
|
||||||
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"
|
|
||||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
||||||
xmlns:cc="http://creativecommons.org/ns#"
|
|
||||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
|
||||||
<defs
|
|
||||||
id="defs2">
|
|
||||||
<marker
|
|
||||||
style="overflow:visible"
|
|
||||||
id="Arrow1"
|
|
||||||
refX="0"
|
|
||||||
refY="0"
|
|
||||||
orient="auto-start-reverse"
|
|
||||||
inkscape:stockid="Arrow1"
|
|
||||||
markerWidth="7"
|
|
||||||
markerHeight="7"
|
|
||||||
viewBox="0 0 4.0606602 6.7071068"
|
|
||||||
inkscape:isstock="true"
|
|
||||||
inkscape:collect="always"
|
|
||||||
preserveAspectRatio="xMidYMid">
|
|
||||||
<path
|
|
||||||
style="fill:none;stroke:context-stroke;stroke-width:1;stroke-linecap:butt"
|
|
||||||
d="M 3,-3 0,0 3,3"
|
|
||||||
id="path5057"
|
|
||||||
transform="rotate(180,0.125,0)"
|
|
||||||
sodipodi:nodetypes="ccc" />
|
|
||||||
</marker>
|
|
||||||
<pattern
|
|
||||||
id="EMFhbasepattern"
|
|
||||||
patternUnits="userSpaceOnUse"
|
|
||||||
width="6"
|
|
||||||
height="6"
|
|
||||||
x="0"
|
|
||||||
y="0" />
|
|
||||||
</defs>
|
|
||||||
<sodipodi:namedview
|
|
||||||
inkscape:window-maximized="1"
|
|
||||||
inkscape:window-y="-8"
|
|
||||||
inkscape:window-x="-8"
|
|
||||||
inkscape:window-height="1009"
|
|
||||||
inkscape:window-width="1920"
|
|
||||||
units="px"
|
|
||||||
inkscape:guide-bbox="true"
|
|
||||||
showguides="true"
|
|
||||||
showgrid="false"
|
|
||||||
inkscape:document-rotation="0"
|
|
||||||
inkscape:current-layer="layer1"
|
|
||||||
inkscape:document-units="mm"
|
|
||||||
inkscape:cy="23.659557"
|
|
||||||
inkscape:cx="68.734047"
|
|
||||||
inkscape:zoom="8.2419125"
|
|
||||||
inkscape:pageshadow="2"
|
|
||||||
inkscape:pageopacity="0.0"
|
|
||||||
borderopacity="1.0"
|
|
||||||
bordercolor="#666666"
|
|
||||||
pagecolor="#ffffff"
|
|
||||||
id="base"
|
|
||||||
inkscape:pagecheckerboard="0"
|
|
||||||
inkscape:showpageshadow="2"
|
|
||||||
inkscape:deskcolor="#d1d1d1">
|
|
||||||
<sodipodi:guide
|
|
||||||
id="guide25"
|
|
||||||
orientation="0,-1"
|
|
||||||
position="94.049365,180.07197"
|
|
||||||
inkscape:locked="false" />
|
|
||||||
<sodipodi:guide
|
|
||||||
position="8.9572181,11.534441"
|
|
||||||
orientation="0,-1"
|
|
||||||
id="guide4043"
|
|
||||||
inkscape:locked="false" />
|
|
||||||
<sodipodi:guide
|
|
||||||
position="-4.2589037,4.1320607"
|
|
||||||
orientation="0,-1"
|
|
||||||
id="guide315"
|
|
||||||
inkscape:locked="false" />
|
|
||||||
<sodipodi:guide
|
|
||||||
position="1.0787715,2.8911402"
|
|
||||||
orientation="0,-1"
|
|
||||||
id="guide373"
|
|
||||||
inkscape:locked="false" />
|
|
||||||
<sodipodi:guide
|
|
||||||
position="11.558135,1.7718565"
|
|
||||||
orientation="1,0"
|
|
||||||
id="guide428"
|
|
||||||
inkscape:locked="false" />
|
|
||||||
</sodipodi:namedview>
|
|
||||||
<metadata
|
|
||||||
id="metadata5">
|
|
||||||
<rdf:RDF>
|
|
||||||
<cc:Work
|
|
||||||
rdf:about="">
|
|
||||||
<dc:format>image/svg+xml</dc:format>
|
|
||||||
<dc:type
|
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|
||||||
</cc:Work>
|
|
||||||
</rdf:RDF>
|
|
||||||
</metadata>
|
|
||||||
<g
|
|
||||||
id="layer1"
|
|
||||||
inkscape:groupmode="layer"
|
|
||||||
inkscape:label="Calque 1">
|
|
||||||
<rect
|
|
||||||
style="fill:#ffffff;stroke:none;stroke-width:0.965;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
|
|
||||||
id="rect377"
|
|
||||||
width="10.678919"
|
|
||||||
height="11.017167"
|
|
||||||
x="0.61403924"
|
|
||||||
y="0.46577585" />
|
|
||||||
<g
|
|
||||||
id="g379"
|
|
||||||
transform="matrix(0.00882858,0,0,0.00882858,2.7664564,4.0629307)"
|
|
||||||
style="fill:#000000;stroke-width:29.9689">
|
|
||||||
<g
|
|
||||||
transform="matrix(0.08797553,0,0,-0.08797553,110.05744,434.06317)"
|
|
||||||
id="g377"
|
|
||||||
style="fill:#000000;stroke-width:34.0649">
|
|
||||||
<path
|
|
||||||
d="M 3122.6,4604.2 C 2231.7,4380.5 1476.5,4187.4 1444,4174 c -68.8,-28.7 -114.7,-107.1 -114.7,-193.1 0,-42.1 19.1,-76.5 63.1,-120.4 l 61.2,-61.2 554.4,-63.1 c 305.9,-34.4 1152.8,-128.1 1883.1,-210.3 l 1328.7,-149.1 1508.4,380.5 c 827.8,208.4 1514.1,378.5 1523.7,378.5 9.6,0 17.2,-275.3 17.2,-636.6 V 2864.5 L 8078,2673.3 c -286.8,-284.9 -286.8,-237.1 -3.8,-804.9 191.2,-382.4 242.8,-470.3 290.6,-495.2 78.4,-40.1 158.7,-36.3 217.9,11.5 68.8,53.5 489.4,892.8 489.4,973.1 0,89.9 -40.1,147.2 -227.5,334.6 l -174,172.1 v 806.8 808.7 l -53.5,59.3 -53.5,61.2 L 6690,4807 c -1028.6,114.7 -1888.9,206.5 -1909.9,206.5 -21,-0.2 -766.6,-185.6 -1657.5,-409.3 z"
|
|
||||||
id="path367"
|
|
||||||
style="fill:#000000;stroke-width:34.0649" />
|
|
||||||
<path
|
|
||||||
d="m 6340.2,3243 -1099.3,-275.3 -1344,149.1 -1344,149.1 v -569.7 -569.7 l -103.2,-99.4 C 2260.4,1839.7 2170.6,1596.9 2157.2,1218.4 2140,816.9 2229.9,493.8 2411.5,293.1 2484,212.7 2642.7,121 2711.5,121 c 17.2,0 32.5,-15.3 32.5,-32.5 0,-63.1 191.2,-510.5 298.2,-697.8 369,-651.9 892.8,-1091.7 1491.2,-1248.4 290.6,-76.5 642.4,-76.5 933,0 728.4,191.2 1345.9,803 1693.9,1676.7 51.7,133.7 95.7,256.1 95.7,273.3 0,15.3 15.3,28.7 34.4,28.7 66.9,0 225.6,91.8 298.3,172.1 181.6,200.7 271.5,523.8 256.2,925.3 -15.3,380.5 -110.9,629 -307.8,808.7 l -80.3,70.7 -9.6,709.3 -9.6,709.3 z M 3222,2375 c 229.4,-65 602.2,-135.7 908.1,-174 137.7,-15.3 435.9,-24.8 869.9,-24.8 694,0 869.9,13.4 1328.7,97.5 216,38.2 575.5,130 686.4,172.1 34.4,13.4 36.3,3.8 22.9,-273.4 l -13.4,-286.8 49.7,-59.3 c 32.5,-40.1 76.5,-65 130,-74.6 70.7,-15.3 86,-26.8 133.8,-114.7 149.1,-277.2 135.8,-812.5 -22.9,-1036.2 -40.1,-57.4 -45.9,-57.4 -154.9,-45.9 -107.1,9.6 -114.7,7.6 -170.2,-45.9 -30.6,-32.5 -65,-95.6 -78.4,-141.5 -239,-948.3 -887.1,-1692 -1604,-1844.9 -166.3,-34.4 -443.6,-34.4 -613.7,1.9 -671,141.5 -1267.5,774.3 -1540.9,1634.6 -38.2,120.4 -78.4,244.7 -89.9,275.3 -36.3,99.4 -187.4,156.8 -281,107.1 -51.6,-28.7 -124.3,66.9 -175.9,235.2 -63.1,196.9 -61.2,560.2 1.9,739.9 61.2,174 99.4,221.8 191.2,237.1 51.6,7.6 89.9,30.6 124.3,70.7 l 49.7,59.3 -11.5,288.7 c -13.4,277.2 -13.4,286.8 22.9,273.4 19.3,-7.7 126.3,-40.2 237.2,-70.8 z"
|
|
||||||
id="path369"
|
|
||||||
style="fill:#000000;stroke-width:34.0649" />
|
|
||||||
<path
|
|
||||||
d="m 3841.4,1279.5 c -72.6,-72.7 -84.1,-147.2 -38.2,-239 44,-82.2 103.2,-97.5 391.9,-97.5 233.2,0 269.6,3.8 311.6,38.2 114.7,89.9 109,254.3 -11.5,326.9 -51.6,30.6 -97.5,36.3 -323.1,36.3 h -265.7 z"
|
|
||||||
id="path371"
|
|
||||||
style="fill:#000000;stroke-width:34.0649" />
|
|
||||||
<path
|
|
||||||
d="m 5504.7,1308.2 c -68.8,-42.1 -110.9,-143.4 -91.7,-219.9 5.7,-26.8 38.2,-70.7 68.8,-97.5 53.5,-45.9 66.9,-47.8 321.2,-47.8 288.7,0 340.3,13.4 388.1,95.6 53.5,87.9 42.1,166.3 -32.5,240.9 l -65,65 h -263.8 c -227.6,0 -273.5,-5.7 -325.1,-36.3 z"
|
|
||||||
id="path373"
|
|
||||||
style="fill:#000000;stroke-width:34.0649" />
|
|
||||||
<path
|
|
||||||
d="m 2352.1,-1601.6 c -326.9,-114.7 -663.4,-242.8 -749.4,-282.9 -265.7,-128.1 -478,-281 -713.1,-518.1 C 576,-2714.3 381,-3025.9 251,-3415.9 145.9,-3735.2 122.9,-3869 111.4,-4270.5 l -11.4,-367.1 68.8,-68.8 66.9,-66.9 H 5000 9764.3 l 66.9,66.9 68.8,68.8 -11.5,367.1 c -9.6,296.3 -19.1,405.3 -57.4,567.8 -128.1,535.3 -344.1,927.2 -728.4,1309.6 -233.2,233.3 -420.6,367.1 -709.3,506.6 -214.1,103.3 -1332.5,497.1 -1412.8,497.1 -36.3,0 -95.6,-42 -227.5,-166.3 -409.1,-384.3 -759,-585 -1229.3,-705.5 -183.5,-47.8 -244.7,-53.5 -504.7,-55.4 -424.4,0 -674.9,57.4 -1061.1,248.5 -242.8,120.5 -462.7,277.2 -711.2,512.4 -151,141.5 -187.4,166.3 -239,164.4 -34.3,-1.9 -328.8,-95.6 -655.7,-210.3 z"
|
|
||||||
id="path375"
|
|
||||||
style="fill:#000000;stroke-width:34.0649" />
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
<text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.41635px;line-height:1.2;font-family:arial;-inkscape-font-specification:'arial Bold';fill:#000000;stroke-width:0.264584"
|
|
||||||
x="0.17541941"
|
|
||||||
y="3.558949"
|
|
||||||
id="text537"
|
|
||||||
transform="scale(0.94131726,1.0623411)"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan535"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:arial;-inkscape-font-specification:'arial Bold';fill:#000000;stroke-width:0.264584"
|
|
||||||
x="0.17541941"
|
|
||||||
y="3.558949">HTML</tspan></text>
|
|
||||||
<path
|
|
||||||
style="fill:none;stroke:#00ff00;stroke-width:0.6;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1)"
|
|
||||||
d="M 0.83465664,4.1090786 0.80255444,6.7735594 H 3.788057"
|
|
||||||
id="path643" />
|
|
||||||
<path
|
|
||||||
style="fill:none;stroke:#ff0000;stroke-width:0.665;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="M 4.3387058,6.8843952 C 11.075251,11.428376 11.075251,11.428376 11.075251,11.428376"
|
|
||||||
id="path2422" />
|
|
||||||
<path
|
|
||||||
style="fill:none;stroke:#ff0000;stroke-width:0.665;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 11.038238,6.772658 c -6.7365462,4.54398 -6.7365462,4.54398 -6.7365462,4.54398"
|
|
||||||
id="path2426" />
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 8.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.2 KiB |
24
listes.xml
Normal file
24
listes.xml
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
<!-- listes des nodes et attributs dans analyseWriter -->
|
||||||
|
<liste>
|
||||||
|
<nodesAnalyseWriter>
|
||||||
|
|
||||||
|
</nodesAnalyseWriter>
|
||||||
|
<attributsAnalyseWriter>
|
||||||
|
<evaluer pourEvaluation="false" point="false" default="false"/>
|
||||||
|
<addmenu pourEvaluation="false" point="false" default="false"/>
|
||||||
|
<poids pourEvaluation="true" point="true" default="0.0"/>
|
||||||
|
<saut pourEvaluation="false" point="false" default="false"/>
|
||||||
|
<titre pourEvaluation="false" point="false" default=""/>
|
||||||
|
<titre1 pourEvaluation="false" point="false" default=""/>
|
||||||
|
<titre2 pourEvaluation="false" point="false" default=""/>
|
||||||
|
<titre3 pourEvaluation="false" point="false" default=""/>
|
||||||
|
<marquenode pourEvaluation="true" point="true" default="0"/>
|
||||||
|
<information pourEvaluation="false" point="false" default="false"/>
|
||||||
|
<analyseStyle pourEvaluation="true" point="false" default="false"/>
|
||||||
|
<evalNameLegacyStyle pourEvaluation="true" point="true" default="0"/>
|
||||||
|
|
||||||
|
</attributsAnalyseWriter>
|
||||||
|
<nodesWriter>
|
||||||
|
|
||||||
|
</nodesWriter>
|
||||||
|
</liste>
|
||||||
@ -34,7 +34,7 @@ public class HTML {
|
|||||||
txt="<H2>"+ txt +"</H2>";
|
txt="<H2>"+ txt +"</H2>";
|
||||||
return txt;
|
return txt;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Titre 2
|
// Titre 2
|
||||||
public static String H2(String txt, String id) {
|
public static String H2(String txt, String id) {
|
||||||
txt=sautLigneAvantTitre(id) +"<H2>"+ txt +"</H2>";
|
txt=sautLigneAvantTitre(id) +"<H2>"+ txt +"</H2>";
|
||||||
|
|||||||
@ -125,8 +125,7 @@ public class commandes {
|
|||||||
public static int analyse_Nbre_Fichier_Student = 0;
|
public static int analyse_Nbre_Fichier_Student = 0;
|
||||||
public static int analyse_index_Fichier_Student = 0;
|
public static int analyse_index_Fichier_Student = 0;
|
||||||
public static StringBuilder message = new StringBuilder();
|
public static StringBuilder message = new StringBuilder();
|
||||||
|
|
||||||
|
|
||||||
public static void initialiseParametresSettingProprietes() {
|
public static void initialiseParametresSettingProprietes() {
|
||||||
//** setting valeur par défaut
|
//** setting valeur par défaut
|
||||||
culture = "FR";
|
culture = "FR";
|
||||||
|
|||||||
@ -11,7 +11,9 @@ import java.time.LocalDateTime;
|
|||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.time.format.FormatStyle;
|
import java.time.format.FormatStyle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.Enumeration;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
@ -211,6 +213,7 @@ public class feedbacks {
|
|||||||
fichier.append("Hash du fichier analyse : <span style=\"color:red\">"+ ouvre.getAttributs().get("hash") + "</span><br>");
|
fichier.append("Hash du fichier analyse : <span style=\"color:red\">"+ ouvre.getAttributs().get("hash") + "</span><br>");
|
||||||
fichier.append("Nom du fichier analyse : <span style=\"color:red\">"+ commandes.nameSujet + "</span><br>");
|
fichier.append("Nom du fichier analyse : <span style=\"color:red\">"+ commandes.nameSujet + "</span><br>");
|
||||||
fichier.append("Titre de l'exercice : <span style=\"color:red\">"+ ouvre.getAttributs().get("titre") + "</span><br>");
|
fichier.append("Titre de l'exercice : <span style=\"color:red\">"+ ouvre.getAttributs().get("titre") + "</span><br>");
|
||||||
|
fichier.append("Distance de Levenshtein : <span style=\"color:red\">"+ ouvre.getAttributs().get("tolerance_text") + "</span><br>");
|
||||||
|
|
||||||
if(!commandes.noNote) {
|
if(!commandes.noNote) {
|
||||||
if(!plagiat&&!copiercoller&&!pasAssezDeModification) fichier.append("Méthode : <div class=\"tooltip\"><font color=\"#0000ff\">Progression " + ouvre.getAttributs().get("progression") + "</font><span class=\"tooltiptext\">Explication<br>"+ HTML.imgProgression() +"</span></div> - Pourcentage correcte : " + nodana.retourneFirstEnfantsByName("bodyetnotation").getAttributs().get("proportioncorrect") +"<br>");
|
if(!plagiat&&!copiercoller&&!pasAssezDeModification) fichier.append("Méthode : <div class=\"tooltip\"><font color=\"#0000ff\">Progression " + ouvre.getAttributs().get("progression") + "</font><span class=\"tooltiptext\">Explication<br>"+ HTML.imgProgression() +"</span></div> - Pourcentage correcte : " + nodana.retourneFirstEnfantsByName("bodyetnotation").getAttributs().get("proportioncorrect") +"<br>");
|
||||||
@ -292,65 +295,78 @@ public class feedbacks {
|
|||||||
fichier = SyntheseTable(nodana,fichier);
|
fichier = SyntheseTable(nodana,fichier);
|
||||||
|
|
||||||
if(!commandes.noDetail) {
|
if(!commandes.noDetail) {
|
||||||
//Metadonnées
|
|
||||||
if(nodana.retourneFirstEnfantsByName("meta")!=null) if(nodana.retourneFirstEnfantsByName("meta").isClose()) {
|
|
||||||
fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("meta")));
|
|
||||||
}
|
|
||||||
|
|
||||||
//style de paragraphe
|
Enumeration<node> EnuNod = Collections.enumeration(nodana.getNodes());
|
||||||
if(nodana.retourneFirstEnfantsByName("paragraphs")!=null) if(nodana.retourneFirstEnfantsByName("paragraphs").isClose()) {
|
while(EnuNod.hasMoreElements()) {
|
||||||
fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("paragraphs")));
|
node nod = EnuNod.nextElement();
|
||||||
}
|
|
||||||
|
|
||||||
|
if(nod.isClose()) {
|
||||||
|
fichier.append(HTML.Table(nod));
|
||||||
|
}
|
||||||
|
|
||||||
|
// //Metadonnées
|
||||||
|
// if(nodana.retourneFirstEnfantsByName("meta")!=null) if(nodana.retourneFirstEnfantsByName("meta").isClose()) {
|
||||||
|
// fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("meta")));
|
||||||
|
// }
|
||||||
|
|
||||||
|
// //style de paragraphe
|
||||||
|
// if(nodana.retourneFirstEnfantsByName("paragraphs")!=null) if(nodana.retourneFirstEnfantsByName("paragraphs").isClose()) {
|
||||||
|
// fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("paragraphs")));
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// //pages
|
||||||
|
// if(nodana.retourneFirstEnfantsByName("pages")!=null) if(nodana.retourneFirstEnfantsByName("pages").isClose()) {
|
||||||
|
// fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("pages")));
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// //sequences
|
||||||
|
// if(nodana.retourneFirstEnfantsByName("sequences")!=null) if(nodana.retourneFirstEnfantsByName("sequences").isClose()) {
|
||||||
|
// fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("sequences")));
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// //numerotationchapitre
|
||||||
|
// if(nodana.retourneFirstEnfantsByName("numerotationchapitre")!=null) if(nodana.retourneFirstEnfantsByName("numerotationchapitre").isClose()) {
|
||||||
|
// fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("numerotationchapitre")));
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// //frames
|
||||||
|
// if(nodana.retourneFirstEnfantsByName("frames")!=null) if(nodana.retourneFirstEnfantsByName("frames").isClose()) {
|
||||||
|
// fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("frames")));
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// //section
|
||||||
|
// if(nodana.retourneFirstEnfantsByName("sections")!=null) if(nodana.retourneFirstEnfantsByName("sections").isClose()) {
|
||||||
|
// fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("sections")));
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// //tableau
|
||||||
|
// if(nodana.retourneFirstEnfantsByName("tableaux")!=null) if(nodana.retourneFirstEnfantsByName("tableaux").isClose()) {
|
||||||
|
// fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("tableaux")));
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// //bibliographies
|
||||||
|
// if(nodana.retourneFirstEnfantsByName("bibliographies")!=null) if(nodana.retourneFirstEnfantsByName("bibliographies").isClose()) {
|
||||||
|
// fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("bibliographies")));
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// //tablematieres
|
||||||
|
// if(nodana.retourneFirstEnfantsByName("tablematieres")!=null) if(nodana.retourneFirstEnfantsByName("tablematieres").isClose()) {
|
||||||
|
// fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("tablematieres")));
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// //tableillustrations
|
||||||
|
// if(nodana.retourneFirstEnfantsByName("tableillustrations")!=null) if(nodana.retourneFirstEnfantsByName("tableillustrations").isClose()) {
|
||||||
|
// fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("tableillustrations")));
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// //structurepage
|
||||||
|
// if(nodana.retourneFirstEnfantsByName("structurepage")!=null) if(nodana.retourneFirstEnfantsByName("structurepage").isClose()) {
|
||||||
|
// fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("structurepage")));
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
//pages
|
|
||||||
if(nodana.retourneFirstEnfantsByName("pages")!=null) if(nodana.retourneFirstEnfantsByName("pages").isClose()) {
|
|
||||||
fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("pages")));
|
|
||||||
}
|
|
||||||
|
|
||||||
//sequences
|
|
||||||
if(nodana.retourneFirstEnfantsByName("sequences")!=null) if(nodana.retourneFirstEnfantsByName("sequences").isClose()) {
|
|
||||||
fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("sequences")));
|
|
||||||
}
|
|
||||||
|
|
||||||
//numerotationchapitre
|
|
||||||
if(nodana.retourneFirstEnfantsByName("numerotationchapitre")!=null) if(nodana.retourneFirstEnfantsByName("numerotationchapitre").isClose()) {
|
|
||||||
fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("numerotationchapitre")));
|
|
||||||
}
|
|
||||||
|
|
||||||
//frames
|
|
||||||
if(nodana.retourneFirstEnfantsByName("frames")!=null) if(nodana.retourneFirstEnfantsByName("frames").isClose()) {
|
|
||||||
fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("frames")));
|
|
||||||
}
|
|
||||||
|
|
||||||
//section
|
|
||||||
if(nodana.retourneFirstEnfantsByName("sections")!=null) if(nodana.retourneFirstEnfantsByName("sections").isClose()) {
|
|
||||||
fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("sections")));
|
|
||||||
}
|
|
||||||
|
|
||||||
//tableau
|
|
||||||
if(nodana.retourneFirstEnfantsByName("tableaux")!=null) if(nodana.retourneFirstEnfantsByName("tableaux").isClose()) {
|
|
||||||
fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("tableaux")));
|
|
||||||
}
|
|
||||||
|
|
||||||
//bibliographies
|
|
||||||
if(nodana.retourneFirstEnfantsByName("bibliographies")!=null) if(nodana.retourneFirstEnfantsByName("bibliographies").isClose()) {
|
|
||||||
fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("bibliographies")));
|
|
||||||
}
|
|
||||||
|
|
||||||
//tablematieres
|
|
||||||
if(nodana.retourneFirstEnfantsByName("tablematieres")!=null) if(nodana.retourneFirstEnfantsByName("tablematieres").isClose()) {
|
|
||||||
fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("tablematieres")));
|
|
||||||
}
|
|
||||||
|
|
||||||
//tableillustrations
|
|
||||||
if(nodana.retourneFirstEnfantsByName("tableillustrations")!=null) if(nodana.retourneFirstEnfantsByName("tableillustrations").isClose()) {
|
|
||||||
fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("tableillustrations")));
|
|
||||||
}
|
|
||||||
|
|
||||||
//structurepage
|
|
||||||
if(nodana.retourneFirstEnfantsByName("structurepage")!=null) if(nodana.retourneFirstEnfantsByName("structurepage").isClose()) {
|
|
||||||
fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("structurepage")));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -140,7 +140,7 @@ public class rechercherUnNodeStudent {
|
|||||||
|
|
||||||
|
|
||||||
//*******************************************************
|
//*******************************************************
|
||||||
//** Recherche le node par l'index mais si pas demandé **
|
//** Recherche le node par l'index même si pas demandé **
|
||||||
//*******************************************************
|
//*******************************************************
|
||||||
if(nameNode.equals("table:table-row") || nameNode.equals("table:table-cell") || nameNode.equals("text:tab") || nameNode.equals("text:span")) {
|
if(nameNode.equals("table:table-row") || nameNode.equals("table:table-cell") || nameNode.equals("text:tab") || nameNode.equals("text:span")) {
|
||||||
nodStudent = findByIndexEvenIsFalse(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a);
|
nodStudent = findByIndexEvenIsFalse(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a);
|
||||||
|
|||||||
@ -1,6 +1,9 @@
|
|||||||
package evaluer;
|
package evaluer;
|
||||||
|
|
||||||
import java.text.DecimalFormat;
|
import java.text.DecimalFormat;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.Enumeration;
|
||||||
|
|
||||||
import javax.swing.JEditorPane;
|
import javax.swing.JEditorPane;
|
||||||
|
|
||||||
@ -53,6 +56,15 @@ public class analyseFichier {
|
|||||||
if(nodSujet.getAttributs().get("controleDateCreation")!=null) nodouverture.getAttributs().put("controleDateCreation", nodSujet.getAttributs().get("controleDateCreation"));
|
if(nodSujet.getAttributs().get("controleDateCreation")!=null) nodouverture.getAttributs().put("controleDateCreation", nodSujet.getAttributs().get("controleDateCreation"));
|
||||||
if(nodSujet.getAttributs().get("presenceMetaSujet")!=null) nodouverture.getAttributs().put("presenceMetaSujet", nodSujet.getAttributs().get("presenceMetaSujet"));
|
if(nodSujet.getAttributs().get("presenceMetaSujet")!=null) nodouverture.getAttributs().put("presenceMetaSujet", nodSujet.getAttributs().get("presenceMetaSujet"));
|
||||||
if(nodSujet.getAttributs().get("baremeABC")!=null) nodouverture.getAttributs().put("baremeABC", nodSujet.getAttributs().get("baremeABC"));
|
if(nodSujet.getAttributs().get("baremeABC")!=null) nodouverture.getAttributs().put("baremeABC", nodSujet.getAttributs().get("baremeABC"));
|
||||||
|
if(nodSujet.retourneEnfantsByNameExist("setting")) {
|
||||||
|
node setting = nodSujet.retourneFirstEnfantsByName("setting");
|
||||||
|
if(setting.retourneEnfantsByNameExist("text:similarity")) {
|
||||||
|
node textSimilarity = setting.retourneFirstEnfantsByName("text:similarity");
|
||||||
|
if(textSimilarity.getAttributs().get("tolerance_text")!=null) {
|
||||||
|
nodouverture.getAttributs().put("tolerance_text", textSimilarity.getAttributs().get("tolerance_text"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
nodouverture.setClose(true);
|
nodouverture.setClose(true);
|
||||||
|
|
||||||
|
|
||||||
@ -84,138 +96,152 @@ public class analyseFichier {
|
|||||||
|
|
||||||
// verification si au moins une erreur alors l'analyse est terminée
|
// verification si au moins une erreur alors l'analyse est terminée
|
||||||
if(Boolean.valueOf(erreurs.getAttributs().get("oneError"))){
|
if(Boolean.valueOf(erreurs.getAttributs().get("oneError"))){
|
||||||
return clotureNodeAnalyse(nodouverture, nodbodyetnotation, nodmenu, erreurs, nodmeta, nodpage, nodparagraph, nodsequence, nodnumerochapitre, nodframes, nodsections, nodtableaux, nodbiblio, nodtablematieres, nodtableillustrations, nodstructurepage, nodSujet.getContenu().get(0));
|
return clotureNodeAnalyse(nodouverture, nodbodyetnotation, nodmenu, erreurs, nodmeta, nodpage, nodparagraph, nodsequence, nodnumerochapitre, nodframes, nodsections, nodtableaux, nodbiblio, nodtablematieres, nodtableillustrations, nodstructurepage, nodSujet.getContenu().get(0), null);
|
||||||
}
|
}
|
||||||
|
|
||||||
// analyse Meta si evaluer=true
|
|
||||||
if(nodSujet.retourneFirstEnfantsByName("office:meta").getNomElt().equals("office:meta")) {
|
//Ordre d'affichage dans le feeback, tous les node de niveau 1
|
||||||
node nodMetaSujet = nodSujet.retourneFirstEnfantsByName("office:meta");
|
Enumeration<node> EnuNod = Collections.enumeration(nodSujet.getNodes());
|
||||||
if(nodMetaSujet.getAttributs().get("evaluer")!=null) {
|
ArrayList<String> ordre = new ArrayList<String>();
|
||||||
if(nodMetaSujet.getAttributs().get("evaluer").equals("true")) {
|
|
||||||
nodmeta = analyseLesNodesPrincipaux.analyseLesMeta(nodStudent.retourneFirstEnfantsByName("office:meta"), nodSujet.retourneFirstEnfantsByName("office:meta"), a, nodmenu);
|
while(EnuNod.hasMoreElements()) {
|
||||||
|
node nod = EnuNod.nextElement();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//Analyse Meta si evaluer=true
|
||||||
|
if(nod.getNomElt().equals("office:meta")) {
|
||||||
|
if(nod.getAttributs().get("evaluer")!=null) {
|
||||||
|
if(nod.getAttributs().get("evaluer").equals("true")) {
|
||||||
|
nodmeta = analyseLesNodesPrincipaux.analyseLesMeta(nodStudent.retourneFirstEnfantsByName("office:meta"), nod, a, nodmenu);
|
||||||
|
ordre.add("meta");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// analyse les pages (nécessaire d'avoir aussi les styles de paragraphes pour analyser les styles de page)
|
|
||||||
if(nodSujet.retourneFirstEnfantsByName("style:page").getNomElt().equals("style:page")) {
|
|
||||||
if(nodSujet.containElementByName("style:paragraph")) {
|
|
||||||
nodpage = analyseLesNodesPrincipaux.analysePage(nodStudent.retourneFirstEnfantsByName("style:page"), nodSujet.retourneFirstEnfantsByName("style:page"), a, nodmenu,nodSujet.retourneFirstEnfantsByName("style:paragraph"),nodStudent.retourneFirstEnfantsByName("style:paragraph"));
|
|
||||||
}else {
|
|
||||||
nodpage = analyseLesNodesPrincipaux.analysePage(nodStudent.retourneFirstEnfantsByName("style:page"), nodSujet.retourneFirstEnfantsByName("style:page"), a, nodmenu,null,null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// analyse les paragraphes si evaluer=true
|
|
||||||
if(nodSujet.retourneFirstEnfantsByName("style:paragraph").getNomElt().equals("style:paragraph")) {
|
|
||||||
node nodParagSujet = nodSujet.retourneFirstEnfantsByName("style:paragraph");
|
|
||||||
if(nodParagSujet.getAttributs().get("evaluer")!=null) {
|
|
||||||
if(nodParagSujet.getAttributs().get("evaluer").equals("true")) {
|
|
||||||
nodparagraph = analyseLesNodesPrincipaux.analyseParagraph(nodStudent.retourneFirstEnfantsByName("style:paragraph"), nodSujet.retourneFirstEnfantsByName("style:paragraph"), a, nodmenu);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// analyse les variables de séquence si evaluer=true
|
|
||||||
if(nodSujet.retourneFirstEnfantsByName("sequences").getNomElt().equals("sequences")) {
|
|
||||||
node nodSeqSujet = nodSujet.retourneFirstEnfantsByName("sequences");
|
|
||||||
if(nodSeqSujet.getAttributs().get("evaluer")!=null) {
|
|
||||||
if(nodSeqSujet.getAttributs().get("evaluer").equals("true")) {
|
|
||||||
nodsequence = analyseLesNodesPrincipaux.analyseLesSequences(nodStudent.retourneFirstEnfantsByName("sequences"), nodSujet.retourneFirstEnfantsByName("sequences"), a, nodmenu);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// analyse de la numérotation des chapitres si evaluer=true
|
|
||||||
if(nodSujet.retourneFirstEnfantsByName("numerotationchapitre").getNomElt().equals("numerotationchapitre")) {
|
|
||||||
node nodChapSujet = nodSujet.retourneFirstEnfantsByName("numerotationchapitre");
|
|
||||||
if(nodChapSujet.getAttributs().get("evaluer")!=null) {
|
|
||||||
if(nodChapSujet.getAttributs().get("evaluer").equals("true")) {
|
|
||||||
nodnumerochapitre = analyseLesNodesPrincipaux.analyseLaNumerotationChapitre(nodStudent.retourneFirstEnfantsByName("numerotationchapitre"), nodSujet.retourneFirstEnfantsByName("numerotationchapitre"), a, nodmenu);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// analyse les frames si evaluer=true
|
|
||||||
if(nodSujet.retourneFirstEnfantsByName("frames").getNomElt().equals("frames")) {
|
|
||||||
node nodFrameSujet = nodSujet.retourneFirstEnfantsByName("frames");
|
|
||||||
if(nodFrameSujet.getAttributs().get("evaluer")!=null) {
|
|
||||||
if(nodFrameSujet.getAttributs().get("evaluer").equals("true")) {
|
|
||||||
nodframes = analyseLesNodesPrincipaux.analyseLesFrames(nodStudent.retourneFirstEnfantsByName("frames"), nodSujet.retourneFirstEnfantsByName("frames"), a, nodmenu);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// analyse des sections si evaluer=true
|
|
||||||
if(nodSujet.retourneFirstEnfantsByName("sections").getNomElt().equals("sections")) {
|
|
||||||
node nodSection = nodSujet.retourneFirstEnfantsByName("sections");
|
|
||||||
if(nodSection.getAttributs().get("evaluer")!=null) {
|
|
||||||
if(nodSection.getAttributs().get("evaluer").equals("true")) {
|
|
||||||
nodsections = analyseLesNodesPrincipaux.analyseLesSections(nodStudent.retourneFirstEnfantsByName("sections"), nodSujet.retourneFirstEnfantsByName("sections"), a, nodmenu);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// analyse les tableaux si evaluer=true
|
|
||||||
if(nodSujet.retourneFirstEnfantsByName("tableaux").getNomElt().equals("tableaux")) {
|
|
||||||
node nodTableauSujet = nodSujet.retourneFirstEnfantsByName("tableaux");
|
|
||||||
if(nodTableauSujet.getAttributs().get("evaluer")!=null) {
|
|
||||||
if(nodTableauSujet.getAttributs().get("evaluer").equals("true")) {
|
|
||||||
nodtableaux = analyseLesNodesPrincipaux.analyseLesTableaux(nodStudent.retourneFirstEnfantsByName("tableaux"), nodSujet.retourneFirstEnfantsByName("tableaux"), a, nodmenu);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// analyse la bibliographie de LibreOffice si evaluer=true
|
|
||||||
if(nodSujet.retourneFirstEnfantsByName("biblio").getNomElt().equals("biblio")) {
|
|
||||||
node nodBiblioSujet = nodSujet.retourneFirstEnfantsByName("biblio");
|
|
||||||
if(nodBiblioSujet.getAttributs().get("evaluer")!=null) {
|
|
||||||
if(nodBiblioSujet.getAttributs().get("evaluer").equals("true")) {
|
|
||||||
nodbiblio = analyseLesNodesPrincipaux.analyseLaBiblio(nodStudent.retourneFirstEnfantsByName("biblio"), nodSujet.retourneFirstEnfantsByName("biblio"), a, nodmenu);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// analyse des tables des matières si evaluer=true
|
|
||||||
if(nodSujet.retourneFirstEnfantsByName("tablematieres").getNomElt().equals("tablematieres")) {
|
|
||||||
node nodTableMSujet = nodSujet.retourneFirstEnfantsByName("tablematieres");
|
|
||||||
if(nodTableMSujet.getAttributs().get("evaluer")!=null) {
|
|
||||||
if(nodTableMSujet.getAttributs().get("evaluer").equals("true")) {
|
|
||||||
nodtablematieres = analyseLesNodesPrincipaux.analyseLesTablesMatieres(nodStudent.retourneFirstEnfantsByName("tablematieres"), nodSujet.retourneFirstEnfantsByName("tablematieres"), a, nodmenu);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// analyse des tables illustrations si evaluer=true
|
|
||||||
if(nodSujet.retourneFirstEnfantsByName("tableillustrations").getNomElt().equals("tableillustrations")) {
|
|
||||||
node nodIllusSujet = nodSujet.retourneFirstEnfantsByName("tableillustrations");
|
|
||||||
if(nodIllusSujet.getAttributs().get("evaluer")!=null) {
|
|
||||||
if(nodIllusSujet.getAttributs().get("evaluer").equals("true")) {
|
|
||||||
nodtableillustrations = analyseLesNodesPrincipaux.analyseLesTablesIllustrations(nodStudent.retourneFirstEnfantsByName("tableillustrations"), nodSujet.retourneFirstEnfantsByName("tableillustrations"), a, nodmenu);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// analyse la structure du document
|
|
||||||
if(nodSujet.retourneFirstEnfantsByName("structurepage").getNomElt().equals("structurepage")) {
|
|
||||||
node nodStructSujet = nodSujet.retourneFirstEnfantsByName("structurepage");
|
|
||||||
if(nodStructSujet.getAttributs().get("evaluer")!=null) {
|
|
||||||
if(nodStructSujet.getAttributs().get("evaluer").equals("true")) {
|
|
||||||
node nodSujetParagraphs = null;
|
|
||||||
if(nodSujet.retourneFirstEnfantsByName("style:paragraph").getNomElt().equals("style:paragraph")) nodSujetParagraphs = nodSujet.retourneFirstEnfantsByName("style:paragraph");
|
|
||||||
node nodStudentParagraphs = nodStudent.retourneFirstEnfantsByName("style:paragraph");
|
|
||||||
nodstructurepage = analyseLesNodesPrincipaux.analyseStructurePage(nodStudent.retourneFirstEnfantsByName("structurepage"), nodSujet.retourneFirstEnfantsByName("structurepage"), a, nodmenu,nodSujetParagraphs, nodStudentParagraphs );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// retourne le node analyse assemblé et calcul de la note avec le barème
|
//Analyse les pages (nécessaire d'avoir aussi les styles de paragraphes pour analyser les styles de page)
|
||||||
|
if(nod.getNomElt().equals("style:page")) {
|
||||||
|
if(nod.getAttributs().get("evaluer")!=null) {
|
||||||
|
if(nod.getAttributs().get("evaluer").equals("true")) {
|
||||||
|
if(nodSujet.containElementByName("style:paragraph")) {
|
||||||
|
nodpage = analyseLesNodesPrincipaux.analysePage(nodStudent.retourneFirstEnfantsByName("style:page"), nod, a, nodmenu,nodSujet.retourneFirstEnfantsByName("style:paragraph"),nodStudent.retourneFirstEnfantsByName("style:paragraph"));
|
||||||
|
}else {
|
||||||
|
nodpage = analyseLesNodesPrincipaux.analysePage(nodStudent.retourneFirstEnfantsByName("style:page"), nod, a, nodmenu,null,null);
|
||||||
|
}
|
||||||
|
ordre.add("pages");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Analyse les styles paragraphes, caractères, listes, ...
|
||||||
|
if(nod.getNomElt().equals("style:paragraph")) {
|
||||||
|
if(nod.getAttributs().get("evaluer")!=null) {
|
||||||
|
if(nod.getAttributs().get("evaluer").equals("true")) {
|
||||||
|
nodparagraph = analyseLesNodesPrincipaux.analyseParagraph(nodStudent.retourneFirstEnfantsByName("style:paragraph"), nod, a, nodmenu);
|
||||||
|
ordre.add("paragraphs");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Analyse les variables de séquence si evaluer=true
|
||||||
|
if(nod.getNomElt().equals("sequences")) {
|
||||||
|
if(nod.getAttributs().get("evaluer")!=null) {
|
||||||
|
if(nod.getAttributs().get("evaluer").equals("true")) {
|
||||||
|
nodsequence = analyseLesNodesPrincipaux.analyseLesSequences(nodStudent.retourneFirstEnfantsByName("sequences"), nod, a, nodmenu);
|
||||||
|
ordre.add("sequences");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Analyse de la numérotation des chapitres si evaluer=true
|
||||||
|
if(nod.getNomElt().equals("numerotationchapitre")) {
|
||||||
|
if(nod.getAttributs().get("evaluer")!=null) {
|
||||||
|
if(nod.getAttributs().get("evaluer").equals("true")) {
|
||||||
|
nodnumerochapitre = analyseLesNodesPrincipaux.analyseLaNumerotationChapitre(nodStudent.retourneFirstEnfantsByName("numerotationchapitre"), nod, a, nodmenu);
|
||||||
|
ordre.add("numerotationchapitre");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Analyse les frames si evaluer=true
|
||||||
|
if(nod.getNomElt().equals("frames")) {
|
||||||
|
if(nod.getAttributs().get("evaluer")!=null) {
|
||||||
|
if(nod.getAttributs().get("evaluer").equals("true")) {
|
||||||
|
nodframes = analyseLesNodesPrincipaux.analyseLesFrames(nodStudent.retourneFirstEnfantsByName("frames"), nod, a, nodmenu);
|
||||||
|
ordre.add("frames");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Analyse des sections si evaluer=true
|
||||||
|
if(nod.getNomElt().equals("sections")) {
|
||||||
|
if(nod.getAttributs().get("evaluer")!=null) {
|
||||||
|
if(nod.getAttributs().get("evaluer").equals("true")) {
|
||||||
|
nodsections = analyseLesNodesPrincipaux.analyseLesSections(nodStudent.retourneFirstEnfantsByName("sections"), nod, a, nodmenu);
|
||||||
|
ordre.add("sections");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Analyse les tableaux si evaluer=true
|
||||||
|
if(nod.getNomElt().equals("tableaux")) {
|
||||||
|
if(nod.getAttributs().get("evaluer")!=null) {
|
||||||
|
if(nod.getAttributs().get("evaluer").equals("true")) {
|
||||||
|
nodtableaux = analyseLesNodesPrincipaux.analyseLesTableaux(nodStudent.retourneFirstEnfantsByName("tableaux"), nod, a, nodmenu);
|
||||||
|
ordre.add("tableaux");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Analyse la bibliographie de LibreOffice si evaluer=true
|
||||||
|
if(nod.getNomElt().equals("biblio")) {
|
||||||
|
if(nod.getAttributs().get("evaluer")!=null) {
|
||||||
|
if(nod.getAttributs().get("evaluer").equals("true")) {
|
||||||
|
nodbiblio = analyseLesNodesPrincipaux.analyseLaBiblio(nodStudent.retourneFirstEnfantsByName("biblio"), nod, a, nodmenu);
|
||||||
|
ordre.add("bibliographies");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Analyse des tables des matières si evaluer=true
|
||||||
|
if(nod.getNomElt().equals("tablematieres")) {
|
||||||
|
if(nod.getAttributs().get("evaluer")!=null) {
|
||||||
|
if(nod.getAttributs().get("evaluer").equals("true")) {
|
||||||
|
nodtablematieres = analyseLesNodesPrincipaux.analyseLesTablesMatieres(nodStudent.retourneFirstEnfantsByName("tablematieres"), nod, a, nodmenu);
|
||||||
|
ordre.add("tablematieres");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Analyse des tables illustrations si evaluer=true
|
||||||
|
if(nod.getNomElt().equals("tableillustrations")) {
|
||||||
|
if(nod.getAttributs().get("evaluer")!=null) {
|
||||||
|
if(nod.getAttributs().get("evaluer").equals("true")) {
|
||||||
|
nodtableillustrations = analyseLesNodesPrincipaux.analyseLesTablesIllustrations(nodStudent.retourneFirstEnfantsByName("tableillustrations"), nod, a, nodmenu);
|
||||||
|
ordre.add("tableillustrations");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Analyse la structure du document
|
||||||
|
if(nod.getNomElt().equals("structurepage")) {
|
||||||
|
if(nod.getAttributs().get("evaluer")!=null) {
|
||||||
|
if(nod.getAttributs().get("evaluer").equals("true")) {
|
||||||
|
node nodSujetParagraphs = null;
|
||||||
|
if(nodSujet.retourneFirstEnfantsByName("style:paragraph").getNomElt().equals("style:paragraph")) nodSujetParagraphs = nodSujet.retourneFirstEnfantsByName("style:paragraph");
|
||||||
|
node nodStudentParagraphs = nodStudent.retourneFirstEnfantsByName("style:paragraph");
|
||||||
|
nodstructurepage = analyseLesNodesPrincipaux.analyseStructurePage(nodStudent.retourneFirstEnfantsByName("structurepage"), nod, a, nodmenu,nodSujetParagraphs, nodStudentParagraphs );
|
||||||
|
ordre.add("structurepage");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Retourne le node analyse assemblé et calcul de la note avec le barème
|
||||||
if(nodSujet.getContenu().size()>0) {
|
if(nodSujet.getContenu().size()>0) {
|
||||||
return clotureNodeAnalyse(nodouverture, nodbodyetnotation, nodmenu, erreurs, nodmeta, nodpage, nodparagraph, nodsequence, nodnumerochapitre, nodframes, nodsections, nodtableaux, nodbiblio, nodtablematieres, nodtableillustrations, nodstructurepage,nodSujet.getContenu().get(0));
|
return clotureNodeAnalyse(nodouverture, nodbodyetnotation, nodmenu, erreurs, nodmeta, nodpage, nodparagraph, nodsequence, nodnumerochapitre, nodframes, nodsections, nodtableaux, nodbiblio, nodtablematieres, nodtableillustrations, nodstructurepage,nodSujet.getContenu().get(0), ordre);
|
||||||
}else {
|
}else {
|
||||||
return clotureNodeAnalyse(nodouverture, nodbodyetnotation, nodmenu, erreurs, nodmeta, nodpage, nodparagraph, nodsequence, nodnumerochapitre, nodframes, nodsections, nodtableaux, nodbiblio, nodtablematieres, nodtableillustrations, nodstructurepage,"");
|
return clotureNodeAnalyse(nodouverture, nodbodyetnotation, nodmenu, erreurs, nodmeta, nodpage, nodparagraph, nodsequence, nodnumerochapitre, nodframes, nodsections, nodtableaux, nodbiblio, nodtablematieres, nodtableillustrations, nodstructurepage,"", ordre);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -244,7 +270,7 @@ public class analyseFichier {
|
|||||||
*/
|
*/
|
||||||
public static node clotureNodeAnalyse(node nodouverture, node nodbodyetnotation, node nodmenu, node erreurs, node nodmeta, node nodpage,
|
public static node clotureNodeAnalyse(node nodouverture, node nodbodyetnotation, node nodmenu, node erreurs, node nodmeta, node nodpage,
|
||||||
node nodparagraph, node nodsequence, node nodnumerochapitre, node nodframes, node nodsections, node nodtableaux, node nodbiblio, node nodtablematieres,
|
node nodparagraph, node nodsequence, node nodnumerochapitre, node nodframes, node nodsections, node nodtableaux, node nodbiblio, node nodtablematieres,
|
||||||
node nodtableillustrations, node nodstructurepage, String texteCommentaire) {
|
node nodtableillustrations, node nodstructurepage, String texteCommentaire, ArrayList<String> ordre) {
|
||||||
|
|
||||||
node nodanalyse = new node();
|
node nodanalyse = new node();
|
||||||
|
|
||||||
@ -417,18 +443,31 @@ public class analyseFichier {
|
|||||||
nodanalyse.ajouteEnfant(nodmenu);
|
nodanalyse.ajouteEnfant(nodmenu);
|
||||||
nodanalyse.ajouteEnfant(erreurs);
|
nodanalyse.ajouteEnfant(erreurs);
|
||||||
|
|
||||||
nodanalyse.ajouteEnfant(nodmeta);
|
|
||||||
nodanalyse.ajouteEnfant(nodpage);
|
if(ordre!=null) {
|
||||||
nodanalyse.ajouteEnfant(nodparagraph);
|
|
||||||
nodanalyse.ajouteEnfant(nodsequence);
|
Enumeration<String> Key = Collections.enumeration(ordre);
|
||||||
nodanalyse.ajouteEnfant(nodnumerochapitre);
|
while(Key.hasMoreElements()) {
|
||||||
nodanalyse.ajouteEnfant(nodframes);
|
String K = Key.nextElement();
|
||||||
nodanalyse.ajouteEnfant(nodsections);
|
if(K.equals("meta")) if(!nodmeta.isVide()) nodanalyse.ajouteEnfant(nodmeta);
|
||||||
nodanalyse.ajouteEnfant(nodtableaux);
|
if(K.equals("pages")) if(!nodpage.isVide()) nodanalyse.ajouteEnfant(nodpage);
|
||||||
nodanalyse.ajouteEnfant(nodbiblio);
|
if(K.equals("paragraphs")) if(!nodparagraph.isVide()) nodanalyse.ajouteEnfant(nodparagraph);
|
||||||
nodanalyse.ajouteEnfant(nodtablematieres);
|
if(K.equals("sequences")) if(!nodsequence.isVide()) nodanalyse.ajouteEnfant(nodsequence);
|
||||||
nodanalyse.ajouteEnfant(nodtableillustrations);
|
if(K.equals("numerotationchapitre")) if(!nodnumerochapitre.isVide()) nodanalyse.ajouteEnfant(nodnumerochapitre);
|
||||||
nodanalyse.ajouteEnfant(nodstructurepage);
|
if(K.equals("frames")) if(!nodframes.isVide()) nodanalyse.ajouteEnfant(nodframes);
|
||||||
|
if(K.equals("sections")) if(!nodsections.isVide()) nodanalyse.ajouteEnfant(nodsections);
|
||||||
|
if(K.equals("tableaux")) if(!nodtableaux.isVide()) nodanalyse.ajouteEnfant(nodtableaux);
|
||||||
|
if(K.equals("bibliographies")) if(!nodbiblio.isVide()) nodanalyse.ajouteEnfant(nodbiblio);
|
||||||
|
if(K.equals("tablematieres")) if(!nodtablematieres.isVide()) nodanalyse.ajouteEnfant(nodtablematieres);
|
||||||
|
if(K.equals("tableillustrations")) if(!nodtableillustrations.isVide()) nodanalyse.ajouteEnfant(nodtableillustrations);
|
||||||
|
if(K.equals("structurepage")) if(!nodstructurepage.isVide()) nodanalyse.ajouteEnfant(nodstructurepage);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
node nodfermeturebodyHTML = new node();
|
node nodfermeturebodyHTML = new node();
|
||||||
nodfermeturebodyHTML.setNomElt("fermeture");
|
nodfermeturebodyHTML.setNomElt("fermeture");
|
||||||
|
|||||||
@ -66,6 +66,7 @@ public class analyseLesNodesEnfants {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//***************************************************
|
//***************************************************
|
||||||
//** Recherche le node correspondant de l'étudiant **
|
//** Recherche le node correspondant de l'étudiant **
|
||||||
//***************************************************
|
//***************************************************
|
||||||
@ -97,7 +98,7 @@ public class analyseLesNodesEnfants {
|
|||||||
PourAnalyse = analyseStyle(PourAnalyse, nomDuNodePourAnalyse, nodEnfantSujet,nodStudentCorrespondantAuNodSujet, nodSujetParagraphs,nodStudentParagraphes, nodmenu, a);
|
PourAnalyse = analyseStyle(PourAnalyse, nomDuNodePourAnalyse, nodEnfantSujet,nodStudentCorrespondantAuNodSujet, nodSujetParagraphs,nodStudentParagraphes, nodmenu, a);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//************************************************************
|
//************************************************************
|
||||||
//** Analyse les nodes enfants du node enfant - Récursivité **
|
//** Analyse les nodes enfants du node enfant - Récursivité **
|
||||||
//************************************************************
|
//************************************************************
|
||||||
@ -177,7 +178,8 @@ public class analyseLesNodesEnfants {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* Permet de réaliser les nodes OU.</br>
|
||||||
|
* Retour le node ayant le meilleur résultat.</br>
|
||||||
* @param j
|
* @param j
|
||||||
* @param nodEnfantSujet
|
* @param nodEnfantSujet
|
||||||
* @param PourAnalyse
|
* @param PourAnalyse
|
||||||
|
|||||||
@ -6,6 +6,7 @@ import java.util.Enumeration;
|
|||||||
import MEPTL.meptl;
|
import MEPTL.meptl;
|
||||||
import cXML.Run;
|
import cXML.Run;
|
||||||
import cXML.node;
|
import cXML.node;
|
||||||
|
import calcul.calculNombrePointEvaluation;
|
||||||
|
|
||||||
public class analyseLesNodesPrincipaux {
|
public class analyseLesNodesPrincipaux {
|
||||||
|
|
||||||
@ -1156,29 +1157,33 @@ public class analyseLesNodesPrincipaux {
|
|||||||
//*******************************
|
//*******************************
|
||||||
node pageStudent = a.retourneFirstNodeByNameAttributValue(nodStudentS, "page", "numeroabsolue", numeroabsolue);
|
node pageStudent = a.retourneFirstNodeByNameAttributValue(nodStudentS, "page", "numeroabsolue", numeroabsolue);
|
||||||
|
|
||||||
//********************************************
|
|
||||||
//** analyse les attributs des nodes <page> **
|
|
||||||
//********************************************
|
|
||||||
page = evaluationAttribut.evalLesAttributEtContenuDuNode(pageStudent, pageSujet, page, "ana:page",pageSujet.getNomElt());
|
|
||||||
|
|
||||||
//************************************
|
if(calculNombrePointEvaluation.calculNombreDepoint(pageSujet, 0)>0) {
|
||||||
//** analyse tous les nodes enfants **
|
//********************************************
|
||||||
//************************************
|
//** analyse les attributs des nodes <page> **
|
||||||
page = analyseLesNodesEnfants.nodeNext(page, "ana:page", pageStudent, nodStudentS, null, pageSujet, nodSujetParagraphs, nodStudentParagraphs,nodmenu, a);
|
//********************************************
|
||||||
|
page = evaluationAttribut.evalLesAttributEtContenuDuNode(pageStudent, pageSujet, page, "ana:page",pageSujet.getNomElt());
|
||||||
//****************************************************************
|
|
||||||
//** Insère les attributs des points dans les node de l'analyse **
|
//************************************
|
||||||
//****************************************************************
|
//** analyse tous les nodes enfants **
|
||||||
int points = evaluation.getPointsClass()-pointDebut;
|
//************************************
|
||||||
int pointTotal = evaluation.getPointTotal()-pointTotalDebut;
|
page = analyseLesNodesEnfants.nodeNext(page, "ana:page", pageStudent, nodStudentS, null, pageSujet, nodSujetParagraphs, nodStudentParagraphs,nodmenu, a);
|
||||||
Double proportioncorrect = 0.0;
|
|
||||||
if(pointTotal>0) proportioncorrect = ( (double) points/ (double) pointTotal);
|
|
||||||
|
|
||||||
page.getAttributs().put("point", String.valueOf(points));
|
//****************************************************************
|
||||||
page.getAttributs().put("pointTotal", String.valueOf(pointTotal));
|
//** Insère les attributs des points dans les node de l'analyse **
|
||||||
page.getAttributs().put("proportioncorrect", String.valueOf(proportioncorrect));
|
//****************************************************************
|
||||||
|
int points = evaluation.getPointsClass()-pointDebut;
|
||||||
|
int pointTotal = evaluation.getPointTotal()-pointTotalDebut;
|
||||||
|
Double proportioncorrect = 0.0;
|
||||||
|
if(pointTotal>0) proportioncorrect = ( (double) points/ (double) pointTotal);
|
||||||
|
|
||||||
|
page.getAttributs().put("point", String.valueOf(points));
|
||||||
|
page.getAttributs().put("pointTotal", String.valueOf(pointTotal));
|
||||||
|
page.getAttributs().put("proportioncorrect", String.valueOf(proportioncorrect));
|
||||||
|
|
||||||
|
nodSpages.getNodes().add(page);
|
||||||
|
|
||||||
nodSpages.getNodes().add(page);
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//****************************************************************
|
//****************************************************************
|
||||||
|
|||||||
@ -4,14 +4,22 @@ import java.util.Enumeration;
|
|||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
import MEPTL.commandes;
|
||||||
import cXML.node;
|
import cXML.node;
|
||||||
import list.listeAttributsAnalyseWriter;
|
import list.listeAttributsAnalyseWriter;
|
||||||
import list.listeDesNodesEvalPlacement;
|
import list.listeDesNodesEvalPlacement;
|
||||||
|
|
||||||
public class evaluationAttribut {
|
public class evaluationAttribut {
|
||||||
|
|
||||||
|
//****************************************************************************
|
||||||
|
//****************************************************************************
|
||||||
|
//** LES DEUX POINTS D'ENTRES DES METHODES D'EVALUATION **
|
||||||
|
//****************************************************************************
|
||||||
|
//****************************************************************************
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* POINT D'ENTREE DE LA METHODE ANALYSESTYLE;</br>
|
||||||
|
* </br>
|
||||||
* Analyse tous les attributs des nodes <style:style>.<br>
|
* Analyse tous les attributs des nodes <style:style>.<br>
|
||||||
* Formatage direct des styles de paragraphe.</br>
|
* Formatage direct des styles de paragraphe.</br>
|
||||||
* Les attributs doivent contenir le code ‼.<br>
|
* Les attributs doivent contenir le code ‼.<br>
|
||||||
@ -151,6 +159,8 @@ public class evaluationAttribut {
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* POINTS ENTREES DES METHODES D'EVALUATION</br>
|
||||||
|
* </br>
|
||||||
* Analyse tous les attributs et les contenus d'un node.<br>
|
* Analyse tous les attributs et les contenus d'un node.<br>
|
||||||
* Les attributs et les contenus doivent posséder la caractère ‽ ou ‼.<br>
|
* Les attributs et les contenus doivent posséder la caractère ‽ ou ‼.<br>
|
||||||
* Ou le node doit posséder des attributs d'analyseWriter comme allContent="1", etc...</br>
|
* Ou le node doit posséder des attributs d'analyseWriter comme allContent="1", etc...</br>
|
||||||
@ -188,298 +198,409 @@ public class evaluationAttribut {
|
|||||||
// evalNameSequen, evalNamePage
|
// evalNameSequen, evalNamePage
|
||||||
if(!sujet.getAttributs().get(k).equals("0")) {
|
if(!sujet.getAttributs().get(k).equals("0")) {
|
||||||
|
|
||||||
|
//évaluation du nom du node.
|
||||||
if(k.equals("evalNameNode") && !sujet.getAttributs().get(k).equals("0")) {
|
if(k.equals("evalNameNode") && !sujet.getAttributs().get(k).equals("0")) {
|
||||||
if(nodeStudent!=null) {
|
if(nodeStudent!=null) {
|
||||||
retour = evaluNameNode(retour,nodeStudent, sujet.getNomElt(), sujet.getAttributs().get("evalNameNode"),sujet.getNomElt());
|
retour = evaluationNameNode(retour,nodeStudent, sujet.getNomElt(), sujet.getAttributs().get("evalNameNode"),sujet.getNomElt());
|
||||||
}else {
|
}else {
|
||||||
retour = evaluNameNode(retour,null, sujet.getNomElt(), sujet.getAttributs().get("evalNameNode"),sujet.getNomElt());
|
retour = evaluationNameNode(retour,null, sujet.getNomElt(), sujet.getAttributs().get("evalNameNode"),sujet.getNomElt());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//évaluation du nom du style héridé.
|
||||||
if(k.equals("evalNameLegacyStyle") && !sujet.getAttributs().get(k).equals("0")) {
|
if(k.equals("evalNameLegacyStyle") && !sujet.getAttributs().get(k).equals("0")) {
|
||||||
String nameLegacyStyleSujet = sujet.getAttributs().get("text:style-name");
|
retour = evalNameLegacyStyle(sujet,nodeStudent,retour,nameElt);
|
||||||
String point = sujet.getAttributs().get(k);
|
|
||||||
|
|
||||||
Pattern p = Pattern.compile("^P[0-9]{1,}|^T[0-9]{1,}|^L[0-9]{1,}");
|
|
||||||
|
|
||||||
if(nameLegacyStyleSujet!=null) {
|
|
||||||
Matcher m = p.matcher(nameLegacyStyleSujet);
|
|
||||||
if(m.find()) {
|
|
||||||
node fichier = sujet.racineDuNode();
|
|
||||||
node styleParagraphs = fichier.retourneFirstEnfantsByName("style:paragraph").retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nameLegacyStyleSujet);
|
|
||||||
if(styleParagraphs!=null) {
|
|
||||||
if(styleParagraphs.getAttributs().get("style:parent-style-name")!=null) {
|
|
||||||
nameLegacyStyleSujet = styleParagraphs.getAttributs().get("style:parent-style-name");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
String nameLegacyStyleStudent="";
|
|
||||||
if(nodeStudent!=null) {
|
|
||||||
nameLegacyStyleStudent = nodeStudent.getAttributs().get("text:style-name");
|
|
||||||
if(nameLegacyStyleStudent!=null) {
|
|
||||||
Matcher m = p.matcher(nameLegacyStyleStudent);
|
|
||||||
if(m.find()) {
|
|
||||||
if(nodeStudent.getAttributs().get("text:style-name")!=null) {
|
|
||||||
String nameStyle1 = nodeStudent.getAttributs().get("text:style-name");
|
|
||||||
node fichier = nodeStudent.racineDuNode();
|
|
||||||
node styleParagraphs = fichier.retourneFirstEnfantsByName("style:paragraph").retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nameStyle1);
|
|
||||||
if(styleParagraphs!=null) {
|
|
||||||
if(styleParagraphs.getAttributs().get("style:parent-style-name")!=null) {
|
|
||||||
nameLegacyStyleStudent = styleParagraphs.getAttributs().get("style:parent-style-name");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(nodeStudent!=null) {
|
|
||||||
retour = evaluNameLegacyStyle(retour,nodeStudent, sujet.getNomElt(), point, nameElt, nameLegacyStyleStudent, nameLegacyStyleSujet) ;
|
|
||||||
}else {
|
|
||||||
retour = evaluNameLegacyStyle(retour,null, sujet.getNomElt(), point, nameElt, nameLegacyStyleStudent, nameLegacyStyleSujet) ;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//évaluation du nom du créateur.
|
||||||
if(k.equals("evalNameCreator") && sujet.getNomElt().equals("dc:creator")) {
|
if(k.equals("evalNameCreator") && sujet.getNomElt().equals("dc:creator")) {
|
||||||
if(nodeStudent!=null) {
|
if(nodeStudent!=null) {
|
||||||
retour = evaluNameCreator(retour,nodeStudent, nodeStudent.getContenu().get(0), sujet.getAttributs().get("evalNameCreator"),"Editeur");
|
retour = evaluationNameCreator(retour,nodeStudent, nodeStudent.getContenu().get(0), sujet.getAttributs().get("evalNameCreator"),"Editeur");
|
||||||
}else {
|
}else {
|
||||||
retour = evaluNameCreator(retour,null, "Pas trouvé l'auteur", sujet.getAttributs().get("evalNameCreator"),"Editeur");
|
retour = evaluationNameCreator(retour,null, "Pas trouvé l'auteur", sujet.getAttributs().get("evalNameCreator"),"Editeur");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//évaluation du créateur initial
|
||||||
if(k.equals("evalNameInitialCreator") && sujet.getNomElt().equals("meta:initial-creator")) {
|
if(k.equals("evalNameInitialCreator") && sujet.getNomElt().equals("meta:initial-creator")) {
|
||||||
if(nodeStudent!=null) {
|
if(nodeStudent!=null) {
|
||||||
retour = evaluNameInitialCreator(retour,nodeStudent, nodeStudent.getContenu().get(0), sujet.getAttributs().get("evalNameInitialCreator"),"Créateur");
|
retour = evaluationNameInitialCreator(retour,nodeStudent, nodeStudent.getContenu().get(0), sujet.getAttributs().get("evalNameInitialCreator"),"Créateur");
|
||||||
}else {
|
}else {
|
||||||
retour = evaluNameInitialCreator(retour,null, "Pas trouvé le créateur", sujet.getAttributs().get("evalNameInitialCreator"),"Créateur");
|
retour = evaluationNameInitialCreator(retour,null, "Pas trouvé le créateur", sujet.getAttributs().get("evalNameInitialCreator"),"Créateur");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// evaluer la non activation de l'entête.
|
// evaluer la non activation de l'entête.
|
||||||
if(k.equals("evalEntetePasActive") && sujet.getNomElt().equals("style:header-style")) {
|
if(k.equals("evalEntetePasActive") && sujet.getNomElt().equals("style:header-style")) {
|
||||||
if(nodeStudent!=null) {
|
retour=evalEntetePasActive(sujet, nodeStudent, retour, nameElt);
|
||||||
int nbA=0;
|
|
||||||
int nbAs=0;
|
|
||||||
String reponseSujet = "oui";
|
|
||||||
String reponseStudent = "oui";
|
|
||||||
Enumeration<String> key1 = sujet.getAttributs().keys();
|
|
||||||
while(key1.hasMoreElements()) {
|
|
||||||
String k1 = key1.nextElement();
|
|
||||||
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbA++;
|
|
||||||
}
|
|
||||||
if(nbA<=0) reponseSujet = "non";
|
|
||||||
key1 = nodeStudent.getAttributs().keys();
|
|
||||||
while(key1.hasMoreElements()) {
|
|
||||||
String k1 = key1.nextElement();
|
|
||||||
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbAs++;
|
|
||||||
}
|
|
||||||
if(nbAs<=0)reponseStudent = "non";
|
|
||||||
retour = evaluEntetePasActive(retour,reponseStudent,reponseSujet,sujet.getAttributs().get("evalEntetePasActive"),"Entete");
|
|
||||||
}else {
|
|
||||||
retour = evaluEntetePasActive(retour,null, "Pas trouvé le node de l'étudiant", sujet.getAttributs().get("evalEntetePasActive"),"Entete");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// evaluer l'activation de l'entête
|
// evaluer l'activation de l'entête
|
||||||
if(k.equals("evalEnteteActive") && sujet.getNomElt().equals("style:header-style")) {
|
if(k.equals("evalEnteteActive") && sujet.getNomElt().equals("style:header-style")) {
|
||||||
if(nodeStudent!=null) {
|
retour=evalEnteteActive(sujet, nodeStudent, retour, nameElt);
|
||||||
int nbAs=0;
|
|
||||||
String reponseSujet = "oui";
|
|
||||||
String reponseStudent = "oui";
|
|
||||||
Enumeration<String> key1 = sujet.getAttributs().keys();
|
|
||||||
key1 = nodeStudent.getAttributs().keys();
|
|
||||||
while(key1.hasMoreElements()) {
|
|
||||||
String k1 = key1.nextElement();
|
|
||||||
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbAs++;
|
|
||||||
}
|
|
||||||
if(nbAs<=0)reponseStudent = "non";
|
|
||||||
retour = evaluEnteteActive(retour,reponseStudent,reponseSujet,sujet.getAttributs().get("evalEnteteActive"),"Entete");
|
|
||||||
}else {
|
|
||||||
retour = evaluEnteteActive(retour,null, "Pas trouvé le node de l'étudiant", sujet.getAttributs().get("evalEnteteActive"),"Entete");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//evaluer la non activation du pied de page.
|
//evaluer la non activation du pied de page.
|
||||||
if(k.equals("evalPiedPagePasActive") && sujet.getNomElt().equals("style:footer-style")) {
|
if(k.equals("evalPiedPagePasActive") && sujet.getNomElt().equals("style:footer-style")) {
|
||||||
if(nodeStudent!=null) {
|
retour=evalPiedDePagePasActive(sujet, nodeStudent, retour, nameElt);
|
||||||
int nbA=0;
|
|
||||||
int nbAs=0;
|
|
||||||
String reponseSujet = "oui";
|
|
||||||
String reponseStudent = "oui";
|
|
||||||
Enumeration<String> key1 = sujet.getAttributs().keys();
|
|
||||||
while(key1.hasMoreElements()) {
|
|
||||||
String k1 = key1.nextElement();
|
|
||||||
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbA++;
|
|
||||||
}
|
|
||||||
if(nbA==0) reponseSujet = "non";
|
|
||||||
key1 = nodeStudent.getAttributs().keys();
|
|
||||||
while(key1.hasMoreElements()) {
|
|
||||||
String k1 = key1.nextElement();
|
|
||||||
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbAs++;
|
|
||||||
}
|
|
||||||
if(nbAs==0)reponseStudent = "non";
|
|
||||||
retour = evaluPiedPagePasActive(retour,reponseStudent,reponseSujet , sujet.getAttributs().get("evalPiedPagePasActive"),"Pied page");
|
|
||||||
}else {
|
|
||||||
retour = evaluPiedPagePasActive(retour,null, "Pas trouvé le node de l'étudiant", sujet.getAttributs().get("evalPiedPagePasActive"),"Pied page");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// evaluer l'activation du pied de page
|
// evaluer l'activation du pied de page
|
||||||
if(k.equals("evalPiedPageActive") && sujet.getNomElt().equals("style:footer-style")) {
|
if(k.equals("evalPiedPageActive") && sujet.getNomElt().equals("style:footer-style")) {
|
||||||
if(nodeStudent!=null) {
|
retour=evalPiedDePageActive(sujet, nodeStudent, retour, nameElt);
|
||||||
int nbAs=0;
|
|
||||||
String reponseSujet = "oui";
|
|
||||||
String reponseStudent = "oui";
|
|
||||||
Enumeration<String> key1 = sujet.getAttributs().keys();
|
|
||||||
key1 = nodeStudent.getAttributs().keys();
|
|
||||||
while(key1.hasMoreElements()) {
|
|
||||||
String k1 = key1.nextElement();
|
|
||||||
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbAs++;
|
|
||||||
}
|
|
||||||
if(nbAs<=0)reponseStudent = "non";
|
|
||||||
retour = evaluPiedPageActive(retour,reponseStudent,reponseSujet , sujet.getAttributs().get("evalPiedPageActive"),"Pied page");
|
|
||||||
}else {
|
|
||||||
retour = evaluPiedPageActive(retour,null, "Pas trouvé le node de l'étudiant", sujet.getAttributs().get("evalPiedPageActive"),"Pied page");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// evaluation du nom de la séquence.
|
// evaluation du nom de la séquence.
|
||||||
if(k.equals("evalNameSequence") && sujet.getNomElt().equals("text:sequence-decl")) {
|
if(k.equals("evalNameSequence") && sujet.getNomElt().equals("text:sequence-decl")) {
|
||||||
if(nodeStudent!=null) {
|
if(nodeStudent!=null) {
|
||||||
retour = evaluNameSequence(retour,nodeStudent, sujet.getAttributs().get("text:name"), sujet.getAttributs().get("evalNameSequence"),"Séquence");
|
retour = evaluationNameSequence(retour,nodeStudent, sujet.getAttributs().get("text:name"), sujet.getAttributs().get("evalNameSequence"),"Séquence");
|
||||||
}else {
|
}else {
|
||||||
retour = evaluNameSequence(retour,null, "Pas trouvé la séquence", sujet.getAttributs().get("evalNameSequence"),"Séquence");
|
retour = evaluationNameSequence(retour,null, "Pas trouvé la séquence", sujet.getAttributs().get("evalNameSequence"),"Séquence");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// evaluation du nom de la page
|
// evaluation du nom de la page
|
||||||
if(k.equals("evalNamePage") && sujet.getNomElt().equals("page")) {
|
if(k.equals("evalNamePage") && sujet.getNomElt().equals("page")) {
|
||||||
if(nodeStudent!=null) {
|
if(nodeStudent!=null) {
|
||||||
retour = evaluNamePage(retour,nodeStudent, sujet.getAttributs().get("style:master-page-name"), sujet.getAttributs().get("evalNamePage"),"Page");
|
retour = evaluationNamePage(retour,nodeStudent, sujet.getAttributs().get("style:master-page-name"), sujet.getAttributs().get("evalNamePage"),"Page");
|
||||||
}else {
|
}else {
|
||||||
retour = evaluNamePage(retour,null, "Pas trouvé la page", sujet.getAttributs().get("evalNamePage"),"Page");
|
retour = evaluationNamePage(retour,null, "Pas trouvé la page", sujet.getAttributs().get("evalNamePage"),"Page");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// evaluation de la propriété personnalisé dans la structure du document
|
// evaluation de la propriété personnalisé dans la structure du document
|
||||||
if(k.equals("evalTextUserDefined") && sujet.getNomElt().equals("text:user-defined") && sujet.chemin().contains("structurepage")) {
|
if(k.equals("evalTextUserDefined") && sujet.getNomElt().equals("text:user-defined") && sujet.chemin().contains("structurepage")) {
|
||||||
if(nodeStudent!=null) {
|
if(nodeStudent!=null) {
|
||||||
retour = evaluTextUserDefined(retour,nodeStudent, sujet.getAttributs().get("text:name"), sujet.getAttributs().get("evalTextUserDefined"),"Propriété personnalisé");
|
retour = evaluationTextUserDefined(retour,nodeStudent, sujet.getAttributs().get("text:name"), sujet.getAttributs().get("evalTextUserDefined"),"Propriété personnalisé");
|
||||||
}else {
|
}else {
|
||||||
retour = evaluTextUserDefined(retour,null, "Pas trouvé la valeur", sujet.getAttributs().get("evalTextUserDefined"),"Propriété personnalisé");
|
retour = evaluationTextUserDefined(retour,null, "Pas trouvé la valeur", sujet.getAttributs().get("evalTextUserDefined"),"Propriété personnalisé");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// evaluation du numéro de la page.
|
// evaluation du numéro de la page.
|
||||||
if(k.equals("evalNumeroPage") && sujet.getNomElt().equals("page")) {
|
if(k.equals("evalNumeroPage") && sujet.getNomElt().equals("page")) {
|
||||||
if(nodeStudent!=null) {
|
if(nodeStudent!=null) {
|
||||||
retour = evaluNumeroPage(retour,nodeStudent, sujet.getAttributs().get("numero"), sujet.getAttributs().get("evalNumeroPage"),"numéro");
|
retour = evaluationNumeroPage(retour,nodeStudent, sujet.getAttributs().get("numero"), sujet.getAttributs().get("evalNumeroPage"),"numéro");
|
||||||
}else {
|
}else {
|
||||||
retour = evaluNumeroPage(retour,null, "Pas trouvé la page", sujet.getAttributs().get("evalNumeroPage"),"numéro");
|
retour = evaluationNumeroPage(retour,null, "Pas trouvé la page", sujet.getAttributs().get("evalNumeroPage"),"numéro");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// evaluation du numéro absolu de la page.
|
// evaluation du numéro absolu de la page.
|
||||||
if(k.equals("evalNumeroAbsoluePage") && sujet.getNomElt().equals("page")) {
|
if(k.equals("evalNumeroAbsoluePage") && sujet.getNomElt().equals("page")) {
|
||||||
if(nodeStudent!=null) {
|
if(nodeStudent!=null) {
|
||||||
retour = evaluNumeroAbsoluePage(retour,nodeStudent, sujet.getAttributs().get("numeroabsolue"), sujet.getAttributs().get("evalNumeroAbsoluePage"),"numéro absolue");
|
retour = evaluationNumeroAbsoluePage(retour,nodeStudent, sujet.getAttributs().get("numeroabsolue"), sujet.getAttributs().get("evalNumeroAbsoluePage"),"numéro absolue");
|
||||||
}else {
|
}else {
|
||||||
retour = evaluNumeroAbsoluePage(retour,null, "Pas trouvé la page", sujet.getAttributs().get("evalNumeroAbsoluePage"),"numéro absolue");
|
retour = evaluationNumeroAbsoluePage(retour,null, "Pas trouvé la page", sujet.getAttributs().get("evalNumeroAbsoluePage"),"numéro absolue");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// evaluation du placement du paragraphe
|
// evaluation du placement du paragraphe
|
||||||
if(k.equals("evalPlacement") && listeDesNodesEvalPlacement.isPlacement(sujet)) {
|
if(k.equals("evalPlacement") && listeDesNodesEvalPlacement.isPlacement(sujet)) {
|
||||||
if(nodeStudent!=null) {
|
retour=evalPlacement(sujet, nodeStudent, retour, nameElt);
|
||||||
int calcul = 0;
|
|
||||||
node nodeSujetfrereAvant = sujet.retourneLeNodeFrereAvant();
|
|
||||||
node nodeStudentfereAvant = nodeStudent.retourneLeNodeFrereAvant();
|
|
||||||
if(nodeSujetfrereAvant==null) nodeSujetfrereAvant = new node();
|
|
||||||
if(nodeStudentfereAvant==null) nodeStudentfereAvant = new node();
|
|
||||||
String A = nodeSujetfrereAvant.retourneLesContenusEnfants("");
|
|
||||||
String B = nodeStudentfereAvant.retourneLesContenusEnfants("");
|
|
||||||
if(A.isEmpty() && B.isEmpty()) calcul++;
|
|
||||||
if(!A.isEmpty() && !B.isEmpty()) if(cXML.StringSimilarity.similarity(A, B)>0.92) calcul++;
|
|
||||||
|
|
||||||
if(calcul==1) {
|
|
||||||
retour = evaluPlacement(retour,nodeStudent, sujet.retourneLesContenusEnfants(""), sujet.getAttributs().get("evalPlacement"),"Placement");
|
|
||||||
}else {
|
|
||||||
retour = evaluPlacement(retour,null, sujet.retourneLesContenusEnfants(""), sujet.getAttributs().get("evalPlacement"),"Placement");
|
|
||||||
}
|
|
||||||
}else {
|
|
||||||
node nodeSujetAvant = sujet.retourneLeNodeFrereAvant();
|
|
||||||
retour = evaluPlacement(retour,null, nodeSujetAvant.retourneLesContenusEnfants(""), sujet.getAttributs().get("evalPlacement"),"Placement");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//evaluation du dernier enfant
|
//evaluation du dernier enfant
|
||||||
if(k.equals("evalFirstChild") && listeDesNodesEvalPlacement.isPlacement(sujet)) {
|
if(k.equals("evalFirstChild") && listeDesNodesEvalPlacement.isPlacement(sujet)) {
|
||||||
if(nodeStudent!=null) {
|
if(nodeStudent!=null) {
|
||||||
String ReponseSujet = "true";
|
String ReponseSujet = "true";
|
||||||
retour = evaluDernierEnfant(retour,nodeStudent, ReponseSujet, sujet.getAttributs().get("evalFirstChild"),"FirstChild");
|
retour = evaluationDernierEnfant(retour,nodeStudent, ReponseSujet, sujet.getAttributs().get("evalFirstChild"),"FirstChild");
|
||||||
}else {
|
}else {
|
||||||
retour = evaluDernierEnfant(retour,null, "true", sujet.getAttributs().get("evalFirstChild"),"FirstChild");
|
retour = evaluationDernierEnfant(retour,null, "true", sujet.getAttributs().get("evalFirstChild"),"FirstChild");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//evaluation du premier enfant
|
//evaluation du premier enfant
|
||||||
if(k.equals("evalLastChild") && listeDesNodesEvalPlacement.isPlacement(sujet)) {
|
if(k.equals("evalLastChild") && listeDesNodesEvalPlacement.isPlacement(sujet)) {
|
||||||
if(nodeStudent!=null) {
|
if(nodeStudent!=null) {
|
||||||
String ReponseSujet = "true";
|
String ReponseSujet = "true";
|
||||||
retour = evaluPremierEnfant(retour,nodeStudent, ReponseSujet, sujet.getAttributs().get("evalLastChild"),"LastChild");
|
retour = evaluationPremierEnfant(retour,nodeStudent, ReponseSujet, sujet.getAttributs().get("evalLastChild"),"LastChild");
|
||||||
}else {
|
}else {
|
||||||
retour = evaluPremierEnfant(retour,null, "true", sujet.getAttributs().get("evalLastChild"),"LastChild");
|
retour = evaluationPremierEnfant(retour,null, "true", sujet.getAttributs().get("evalLastChild"),"LastChild");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//avec l'attribut allContent="strict1", allContent="strictSansEspace1" et allContent="environ1"
|
//allContent
|
||||||
// il faut ajouter une méthode pour ignorer la casse
|
|
||||||
if(sujet.getAttributs().get("allContent")!=null) if(!sujet.getAttributs().get("allContent").isEmpty()){
|
if(sujet.getAttributs().get("allContent")!=null) if(!sujet.getAttributs().get("allContent").isEmpty()){
|
||||||
String points ="‽0";
|
retour = allContent(sujet, nodeStudent, retour, nameElt, nameItem);
|
||||||
if(sujet.getAttributs().get("allContent").contains("strict")) points = sujet.getAttributs().get("allContent").replace("strict", "‽");
|
|
||||||
if(sujet.getAttributs().get("allContent").contains("strictSansEspace")) points = sujet.getAttributs().get("allContent").replace("strictSansEspace", "≡‽");
|
|
||||||
if(sujet.getAttributs().get("allContent").contains("environ")) points = sujet.getAttributs().get("allContent").replace("environ", "¢‽");
|
|
||||||
|
|
||||||
String testPoint = points.substring(points.indexOf("‽")+1, points.length());
|
|
||||||
boolean pasDeProblem = true;
|
|
||||||
boolean pointSupAUn = false;
|
|
||||||
|
|
||||||
try {
|
|
||||||
if(Integer.valueOf(testPoint)>=1) pointSupAUn=true;
|
|
||||||
}catch (Exception e) {
|
|
||||||
System.out.println("Dans le node " + sujet.getNomElt() + ".\nIl y a un problème avec la valeur de l'attribut allContent=\"" + sujet.getAttributs().get("allContent") + "\"");
|
|
||||||
System.out.println(e.toString());
|
|
||||||
pasDeProblem=false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(pasDeProblem && pointSupAUn) {
|
|
||||||
String allContentSujet = evaluation.withoutCodeAndPointPourRechercheContenuExact(sujet.retourneLesContenusEnfants("")) + points;
|
|
||||||
String allContentStudent = "null";
|
|
||||||
if( nodeStudent!=null) allContentStudent = nodeStudent.retourneLesContenusEnfants("");
|
|
||||||
node item = retourneNoteAvecResultatsAnalyse(nameItem,"Contenu textuel", allContentStudent, allContentSujet, nameElt);
|
|
||||||
retour.getNodes().add(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return retour;
|
return retour;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//****************************************************************************
|
||||||
|
//****************************************************************************
|
||||||
|
//** LES METHODES LORSQU'ELLES SONT LONGUES **
|
||||||
|
//****************************************************************************
|
||||||
|
//****************************************************************************
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Méthode allContent.</br>
|
||||||
|
* Evaluer le contenu textuel d'un node.</br>
|
||||||
|
* @param sujet : le node sujet.
|
||||||
|
* @param nodeStudent : le node du student.
|
||||||
|
* @param retour : le node contenant les points et les informations de l'évaluation.
|
||||||
|
* @param nameElt : le mon de l'élément évalué.
|
||||||
|
* @return le node retour
|
||||||
|
*/
|
||||||
|
private static node allContent(node sujet, node nodeStudent, node retour, String nameElt, String nameItem) {
|
||||||
|
String points ="‽0";
|
||||||
|
if(sujet.getAttributs().get("allContent").contains("strict")) points = sujet.getAttributs().get("allContent").replace("strict", "‽");
|
||||||
|
if(sujet.getAttributs().get("allContent").contains("strictSansEspace")) points = sujet.getAttributs().get("allContent").replace("strictSansEspace", "≡‽");
|
||||||
|
if(sujet.getAttributs().get("allContent").contains("environ")) points = sujet.getAttributs().get("allContent").replace("environ", "¢‽");
|
||||||
|
|
||||||
|
String testPoint = points.substring(points.indexOf("‽")+1, points.length());
|
||||||
|
boolean pasDeProblem = true;
|
||||||
|
boolean pointSupAUn = false;
|
||||||
|
|
||||||
|
try {
|
||||||
|
if(Integer.valueOf(testPoint)>=1) pointSupAUn=true;
|
||||||
|
}catch (Exception e) {
|
||||||
|
commandes.message.append("<p>** ERREUR : "+"Dans le node " + sujet.getNomElt() + ".\nIl y a un problème avec la valeur de l'attribut allContent=\"" + sujet.getAttributs().get("allContent") + "\""
|
||||||
|
+"</p>");
|
||||||
|
System.out.println("Dans le node " + sujet.getNomElt() + ".\nIl y a un problème avec la valeur de l'attribut allContent=\"" + sujet.getAttributs().get("allContent") + "\"");
|
||||||
|
System.out.println(e.toString());
|
||||||
|
pasDeProblem=false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(pasDeProblem && pointSupAUn) {
|
||||||
|
String allContentSujet = evaluation.withoutCodeAndPointPourRechercheContenuExact(sujet.retourneLesContenusEnfants("")) + points;
|
||||||
|
String allContentStudent = "null";
|
||||||
|
if( nodeStudent!=null) allContentStudent = nodeStudent.retourneLesContenusEnfants("");
|
||||||
|
node item = retourneNoteAvecResultatsAnalyse(nameItem,"Contenu textuel", allContentStudent, allContentSujet, nameElt);
|
||||||
|
retour.getNodes().add(item);
|
||||||
|
}
|
||||||
|
return retour;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Méthode evalNameLegacyStyme.</br>
|
||||||
|
* Evaluer le nom du style hérité.</br>
|
||||||
|
* @param sujet : le node sujet.
|
||||||
|
* @param nodeStudent : le node du student.
|
||||||
|
* @param retour : le node contenant les points et les informations de l'évaluation.
|
||||||
|
* @param nameElt : le mon de l'élément évalué.
|
||||||
|
* @return le node retour
|
||||||
|
*/
|
||||||
|
private static node evalNameLegacyStyle(node sujet, node nodeStudent, node retour, String nameElt) {
|
||||||
|
String nameLegacyStyleSujet = sujet.getAttributs().get("text:style-name");
|
||||||
|
String point = sujet.getAttributs().get("evalNameLegacyStyle");
|
||||||
|
|
||||||
|
Pattern p = Pattern.compile("^P[0-9]{1,}|^T[0-9]{1,}|^L[0-9]{1,}");
|
||||||
|
|
||||||
|
if(nameLegacyStyleSujet!=null) {
|
||||||
|
Matcher m = p.matcher(nameLegacyStyleSujet);
|
||||||
|
if(m.find()) {
|
||||||
|
node fichier = sujet.racineDuNode();
|
||||||
|
node styleParagraphs = fichier.retourneFirstEnfantsByName("style:paragraph").retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nameLegacyStyleSujet);
|
||||||
|
if(styleParagraphs!=null) {
|
||||||
|
if(styleParagraphs.getAttributs().get("style:parent-style-name")!=null) {
|
||||||
|
nameLegacyStyleSujet = styleParagraphs.getAttributs().get("style:parent-style-name");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
String nameLegacyStyleStudent="";
|
||||||
|
if(nodeStudent!=null) {
|
||||||
|
nameLegacyStyleStudent = nodeStudent.getAttributs().get("text:style-name");
|
||||||
|
if(nameLegacyStyleStudent!=null) {
|
||||||
|
Matcher m = p.matcher(nameLegacyStyleStudent);
|
||||||
|
if(m.find()) {
|
||||||
|
if(nodeStudent.getAttributs().get("text:style-name")!=null) {
|
||||||
|
String nameStyle1 = nodeStudent.getAttributs().get("text:style-name");
|
||||||
|
node fichier = nodeStudent.racineDuNode();
|
||||||
|
node styleParagraphs = fichier.retourneFirstEnfantsByName("style:paragraph").retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nameStyle1);
|
||||||
|
if(styleParagraphs!=null) {
|
||||||
|
if(styleParagraphs.getAttributs().get("style:parent-style-name")!=null) {
|
||||||
|
nameLegacyStyleStudent = styleParagraphs.getAttributs().get("style:parent-style-name");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(nodeStudent!=null) {
|
||||||
|
retour = evaluationNameLegacyStyle(retour,nodeStudent, sujet.getNomElt(), point, nameElt, nameLegacyStyleStudent, nameLegacyStyleSujet) ;
|
||||||
|
}else {
|
||||||
|
retour = evaluationNameLegacyStyle(retour,null, sujet.getNomElt(), point, nameElt, nameLegacyStyleStudent, nameLegacyStyleSujet) ;
|
||||||
|
}
|
||||||
|
return retour;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Méthode evalEntetePasActive.</br>
|
||||||
|
* Evaluer l'absence de node dans le node style:header-style.</br>
|
||||||
|
* @param sujet : le node sujet.
|
||||||
|
* @param nodeStudent : le node du student.
|
||||||
|
* @param retour : le node contenant les points et les informations de l'évaluation.
|
||||||
|
* @param nameElt : le mon de l'élément évalué.
|
||||||
|
* @return le node retour
|
||||||
|
*/
|
||||||
|
private static node evalEntetePasActive(node sujet, node nodeStudent, node retour, String nameElt) {
|
||||||
|
if(nodeStudent!=null) {
|
||||||
|
int nbA=0;
|
||||||
|
int nbAs=0;
|
||||||
|
String reponseSujet = "oui";
|
||||||
|
String reponseStudent = "oui";
|
||||||
|
Enumeration<String> key1 = sujet.getAttributs().keys();
|
||||||
|
while(key1.hasMoreElements()) {
|
||||||
|
String k1 = key1.nextElement();
|
||||||
|
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbA++;
|
||||||
|
}
|
||||||
|
if(nbA<=0) reponseSujet = "non";
|
||||||
|
key1 = nodeStudent.getAttributs().keys();
|
||||||
|
while(key1.hasMoreElements()) {
|
||||||
|
String k1 = key1.nextElement();
|
||||||
|
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbAs++;
|
||||||
|
}
|
||||||
|
if(nbAs<=0)reponseStudent = "non";
|
||||||
|
retour = evaluationEntetePasActive(retour,reponseStudent,reponseSujet,sujet.getAttributs().get("evalEntetePasActive"),"Entete");
|
||||||
|
}else {
|
||||||
|
retour = evaluationEntetePasActive(retour,null, "Pas trouvé le node de l'étudiant", sujet.getAttributs().get("evalEntetePasActive"),"Entete");
|
||||||
|
}
|
||||||
|
return retour;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Méthode evalEnteteActive.</br>
|
||||||
|
* Evaluer la présence de node dans style:header-style.</br>
|
||||||
|
* @param sujet : le node sujet.
|
||||||
|
* @param nodeStudent : le node du student.
|
||||||
|
* @param retour : le node contenant les points et les informations de l'évaluation.
|
||||||
|
* @param nameElt : le mon de l'élément évalué.
|
||||||
|
* @return le node retour
|
||||||
|
*/
|
||||||
|
private static node evalEnteteActive(node sujet, node nodeStudent, node retour, String nameElt) {
|
||||||
|
if(nodeStudent!=null) {
|
||||||
|
int nbAs=0;
|
||||||
|
String reponseSujet = "oui";
|
||||||
|
String reponseStudent = "oui";
|
||||||
|
Enumeration<String> key1 = sujet.getAttributs().keys();
|
||||||
|
key1 = nodeStudent.getAttributs().keys();
|
||||||
|
while(key1.hasMoreElements()) {
|
||||||
|
String k1 = key1.nextElement();
|
||||||
|
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbAs++;
|
||||||
|
}
|
||||||
|
if(nbAs<=0)reponseStudent = "non";
|
||||||
|
retour = evaluationEnteteActive(retour,reponseStudent,reponseSujet,sujet.getAttributs().get("evalEnteteActive"),"Entete");
|
||||||
|
}else {
|
||||||
|
retour = evaluationEnteteActive(retour,null, "Pas trouvé le node de l'étudiant", sujet.getAttributs().get("evalEnteteActive"),"Entete");
|
||||||
|
}
|
||||||
|
return retour;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Méthode evalPiedDePagePasActive.</br>
|
||||||
|
* Evaluer l'absence de node dans le node style:footer-style.</br>
|
||||||
|
* @param sujet : le node sujet.
|
||||||
|
* @param nodeStudent : le node du student.
|
||||||
|
* @param retour : le node contenant les points et les informations de l'évaluation.
|
||||||
|
* @param nameElt : le mon de l'élément évalué.
|
||||||
|
* @return le node retour
|
||||||
|
*/
|
||||||
|
private static node evalPiedDePagePasActive(node sujet, node nodeStudent, node retour, String nameElt) {
|
||||||
|
if(nodeStudent!=null) {
|
||||||
|
int nbA=0;
|
||||||
|
int nbAs=0;
|
||||||
|
String reponseSujet = "oui";
|
||||||
|
String reponseStudent = "oui";
|
||||||
|
Enumeration<String> key1 = sujet.getAttributs().keys();
|
||||||
|
while(key1.hasMoreElements()) {
|
||||||
|
String k1 = key1.nextElement();
|
||||||
|
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbA++;
|
||||||
|
}
|
||||||
|
if(nbA==0) reponseSujet = "non";
|
||||||
|
key1 = nodeStudent.getAttributs().keys();
|
||||||
|
while(key1.hasMoreElements()) {
|
||||||
|
String k1 = key1.nextElement();
|
||||||
|
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbAs++;
|
||||||
|
}
|
||||||
|
if(nbAs==0)reponseStudent = "non";
|
||||||
|
retour = evaluationPiedPagePasActive(retour,reponseStudent,reponseSujet , sujet.getAttributs().get("evalPiedPagePasActive"),"Pied page");
|
||||||
|
}else {
|
||||||
|
retour = evaluationPiedPagePasActive(retour,null, "Pas trouvé le node de l'étudiant", sujet.getAttributs().get("evalPiedPagePasActive"),"Pied page");
|
||||||
|
}
|
||||||
|
return retour;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Méthode evalPiedDePageActive.</br>
|
||||||
|
* Evaluer la présence de node dans le node style:header-style.</br>
|
||||||
|
* @param sujet : le node sujet.
|
||||||
|
* @param nodeStudent : le node du student.
|
||||||
|
* @param retour : le node contenant les points et les informations de l'évaluation.
|
||||||
|
* @param nameElt : le mon de l'élément évalué.
|
||||||
|
* @return le node retour
|
||||||
|
*/
|
||||||
|
private static node evalPiedDePageActive(node sujet, node nodeStudent, node retour, String nameElt) {
|
||||||
|
if(nodeStudent!=null) {
|
||||||
|
int nbAs=0;
|
||||||
|
String reponseSujet = "oui";
|
||||||
|
String reponseStudent = "oui";
|
||||||
|
Enumeration<String> key1 = sujet.getAttributs().keys();
|
||||||
|
key1 = nodeStudent.getAttributs().keys();
|
||||||
|
while(key1.hasMoreElements()) {
|
||||||
|
String k1 = key1.nextElement();
|
||||||
|
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbAs++;
|
||||||
|
}
|
||||||
|
if(nbAs<=0)reponseStudent = "non";
|
||||||
|
retour = evaluationPiedPageActive(retour,reponseStudent,reponseSujet , sujet.getAttributs().get("evalPiedPageActive"),"Pied page");
|
||||||
|
}else {
|
||||||
|
retour = evaluationPiedPageActive(retour,null, "Pas trouvé le node de l'étudiant", sujet.getAttributs().get("evalPiedPageActive"),"Pied page");
|
||||||
|
}
|
||||||
|
return retour;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Méthode Placement;</br>
|
||||||
|
* Evaluer si le node placé juste avant est le même que dans le sujet.</br>
|
||||||
|
* @param sujet : le node sujet.
|
||||||
|
* @param nodeStudent : le node du student.
|
||||||
|
* @param retour : le node contenant les points et les informations de l'évaluation.
|
||||||
|
* @param nameElt : le mon de l'élément évalué.
|
||||||
|
* @return le node retour
|
||||||
|
*/
|
||||||
|
private static node evalPlacement(node sujet,node nodeStudent, node retour, String nameElt) {
|
||||||
|
if(nodeStudent!=null) {
|
||||||
|
int calcul = 0;
|
||||||
|
node nodeSujetfrereAvant = sujet.retourneLeNodeFrereAvant();
|
||||||
|
node nodeStudentfereAvant = nodeStudent.retourneLeNodeFrereAvant();
|
||||||
|
if(nodeSujetfrereAvant==null) nodeSujetfrereAvant = new node();
|
||||||
|
if(nodeStudentfereAvant==null) nodeStudentfereAvant = new node();
|
||||||
|
String A = nodeSujetfrereAvant.retourneLesContenusEnfants("");
|
||||||
|
String B = nodeStudentfereAvant.retourneLesContenusEnfants("");
|
||||||
|
if(A.isEmpty() && B.isEmpty()) calcul++;
|
||||||
|
if(!A.isEmpty() && !B.isEmpty()) if(cXML.StringSimilarity.similarity(A, B)>0.92) calcul++;
|
||||||
|
|
||||||
|
if(calcul==1) {
|
||||||
|
retour = evaluationPlacement(retour,nodeStudent, sujet.retourneLesContenusEnfants(""), sujet.getAttributs().get("evalPlacement"),"Placement");
|
||||||
|
}else {
|
||||||
|
retour = evaluationPlacement(retour,null, sujet.retourneLesContenusEnfants(""), sujet.getAttributs().get("evalPlacement"),"Placement");
|
||||||
|
}
|
||||||
|
}else {
|
||||||
|
node nodeSujetAvant = sujet.retourneLeNodeFrereAvant();
|
||||||
|
retour = evaluationPlacement(retour,null, nodeSujetAvant.retourneLesContenusEnfants(""), sujet.getAttributs().get("evalPlacement"),"Placement");
|
||||||
|
}
|
||||||
|
return retour;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//***********************************************************************************
|
||||||
|
//***********************************************************************************
|
||||||
|
//** Les procédures suivantes sont les évaluations par comparaison avec le sujet **
|
||||||
|
//***********************************************************************************
|
||||||
|
//***********************************************************************************
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Evalue le nom du node
|
* Evaluation le nom du node.</br>
|
||||||
*
|
|
||||||
* @param retour : le node retour qui contient l'item ajouté
|
* @param retour : le node retour qui contient l'item ajouté
|
||||||
* @param nodStudent : le node Student qui peut être null
|
* @param nodStudent : le node Student qui peut être null
|
||||||
* @param nameNode : le nom du node
|
* @param nameNode : le nom du node
|
||||||
@ -487,7 +608,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt : le nom de l'élément
|
* @param nameElt : le nom de l'élément
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluNameNode(node retour, node nodStudent, String nameNode, String point, String nameElt) {
|
private static node evaluationNameNode(node retour, node nodStudent, String nameNode, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nodStudent!=null) {
|
if(nodStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse(nameNode,"name", nodStudent.getNomElt(),nameNode + "‽" +point, nameElt );
|
item = retourneNoteAvecResultatsAnalyse(nameNode,"name", nodStudent.getNomElt(),nameNode + "‽" +point, nameElt );
|
||||||
@ -511,13 +632,13 @@ public class evaluationAttribut {
|
|||||||
* @param nameStyleLegacySujet : Contenu textuel (le nom dy style hérité du sujet)
|
* @param nameStyleLegacySujet : Contenu textuel (le nom dy style hérité du sujet)
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluNameLegacyStyle(node retour,node nodStudent, String nameNode, String point, String nameElt, String nameStyleLegacyStudent, String nameStyleLegacySujet) {
|
private static node evaluationNameLegacyStyle(node retour,node nodStudent, String nameNode, String point, String nameElt, String nameStyleLegacyStudent, String nameStyleLegacySujet) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nodStudent!=null) {
|
if(nodStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse(nameNode,"style hérité", nameStyleLegacyStudent, nameStyleLegacySujet + "‽" + point, nameElt);
|
item = retourneNoteAvecResultatsAnalyse(nameNode,"style heritage", nameStyleLegacyStudent, nameStyleLegacySujet + "‽" + point, nameElt);
|
||||||
}else {
|
}else {
|
||||||
evaluation.IncrementPointTotal(Integer.valueOf(point));
|
evaluation.IncrementPointTotal(Integer.valueOf(point));
|
||||||
item = new node(nameNode, "Erreur : -"+evaluation.getPointEnJeu()+" pt", "style hérité" , "null", nameStyleLegacySujet, 2, evaluation.getPointEnJeu(),nameElt);
|
item = new node(nameNode, "Erreur : -"+evaluation.getPointEnJeu()+" pt", "style heritage" , "null", nameStyleLegacySujet, 2, evaluation.getPointEnJeu(),nameElt);
|
||||||
}
|
}
|
||||||
retour.getNodes().add(item);
|
retour.getNodes().add(item);
|
||||||
return retour;
|
return retour;
|
||||||
@ -527,7 +648,7 @@ public class evaluationAttribut {
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Si le node style:header-style ne possède pas d'attribut alors l'entete n'est pas activé.<br>
|
* Evaluation. Si le node style:header-style ne possède pas d'attribut alors l'entete n'est pas activé.<br>
|
||||||
* Le nombre d'attribut est null.
|
* Le nombre d'attribut est null.
|
||||||
* @param retour
|
* @param retour
|
||||||
* @param nodStudent
|
* @param nodStudent
|
||||||
@ -536,7 +657,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt
|
* @param nameElt
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluEntetePasActive(node retour, String nbAttributStudent, String nbAttribut, String point, String nameElt) {
|
private static node evaluationEntetePasActive(node retour, String nbAttributStudent, String nbAttribut, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nbAttributStudent!=null) {
|
if(nbAttributStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse(nbAttribut,"pas active", nbAttributStudent,nbAttribut + "‽" +point, nameElt );
|
item = retourneNoteAvecResultatsAnalyse(nbAttribut,"pas active", nbAttributStudent,nbAttribut + "‽" +point, nameElt );
|
||||||
@ -549,7 +670,7 @@ public class evaluationAttribut {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Si le node style:header-style possède des ou un attribut alors l'entete est activé.<br>
|
* Evaluation. Si le node style:header-style possède des ou un attribut alors l'entete est activé.<br>
|
||||||
* @param retour
|
* @param retour
|
||||||
* @param nbAttributStudent
|
* @param nbAttributStudent
|
||||||
* @param nbAttribut
|
* @param nbAttribut
|
||||||
@ -557,7 +678,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt
|
* @param nameElt
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluEnteteActive(node retour, String nbAttributStudent, String nbAttribut, String point, String nameElt) {
|
private static node evaluationEnteteActive(node retour, String nbAttributStudent, String nbAttribut, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nbAttributStudent!=null) {
|
if(nbAttributStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse(nbAttribut,"active", nbAttributStudent,nbAttribut + "‽" +point, nameElt );
|
item = retourneNoteAvecResultatsAnalyse(nbAttribut,"active", nbAttributStudent,nbAttribut + "‽" +point, nameElt );
|
||||||
@ -570,7 +691,7 @@ public class evaluationAttribut {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Si le node style:footer-style ne possède pas d'attribut alors l'entete n'est pas activé.<br>
|
* Evaluation. Si le node style:footer-style ne possède pas d'attribut alors l'entete n'est pas activé.<br>
|
||||||
* @param retour
|
* @param retour
|
||||||
* @param nbAttributStudent
|
* @param nbAttributStudent
|
||||||
* @param nbAttribut
|
* @param nbAttribut
|
||||||
@ -578,7 +699,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt
|
* @param nameElt
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluPiedPagePasActive(node retour, String nbAttributStudent, String nbAttribut, String point, String nameElt) {
|
private static node evaluationPiedPagePasActive(node retour, String nbAttributStudent, String nbAttribut, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nbAttributStudent!=null) {
|
if(nbAttributStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse(nbAttribut,"pas active", nbAttributStudent,nbAttribut + "‽" +point, nameElt );
|
item = retourneNoteAvecResultatsAnalyse(nbAttribut,"pas active", nbAttributStudent,nbAttribut + "‽" +point, nameElt );
|
||||||
@ -591,7 +712,7 @@ public class evaluationAttribut {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Si le node style:footer-style possède des ou un attribut alors l'entete est activé.<br>
|
* Evaluation. Si le node style:footer-style possède des ou un attribut alors l'entete est activé.<br>
|
||||||
* @param retour
|
* @param retour
|
||||||
* @param nbAttributStudent
|
* @param nbAttributStudent
|
||||||
* @param nbAttribut
|
* @param nbAttribut
|
||||||
@ -599,7 +720,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt
|
* @param nameElt
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluPiedPageActive(node retour, String nbAttributStudent, String nbAttribut, String point, String nameElt) {
|
private static node evaluationPiedPageActive(node retour, String nbAttributStudent, String nbAttribut, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nbAttributStudent!=null) {
|
if(nbAttributStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse(nbAttribut,"active", nbAttributStudent,nbAttribut + "‽" +point, nameElt );
|
item = retourneNoteAvecResultatsAnalyse(nbAttribut,"active", nbAttributStudent,nbAttribut + "‽" +point, nameElt );
|
||||||
@ -613,7 +734,7 @@ public class evaluationAttribut {
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Evalue le champ auteur (éditeur).
|
* Evaluation le champ auteur (éditeur).
|
||||||
* @param retour
|
* @param retour
|
||||||
* @param nodStudent
|
* @param nodStudent
|
||||||
* @param nameCreator
|
* @param nameCreator
|
||||||
@ -621,7 +742,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt
|
* @param nameElt
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluNameCreator(node retour, node nodStudent, String nameCreator, String point, String nameElt) {
|
private static node evaluationNameCreator(node retour, node nodStudent, String nameCreator, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nodStudent!=null) {
|
if(nodStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse(nameCreator,"name", nodStudent.getAttributs().get("creator"),nameCreator + "↑‽" +point, nameElt );
|
item = retourneNoteAvecResultatsAnalyse(nameCreator,"name", nodStudent.getAttributs().get("creator"),nameCreator + "↑‽" +point, nameElt );
|
||||||
@ -635,7 +756,7 @@ public class evaluationAttribut {
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Evalue le nom de l'auteur (créateur ou premier auteur)
|
* Evaluation le nom de l'auteur (créateur ou premier auteur).</br>
|
||||||
* @param retour
|
* @param retour
|
||||||
* @param nodStudent
|
* @param nodStudent
|
||||||
* @param nameCreator
|
* @param nameCreator
|
||||||
@ -643,7 +764,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt
|
* @param nameElt
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluNameInitialCreator(node retour, node nodStudent, String nameCreator, String point, String nameElt) {
|
private static node evaluationNameInitialCreator(node retour, node nodStudent, String nameCreator, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nodStudent!=null) {
|
if(nodStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse(nameCreator,"name", nodStudent.getContenu().get(0),nameCreator + "↑‽" +point, nameElt );
|
item = retourneNoteAvecResultatsAnalyse(nameCreator,"name", nodStudent.getContenu().get(0),nameCreator + "↑‽" +point, nameElt );
|
||||||
@ -656,7 +777,7 @@ public class evaluationAttribut {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Evalue le nom de la séquence.
|
* Evaluation du nom de la séquence.</br>
|
||||||
* @param retour
|
* @param retour
|
||||||
* @param nodStudent
|
* @param nodStudent
|
||||||
* @param nameSequence
|
* @param nameSequence
|
||||||
@ -664,7 +785,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt
|
* @param nameElt
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluNameSequence(node retour, node nodStudent, String nameSequence, String point, String nameElt) {
|
private static node evaluationNameSequence(node retour, node nodStudent, String nameSequence, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nodStudent!=null) {
|
if(nodStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse(nameSequence,"name", nodStudent.getAttributs().get("text:name"),nameSequence + "↑‽" +point, nameElt );
|
item = retourneNoteAvecResultatsAnalyse(nameSequence,"name", nodStudent.getAttributs().get("text:name"),nameSequence + "↑‽" +point, nameElt );
|
||||||
@ -677,7 +798,7 @@ public class evaluationAttribut {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* evalue le nom de la page.
|
* evaluation du nom de la page.</br>
|
||||||
* @param retour
|
* @param retour
|
||||||
* @param nodStudent
|
* @param nodStudent
|
||||||
* @param namePage
|
* @param namePage
|
||||||
@ -685,7 +806,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt
|
* @param nameElt
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluNamePage(node retour, node nodStudent, String namePage, String point, String nameElt) {
|
private static node evaluationNamePage(node retour, node nodStudent, String namePage, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nodStudent!=null) {
|
if(nodStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse(namePage,"name", nodStudent.getAttributs().get("style:master-page-name"),namePage + "↑‽" +point, nameElt );
|
item = retourneNoteAvecResultatsAnalyse(namePage,"name", nodStudent.getAttributs().get("style:master-page-name"),namePage + "↑‽" +point, nameElt );
|
||||||
@ -699,8 +820,7 @@ public class evaluationAttribut {
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Evaluer la valeur de la propriété personalisée dans la structure ("text:name") de text:user-defined.</br>
|
* Evaluation de la valeur de la propriété personalisée dans la structure ("text:name") de text:user-defined.</br>
|
||||||
* <br>
|
|
||||||
* @param retour
|
* @param retour
|
||||||
* @param nodStudent
|
* @param nodStudent
|
||||||
* @param textUserDefined
|
* @param textUserDefined
|
||||||
@ -708,7 +828,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt
|
* @param nameElt
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluTextUserDefined(node retour, node nodStudent, String textUserDefined, String point, String nameElt) {
|
private static node evaluationTextUserDefined(node retour, node nodStudent, String textUserDefined, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nodStudent!=null) {
|
if(nodStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse(textUserDefined,"valeur", nodStudent.getAttributs().get("text:name"),textUserDefined + "↑‽" +point, nameElt );
|
item = retourneNoteAvecResultatsAnalyse(textUserDefined,"valeur", nodStudent.getAttributs().get("text:name"),textUserDefined + "↑‽" +point, nameElt );
|
||||||
@ -721,7 +841,7 @@ public class evaluationAttribut {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Méthode permettant d'évaluer le numéro de la page.</br>
|
* Evaluation du numéro de la page.</br>
|
||||||
* <br>
|
* <br>
|
||||||
* @param retour
|
* @param retour
|
||||||
* @param nodStudent
|
* @param nodStudent
|
||||||
@ -730,7 +850,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt
|
* @param nameElt
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluNumeroPage(node retour, node nodStudent, String numeroPage, String point, String nameElt) {
|
private static node evaluationNumeroPage(node retour, node nodStudent, String numeroPage, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nodStudent!=null) {
|
if(nodStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse(numeroPage,"numéro", nodStudent.getAttributs().get("numero"),numeroPage + "‽" +point, nameElt );
|
item = retourneNoteAvecResultatsAnalyse(numeroPage,"numéro", nodStudent.getAttributs().get("numero"),numeroPage + "‽" +point, nameElt );
|
||||||
@ -743,7 +863,7 @@ public class evaluationAttribut {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Méthode permettant d'évaluer le numéro absolu de la page.</br>
|
* Evaluation du numéro absolu de la page.</br>
|
||||||
* <br>
|
* <br>
|
||||||
* @param retour
|
* @param retour
|
||||||
* @param nodStudent
|
* @param nodStudent
|
||||||
@ -752,7 +872,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt
|
* @param nameElt
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluNumeroAbsoluePage(node retour, node nodStudent, String numeroAbsoluePage, String point, String nameElt) {
|
private static node evaluationNumeroAbsoluePage(node retour, node nodStudent, String numeroAbsoluePage, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nodStudent!=null) {
|
if(nodStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse(numeroAbsoluePage,"numéro absolue", nodStudent.getAttributs().get("numeroabsolue"),numeroAbsoluePage + "‽" +point, nameElt );
|
item = retourneNoteAvecResultatsAnalyse(numeroAbsoluePage,"numéro absolue", nodStudent.getAttributs().get("numeroabsolue"),numeroAbsoluePage + "‽" +point, nameElt );
|
||||||
@ -766,7 +886,7 @@ public class evaluationAttribut {
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* Evaluation du placement du node par rapport au précédent.</br>
|
||||||
* @param retour
|
* @param retour
|
||||||
* @param nodStudent
|
* @param nodStudent
|
||||||
* @param contenuParagraph
|
* @param contenuParagraph
|
||||||
@ -774,7 +894,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt
|
* @param nameElt
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluPlacement(node retour, node nodStudent, String contenuParagraph, String point, String nameElt) {
|
private static node evaluationPlacement(node retour, node nodStudent, String contenuParagraph, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nodStudent!=null) {
|
if(nodStudent!=null) {
|
||||||
//compare la même valeur "contenuParagraph" pour obtenir les points mais si un voisinage du contenu.
|
//compare la même valeur "contenuParagraph" pour obtenir les points mais si un voisinage du contenu.
|
||||||
@ -788,7 +908,7 @@ public class evaluationAttribut {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* Evaluation du dernier enfant.</br>
|
||||||
* @param retour
|
* @param retour
|
||||||
* @param nodStudent
|
* @param nodStudent
|
||||||
* @param contenuParagraph
|
* @param contenuParagraph
|
||||||
@ -796,7 +916,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt
|
* @param nameElt
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluDernierEnfant(node retour, node nodStudent, String reponseSujet, String point, String nameElt) {
|
private static node evaluationDernierEnfant(node retour, node nodStudent, String reponseSujet, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nodStudent!=null) {
|
if(nodStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse("LastChild","", String.valueOf(nodStudent.isLastChildNode()),reponseSujet + "‽" +point, nameElt );
|
item = retourneNoteAvecResultatsAnalyse("LastChild","", String.valueOf(nodStudent.isLastChildNode()),reponseSujet + "‽" +point, nameElt );
|
||||||
@ -809,7 +929,7 @@ public class evaluationAttribut {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* Evaluation du premier enfant.</br>
|
||||||
* @param retour
|
* @param retour
|
||||||
* @param nodStudent
|
* @param nodStudent
|
||||||
* @param reponseSujet
|
* @param reponseSujet
|
||||||
@ -817,7 +937,7 @@ public class evaluationAttribut {
|
|||||||
* @param nameElt
|
* @param nameElt
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
private static node evaluPremierEnfant(node retour, node nodStudent, String reponseSujet, String point, String nameElt) {
|
private static node evaluationPremierEnfant(node retour, node nodStudent, String reponseSujet, String point, String nameElt) {
|
||||||
node item = null;
|
node item = null;
|
||||||
if(nodStudent!=null) {
|
if(nodStudent!=null) {
|
||||||
item = retourneNoteAvecResultatsAnalyse("FirstChild","", String.valueOf(nodStudent.isFirstChildNode()),reponseSujet + "‽" +point, nameElt );
|
item = retourneNoteAvecResultatsAnalyse("FirstChild","", String.valueOf(nodStudent.isFirstChildNode()),reponseSujet + "‽" +point, nameElt );
|
||||||
@ -830,6 +950,13 @@ public class evaluationAttribut {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//************************************************************************
|
||||||
|
//************************************************************************
|
||||||
|
//** LA COMPARISON **
|
||||||
|
//************************************************************************
|
||||||
|
//************************************************************************
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retourne le node avec les résultats de la comparaison entre les deux valeurs (étudiant et sujet).<br>
|
* Retourne le node avec les résultats de la comparaison entre les deux valeurs (étudiant et sujet).<br>
|
||||||
* <br>
|
* <br>
|
||||||
@ -850,5 +977,7 @@ public class evaluationAttribut {
|
|||||||
node item = new node(nameNode, Tst, property , valueStudent, valueSujet, niveau, evaluation.getPointEnJeu(),nameElt);
|
node item = new node(nameNode, Tst, property , valueStudent, valueSujet, niveau, evaluation.getPointEnJeu(),nameElt);
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -226,7 +226,7 @@ public final class create extends JFrame {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reapint l'arbre.</br>
|
* Repaint l'arbre.</br>
|
||||||
*/
|
*/
|
||||||
private void refreshTree() {
|
private void refreshTree() {
|
||||||
tree.repaint();
|
tree.repaint();
|
||||||
|
|||||||
@ -24,6 +24,7 @@ import MEPTL.ecritureSujet;
|
|||||||
import MEPTL.meptl;
|
import MEPTL.meptl;
|
||||||
import MEPTL.verificationFichierAnalyse;
|
import MEPTL.verificationFichierAnalyse;
|
||||||
import cXML.Run;
|
import cXML.Run;
|
||||||
|
import evaluer.evaluation;
|
||||||
import fenetres.evaluate;
|
import fenetres.evaluate;
|
||||||
|
|
||||||
public class actNewFichierAnalyse extends AbstractAction{
|
public class actNewFichierAnalyse extends AbstractAction{
|
||||||
@ -90,7 +91,9 @@ public class actNewFichierAnalyse extends AbstractAction{
|
|||||||
commandes.sujet.getAttributs().put("analysis_filename","sujet.xml");
|
commandes.sujet.getAttributs().put("analysis_filename","sujet.xml");
|
||||||
|
|
||||||
commandes.sujet = ecritureSujet.nodePourEcritureSujet(commandes.sujet,b,0);
|
commandes.sujet = ecritureSujet.nodePourEcritureSujet(commandes.sujet,b,0);
|
||||||
|
|
||||||
|
// chargemnt de la traduction
|
||||||
|
evaluation.chargeTraduction(Run.translation());
|
||||||
|
|
||||||
// try {
|
// try {
|
||||||
// Run.ecritureNodeEnXML(commandes.sujet , commandes.nameSujet+".xml",commandes.path,"Sujet");
|
// Run.ecritureNodeEnXML(commandes.sujet , commandes.nameSujet+".xml",commandes.path,"Sujet");
|
||||||
|
|||||||
@ -67,6 +67,9 @@ public class evaluate extends JFrame {
|
|||||||
private JLabel lblFichierCSV;
|
private JLabel lblFichierCSV;
|
||||||
private JLabel lblFichierSVG;
|
private JLabel lblFichierSVG;
|
||||||
private JLabel lblChargementFichierCSV;
|
private JLabel lblChargementFichierCSV;
|
||||||
|
private JLabel lblImageDossierEtudiant;
|
||||||
|
private JLabel lblNoFeedBack;
|
||||||
|
private JLabel lblNoDeatail;
|
||||||
private JCheckBox chckbxfichiersEtudiants;
|
private JCheckBox chckbxfichiersEtudiants;
|
||||||
private JCheckBox chckbxZipfeedback;
|
private JCheckBox chckbxZipfeedback;
|
||||||
private JCheckBox chckbxnoFeedback;
|
private JCheckBox chckbxnoFeedback;
|
||||||
@ -113,13 +116,13 @@ public class evaluate extends JFrame {
|
|||||||
contentPane.add(panelWest, BorderLayout.WEST);
|
contentPane.add(panelWest, BorderLayout.WEST);
|
||||||
panelWest.setLayout(new MigLayout("", "[24px][260px]", "[71px][71px][36px][24px][24px][24px][24px][24px][24px][36px][24px][24px][24px][24px][][]"));
|
panelWest.setLayout(new MigLayout("", "[24px][260px]", "[71px][71px][36px][24px][24px][24px][24px][24px][24px][36px][24px][24px][24px][24px][][]"));
|
||||||
|
|
||||||
ImageIcon imgDossierEtudaint = new ImageIcon(getClass().getResource("/dossieretudiantmini.png") );
|
ImageIcon imgDossierEtudiant = new ImageIcon(getClass().getResource("/dossieretudiant.png") );
|
||||||
|
|
||||||
lblFileAnalyse = new JLabel("<HTML><B><U>Fichier de l'analyse</U></B> : </HTML>");
|
lblFileAnalyse = new JLabel("<HTML><B><U>Fichier de l'analyse</U></B> : </HTML>");
|
||||||
lblFileAnalyse.setHorizontalAlignment(SwingConstants.LEFT);
|
lblFileAnalyse.setHorizontalAlignment(SwingConstants.LEFT);
|
||||||
lblFileAnalyse.setFont(new Font("Tahoma", Font.BOLD, 14));
|
lblFileAnalyse.setFont(new Font("Tahoma", Font.BOLD, 14));
|
||||||
panelWest.add(lblFileAnalyse, "cell 1 0,alignx left,aligny top");
|
panelWest.add(lblFileAnalyse, "cell 1 0,alignx left,aligny top");
|
||||||
JLabel lblImageDossierEtudiant = new JLabel(imgDossierEtudaint);
|
lblImageDossierEtudiant = new JLabel(imgDossierEtudiant);
|
||||||
panelWest.add(lblImageDossierEtudiant, "flowx,cell 0 2,alignx center,aligny center");
|
panelWest.add(lblImageDossierEtudiant, "flowx,cell 0 2,alignx center,aligny center");
|
||||||
|
|
||||||
|
|
||||||
@ -140,8 +143,10 @@ public class evaluate extends JFrame {
|
|||||||
public void stateChanged(ChangeEvent e) {
|
public void stateChanged(ChangeEvent e) {
|
||||||
if(chckbxfichiersEtudiants.isSelected()) {
|
if(chckbxfichiersEtudiants.isSelected()) {
|
||||||
commandes.fichierStudentMoodle=true;
|
commandes.fichierStudentMoodle=true;
|
||||||
|
lblImageDossierEtudiant.setIcon(new ImageIcon(getClass().getResource("/resources/fichieretudiant.png")));
|
||||||
}else {
|
}else {
|
||||||
commandes.fichierStudentMoodle=false;
|
commandes.fichierStudentMoodle=false;
|
||||||
|
lblImageDossierEtudiant.setIcon(new ImageIcon(getClass().getResource("/resources/dossieretudiant.png")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -154,19 +159,19 @@ public class evaluate extends JFrame {
|
|||||||
chckbxnoFeedback.addChangeListener(new ChangeListener() {
|
chckbxnoFeedback.addChangeListener(new ChangeListener() {
|
||||||
public void stateChanged(ChangeEvent e) {
|
public void stateChanged(ChangeEvent e) {
|
||||||
if(chckbxnoFeedback.isSelected()) {
|
if(chckbxnoFeedback.isSelected()) {
|
||||||
|
lblNoFeedBack.setIcon(new ImageIcon(getClass().getResource("/resources/nofeedbackstudent.png")));
|
||||||
commandes.sansFeeback=true;
|
commandes.sansFeeback=true;
|
||||||
}else {
|
}else {
|
||||||
|
lblNoFeedBack.setIcon(new ImageIcon(getClass().getResource("/resources/feedbackstudent.png")));
|
||||||
commandes.sansFeeback=false;
|
commandes.sansFeeback=false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ImageIcon imgDNoFeedBack = new ImageIcon(getClass().getResource("/nofeedbackmini.png") );
|
ImageIcon imgDNoFeedBack = new ImageIcon(getClass().getResource("/resources/feedbackstudent.png") );
|
||||||
JLabel lblNoFeedBack = new JLabel(imgDNoFeedBack);
|
lblNoFeedBack = new JLabel(imgDNoFeedBack);
|
||||||
panelWest.add(lblNoFeedBack, "cell 0 3");
|
panelWest.add(lblNoFeedBack, "cell 0 3");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
chckbxnoFeedback.setToolTipText("Cochez si vous ne voulez pas générer des feedbacks");
|
chckbxnoFeedback.setToolTipText("Cochez si vous ne voulez pas générer des feedbacks");
|
||||||
chckbxnoFeedback.setFont(new Font("Tahoma", Font.PLAIN, 12));
|
chckbxnoFeedback.setFont(new Font("Tahoma", Font.PLAIN, 12));
|
||||||
panelWest.add(chckbxnoFeedback, "cell 1 3,growx,aligny top");
|
panelWest.add(chckbxnoFeedback, "cell 1 3,growx,aligny top");
|
||||||
@ -177,15 +182,17 @@ public class evaluate extends JFrame {
|
|||||||
chckbxNoDetail.addChangeListener(new ChangeListener() {
|
chckbxNoDetail.addChangeListener(new ChangeListener() {
|
||||||
public void stateChanged(ChangeEvent e) {
|
public void stateChanged(ChangeEvent e) {
|
||||||
if(chckbxNoDetail.isSelected()) {
|
if(chckbxNoDetail.isSelected()) {
|
||||||
|
lblNoDeatail.setIcon(new ImageIcon(getClass().getResource("/resources/nodetailfeedback.png")));
|
||||||
commandes.noDetail=true;
|
commandes.noDetail=true;
|
||||||
}else {
|
}else {
|
||||||
|
lblNoDeatail.setIcon(new ImageIcon(getClass().getResource("/resources/detailfeedback.png")));
|
||||||
commandes.noDetail=false;
|
commandes.noDetail=false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ImageIcon imgDNoDetail = new ImageIcon(getClass().getResource("/nodetailmini.png") );
|
ImageIcon imgDNoDetail = new ImageIcon(getClass().getResource("/resources/detailfeedback.png"));
|
||||||
JLabel lblNoDeatail = new JLabel(imgDNoDetail);
|
lblNoDeatail = new JLabel(imgDNoDetail);
|
||||||
panelWest.add(lblNoDeatail, "cell 0 4");
|
panelWest.add(lblNoDeatail, "cell 0 4");
|
||||||
|
|
||||||
|
|
||||||
@ -572,6 +579,9 @@ public class evaluate extends JFrame {
|
|||||||
txtpnmessages.afficheChargementFichierAnalyse();
|
txtpnmessages.afficheChargementFichierAnalyse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
lblPath.setText("<HTML><B><U>Dossier de l'analyse</U></B> :<br>" + commandes.path.substring(commandes.path.lastIndexOf("\\")+1,commandes.path.length()) + "</HTML>");
|
lblPath.setText("<HTML><B><U>Dossier de l'analyse</U></B> :<br>" + commandes.path.substring(commandes.path.lastIndexOf("\\")+1,commandes.path.length()) + "</HTML>");
|
||||||
lblFileAnalyse.setText("<HTML><B><U>Fichier de l'analyse</U></B> :<br>" + commandes.analysis_filename + "</HTML>");
|
lblFileAnalyse.setText("<HTML><B><U>Fichier de l'analyse</U></B> :<br>" + commandes.analysis_filename + "</HTML>");
|
||||||
lblFichierSVG.setText("<HTML><B><U>Fichier SVG</U></B> :<br>" + commandes.nameSVG.substring(commandes.nameSVG.lastIndexOf("\\")+1,commandes.nameSVG.length()) + "</HTML>");
|
lblFichierSVG.setText("<HTML><B><U>Fichier SVG</U></B> :<br>" + commandes.nameSVG.substring(commandes.nameSVG.lastIndexOf("\\")+1,commandes.nameSVG.length()) + "</HTML>");
|
||||||
|
|||||||
@ -152,11 +152,7 @@ public class evaluerLesFichiersEtudiants implements Runnable{
|
|||||||
try {
|
try {
|
||||||
//Supprime l'historique des modifications
|
//Supprime l'historique des modifications
|
||||||
nod.supprimeTousLesNodesEnfantWithThisName("text:tracked-changes");
|
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
|
//Création du node de l'étudiant
|
||||||
nodStudent = meptl.LectureFichierEtudiantSousFormeDeNode(nod,a,i);
|
nodStudent = meptl.LectureFichierEtudiantSousFormeDeNode(nod,a,i);
|
||||||
} catch (IOException e1) {
|
} catch (IOException e1) {
|
||||||
|
|||||||
@ -80,7 +80,6 @@ public class listeAttributsAnalyseWriter {
|
|||||||
//Le node OU
|
//Le node OU
|
||||||
if(attribut.equals("OU")) return true;
|
if(attribut.equals("OU")) return true;
|
||||||
|
|
||||||
|
|
||||||
// if(attribut.equals("page_start:text_contenu_index")) return true;
|
// if(attribut.equals("page_start:text_contenu_index")) return true;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
BIN
src/resources/detailfeedback.png
Normal file
BIN
src/resources/detailfeedback.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
BIN
src/resources/detailfeedbackmini.png
Normal file
BIN
src/resources/detailfeedbackmini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
BIN
src/resources/dossieretudiant.png
Normal file
BIN
src/resources/dossieretudiant.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
BIN
src/resources/dossieretudiantmin.png
Normal file
BIN
src/resources/dossieretudiantmin.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
BIN
src/resources/dossieretudiantmini.png
Normal file
BIN
src/resources/dossieretudiantmini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
BIN
src/resources/feedbackstudent.png
Normal file
BIN
src/resources/feedbackstudent.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
BIN
src/resources/feedbackstudentmini.png
Normal file
BIN
src/resources/feedbackstudentmini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
BIN
src/resources/fichieretudiant.png
Normal file
BIN
src/resources/fichieretudiant.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
BIN
src/resources/fichieretudiantmini.png
Normal file
BIN
src/resources/fichieretudiantmini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
BIN
src/resources/nodetailfeedback.png
Normal file
BIN
src/resources/nodetailfeedback.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
BIN
src/resources/nodetailfeedbackmini.png
Normal file
BIN
src/resources/nodetailfeedbackmini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
BIN
src/resources/nofeedbackstudent.png
Normal file
BIN
src/resources/nofeedbackstudent.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
BIN
src/resources/nofeedbackstudentmini.png
Normal file
BIN
src/resources/nofeedbackstudentmini.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 961 B |
Loading…
Reference in New Issue
Block a user