MAJ V4.5.0

This commit is contained in:
pablo rodriguez 2024-05-19 14:43:14 +02:00
parent 6d1a864318
commit 599b4f46be
9 changed files with 793 additions and 236 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

@ -0,0 +1,478 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
inkscape:export-ydpi="48"
inkscape:export-xdpi="48"
inkscape:export-filename="afficheprogressionmini.png"
sodipodi:docname="afficheprogression.svg"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
id="svg8"
version="1.1"
viewBox="0 0 12.7 12.7"
height="48"
width="48"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
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="ArrowWideRounded"
refX="0"
refY="0"
orient="auto-start-reverse"
inkscape:stockid="Wide, rounded arrow"
markerWidth="1"
markerHeight="1"
viewBox="0 0 1 1"
inkscape:isstock="true"
inkscape:collect="always"
preserveAspectRatio="xMidYMid">
<path
style="fill:none;stroke:context-stroke;stroke-width:1;stroke-linecap:round"
d="M 3,-3 0,0 3,3"
transform="rotate(180,0.125,0)"
sodipodi:nodetypes="ccc"
id="path14" />
</marker>
<linearGradient
id="k"
gradientTransform="matrix(7.3290847,0,0,7.3272888,-782.49722,-7149.5485)"
gradientUnits="userSpaceOnUse"
x1="122.75008"
x2="111.74973"
xlink:href="#b"
y1="991.62115"
y2="977.11713" />
<linearGradient
id="b">
<stop
offset="0"
stop-color="#0369a3"
id="stop7" />
<stop
offset="1"
stop-color="#1c99e0"
id="stop9" />
</linearGradient>
<linearGradient
id="j"
gradientUnits="userSpaceOnUse"
x1="108.00134"
x2="20.001341"
y1="122"
y2="6"
gradientTransform="translate(12)">
<stop
offset="0"
stop-color="#e6e6e6"
id="stop35" />
<stop
offset="1"
stop-color="#fff"
id="stop37" />
</linearGradient>
<linearGradient
id="i"
gradientUnits="userSpaceOnUse"
x1="108.00134"
x2="20.001341"
xlink:href="#b"
y1="130"
y2="14"
gradientTransform="translate(12)" />
<linearGradient
id="h"
gradientTransform="matrix(4.4999,0,0,3.66665,-930.97741,2199.6564)"
gradientUnits="userSpaceOnUse"
x2="0"
y1="-581.63782"
y2="-578.63782">
<stop
offset="0"
stop-color="#63bbee"
id="stop29" />
<stop
offset="1"
stop-color="#aadcf7"
id="stop31" />
</linearGradient>
<linearGradient
id="g"
gradientTransform="matrix(-4.19983,0,0,3.9111,1552.9405,-4523.1636)"
gradientUnits="userSpaceOnUse"
x2="0"
xlink:href="#a"
y1="1173"
y2="1178" />
<linearGradient
id="a">
<stop
offset="0"
stop-color="#666"
id="stop2" />
<stop
offset="1"
stop-color="#333"
id="stop4" />
</linearGradient>
<linearGradient
id="f"
gradientTransform="matrix(4.19983,0,0,3.9111,-1380.9394,-4521.9436)"
gradientUnits="userSpaceOnUse"
x2="0"
xlink:href="#a"
y1="1173"
y2="1178" />
<linearGradient
id="e"
gradientTransform="matrix(1.19997,0,0,1.22222,-269.19161,858.5534)"
gradientUnits="userSpaceOnUse"
x2="0"
y1="-629.66907"
y2="-635.54944">
<stop
offset="0"
stop-color="#18a303"
id="stop22" />
<stop
offset="1"
stop-color="#106802"
id="stop24" />
</linearGradient>
<linearGradient
id="d"
gradientTransform="matrix(4.19983,0,0,3.9111,-1380.9394,-4517.0536)"
gradientUnits="userSpaceOnUse"
x2="0"
y1="1173"
y2="1178">
<stop
offset="0"
stop-color="#0369a3"
id="stop17" />
<stop
offset="1"
stop-color="#023f62"
id="stop19" />
</linearGradient>
<linearGradient
id="c"
gradientTransform="matrix(0,0.791084,-1.28,0,1511.6005,-282.0136)"
gradientUnits="userSpaceOnUse"
x1="445.69522"
x2="441.38797"
y1="1103.5776"
y2="1099.8198">
<stop
offset="0"
stop-color="#e9b913"
id="stop12" />
<stop
offset="1"
stop-color="#ff0"
id="stop14" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#b"
id="linearGradient4157"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(7.9997394,0,0,7.9977793,-859.65065,-7810.3938)"
x1="122.75008"
y1="991.62115"
x2="111.74973"
y2="977.11713" />
</defs>
<sodipodi:namedview
inkscape:window-maximized="1"
inkscape:window-y="-8"
inkscape:window-x="-8"
inkscape:window-height="1009"
inkscape:window-width="1920"
inkscape:guide-bbox="true"
showguides="true"
units="px"
showgrid="false"
inkscape:document-rotation="0"
inkscape:current-layer="layer1"
inkscape:document-units="mm"
inkscape:cy="12.873743"
inkscape:cx="32.841182"
inkscape:zoom="7.6123936"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:pagecheckerboard="0"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:snap-bbox="true"
inkscape:bbox-paths="true"
inkscape:bbox-nodes="true"
inkscape:snap-midpoints="true"
inkscape:object-paths="true"
inkscape:snap-global="false"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1">
<sodipodi:guide
id="guide14"
orientation="1,0"
position="-2.471617e-08,4.4381936"
inkscape:locked="false" />
<sodipodi:guide
position="-0.24253472,-0.26458333"
orientation="-0.71816555,0.69587229"
id="guide5772"
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"
transform="translate(-0.92013353,-0.34176359)">
<g
id="g6608"
transform="matrix(0.76215268,0,0,0.75860347,20.419626,10.683336)"
style="stroke-width:1.21708">
<g
id="g2"
transform="matrix(1.1126819,0,0,1.0689509,-1.0567243,-0.60391678)">
<path
id="path4945"
style="fill:#b3b3b3;stroke:#000000;stroke-width:0.200713;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 6.448524,4.1578515 A 2.5406649,2.4821629 0 0 0 3.9075938,6.6403872 2.5406649,2.4821629 0 0 0 6.448524,9.1224062 2.5406649,2.4821629 0 0 0 8.0241383,8.5870385 L 8.590512,9.1559961 8.958965,8.730699 8.4272144,8.1968815 A 2.5406649,2.4821629 0 0 0 8.9889372,6.6403872 2.5406649,2.4821629 0 0 0 6.448524,4.1578515 Z m 0,0.5539713 A 1.9739749,1.9285217 0 0 1 8.4220468,6.6403872 1.9739749,1.9285217 0 0 1 6.448524,8.5684348 1.9739749,1.9285217 0 0 1 4.4744842,6.6403872 1.9739749,1.9285217 0 0 1 6.448524,4.7118228 Z" />
<path
style="fill:#ff0000;stroke:none;stroke-width:0.322019px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 9.2441621,8.53155 2.9328089,2.944082 c 0.0419,0.512292 -0.280235,0.819082 -0.875635,0.903687 L 8.3690939,9.4346523 C 8.6546945,9.0611151 8.873339,8.7906209 9.2441621,8.53155 Z"
id="path5444"
sodipodi:nodetypes="ccccc" />
</g>
</g>
<g
id="g1"
transform="matrix(0.08485361,0,0,0.08631596,18.493169,0.67154427)">
<g
id="g4179"
transform="matrix(1.091506,0,0,1.091506,-5.550275,-6.6190888)"
style="stroke-width:0.916165">
<path
style="fill:url(#k);stroke-width:0.916165"
d="m 33.356573,1.223906 c -0.25037,0 -0.50072,0.011156 -0.75,0.035156 -3.66708,0.6998 -4.56576,2.2662469 -4.5,5.9980469 V 123.22586 c 4e-4,4.1875 1.81149,5.99765 6,5.99805 h 91.998057 c 4.1885,-4e-4 5.99764,-1.81055 5.99804,-5.99805 V 51.4075 c 0.048,-2.1119 -0.78004,-4.230247 -2.25,-5.748047 L 87.692523,3.5090622 c -1.51819,-1.4691999 -3.63759,-2.2988999 -5.75,-2.25 h -47.83595 c -0.24919,-0.024 -0.49962,-0.035156 -0.75,-0.035156 z"
id="path41" />
<path
d="M 34.104633,7.2239059 V 123.22391 H 126.10465 V 51.223906 L 82.104653,7.2239059 Z"
fill="url(#j)"
id="path43"
style="fill:#000080;stroke-width:0.916165" />
</g>
<path
style="fill:url(#linearGradient4157);stroke-width:1"
d="m 131.22533,55.778801 c 0.38078,0 0.7607,-0.03052 1.13694,-0.08855 4.82817,-1.546485 6.45292,-8.894004 2.73075,-12.350381 L 91.397403,-0.58243478 C 87.360856,-4.4299678 79.32347,-1.1377203 79.110793,4.4505138 V 48.372824 c 4.36e-4,3.833024 3.469037,7.316888 7.281987,7.317433 h 43.69209 c 0.37643,0.05804 0.75972,0.08855 1.14046,0.08855 z"
id="path4056" />
<text
xml:space="preserve"
style="font-size:53.1628px;line-height:1.25;font-family:'C.A. Gatintas';-inkscape-font-specification:'C.A. Gatintas';text-align:center;text-anchor:middle;fill:#ffffff;stroke-width:3.0916"
x="88.898773"
y="96.537178"
id="text3199"
transform="scale(0.90538451,1.1045031)"><tspan
sodipodi:role="line"
id="tspan3197"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:arial;-inkscape-font-specification:arial;fill:#ffffff;stroke-width:3.0916"
x="88.898773"
y="96.537178">CSV</tspan></text>
</g>
<g
id="g6"
transform="translate(9.3985307,7.983748)">
<rect
style="fill:#00ff00;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel"
id="rect4"
width="5.1373262"
height="4.7845492"
x="8.1961746"
y="5.7877703"
ry="0.9260416" />
<g
id="g23"
transform="matrix(0.04473207,0,0,0.04550297,1.4115291,3.3967797)">
<path
style="fill:#ffe6d5;stroke:none;stroke-width:2.92119;stroke-linecap:round;stroke-linejoin:bevel"
d="m 205.01263,120.83445 -10.39372,-6.8969 -5.19686,-10.98395 -3.89764,-1.53264 -1.29921,-8.429546 2.59842,-3.831611 1.55906,-1.532645 v -8.174104 l 21.30712,3.065289 19.74807,-4.087051 0.51968,8.684984 2.85827,3.831611 1.03937,5.875137 -2.07874,5.875136 -3.11811,1.53264 -3.89765,9.45131 -7.53544,5.87514 -4.15749,2.29896 z"
id="path16" />
<g
id="g22"
transform="matrix(0.10531373,0,0,0.10352952,149.66975,64.802716)"
style="fill:#0066ff;stroke-width:29.6078">
<g
transform="matrix(0.08797553,0,0,-0.08797553,124.40311,399.9922)"
id="g21"
style="fill:#0066ff;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="path17"
style="fill:#0066ff;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="path18"
style="fill:#0066ff;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="path19"
style="fill:#0066ff;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="path20"
style="fill:#0066ff;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="path21"
style="fill:#dd55ff;stroke-width:33.6545" />
</g>
</g>
</g>
</g>
<rect
style="fill:#00ff00;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel"
id="rect5"
width="5.1373262"
height="4.7845492"
x="13.99496"
y="0.5181523"
ry="0.9260416" />
<g
id="g9"
transform="matrix(0.10400523,0,0,0.10579764,-13.119096,-3.1190329)">
<path
style="fill:#ffe6d5;stroke:none;stroke-width:2.92119;stroke-linecap:round;stroke-linejoin:bevel"
d="m 205.01263,120.83445 -10.39372,-6.8969 -5.19686,-10.98395 -3.89764,-1.53264 -1.29921,-8.429546 2.59842,-3.831611 1.55906,-1.532645 v -8.174104 l 21.30712,3.065289 19.74807,-4.087051 0.51968,8.684984 2.85827,3.831611 1.03937,5.875137 -2.07874,5.875136 -3.11811,1.53264 -3.89765,9.45131 -7.53544,5.87514 -4.15749,2.29896 z"
id="path8" />
<g
id="g570"
transform="matrix(0.10531373,0,0,0.10352952,149.66975,64.802716)"
style="fill:#000000;stroke-width:29.6078">
<g
transform="matrix(0.08797553,0,0,-0.08797553,124.40311,399.9922)"
id="g568"
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="path558"
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="path560"
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="path562"
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="path564"
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="path566"
style="fill:#000000;stroke-width:33.6545" />
</g>
</g>
</g>
<g
id="g379"
transform="matrix(0.01113254,0,0,0.01113254,-13.457508,12.852851)"
style="fill:#000000;stroke-width:23.7666">
<g
transform="matrix(0.08797553,0,0,-0.08797553,110.05744,434.06317)"
id="g377"
style="fill:#000000;stroke-width:27.0149">
<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:27.0149" />
<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:27.0149" />
<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:27.0149" />
<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: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
id="g5"
transform="matrix(0.08485361,0,0,0.08631596,16.262976,-6.3747231)">
<rect
style="fill:#00ff00;stroke-width:11.6848;stroke-linecap:round;stroke-linejoin:bevel"
id="rect3"
width="60.5434"
height="55.430641"
x="89.144531"
y="-5.2591376"
ry="10.72851" />
<g
id="g3"
transform="matrix(0.32167629,0,0,0.32167629,93.380516,1.8281726)"
style="stroke-width:27.2434">
<path
style="fill:#ffffff;stroke:#ff0000;stroke-width:27.2434;stroke-linecap:round;stroke-linejoin:bevel"
d="M 14.028074,-2.2879778 147.84718,130.5412"
id="path1" />
<path
style="fill:#ffffff;stroke:#ff0000;stroke-width:27.2434;stroke-linecap:round;stroke-linejoin:bevel"
d="M 147.84718,-2.2879778 14.028074,130.5412"
id="path2" />
</g>
</g>
<g
id="path7">
<path
style="color:#000000;fill:#66ff00;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
d="m 12.220703,1.0019531 a 0.64999998,0.64999998 0 0 0 -0.46289,0.1796875 L 7.3261719,5.4375 3.9804688,4.7558594 a 0.65006498,0.65006498 0 0 0 -0.7480469,0.4375 L 0.92578125,12.302734 A 0.64999998,0.64999998 0 0 0 1.34375,13.121094 0.64999998,0.64999998 0 0 0 2.1621094,12.703125 L 4.2910156,6.1464844 7.4003906,6.7792969 A 0.65006498,0.65006498 0 0 0 7.9804687,6.6113281 L 12.658203,2.1210938 a 0.64999998,0.64999998 0 0 0 0.01758,-0.9199219 0.64999998,0.64999998 0 0 0 -0.455078,-0.1992188 z"
id="path25" />
<g
id="g15">
<path
style="color:#000000;fill:#66ff00;stroke-linecap:round;-inkscape-stroke:none;stroke:none"
d="M 7.6664233,0.72550463 C 7.3071064,0.71765579 7.0096187,1.002894 7.0023608,1.3622233 6.9956061,1.7207843 7.2805286,2.0170687 7.6390796,2.0243327 L 11.779297,2.0625 11.630534,6.1044099 c -0.0068,0.3585606 0.278168,0.6548448 0.636718,0.6621093 0.359317,0.00785 0.656805,-0.2773892 0.664063,-0.6367187 l 0.174154,-5.340738 z"
id="path24"
sodipodi:nodetypes="ccccccccc" />
</g>
</g>
<path
style="opacity:1;fill:none;stroke:#ff0000;stroke-width:1.058;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;marker-end:url(#ArrowWideRounded)"
d="M 1.5437625,12.502527 3.8511894,5.3931576 7.5305999,6.1415122 12.207816,1.6513843"
id="path3"
sodipodi:nodetypes="cccc" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 75 KiB

View File

@ -18,7 +18,15 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><defs
id="defs6"><clipPath
id="defs6"><linearGradient
id="linearGradient269"
inkscape:collect="always"><stop
style="stop-color:#007596;stop-opacity:1"
offset="0"
id="stop269" /><stop
style="stop-color:#c6dce2;stop-opacity:1;"
offset="1"
id="stop270" /></linearGradient><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath2444"><path
d="m 28000.5,8453.7 c 0.2,31 0.4,61.9 0.6,92.9 0.2,24.2 20,47.3 42.6,54.2 35.7,13.4 71.4,26.8 107.2,40.1 23.2,7.2 41.7,-5.4 41.2,-27.9 -3.4,-132.8 -6.8,-265.6 -10.2,-398.4 -1.7,-66.9 -3.4,-133.8 -5.1,-200.7 -1.3,-49.7 -2.5,-99.5 -3.8,-149.2 -0.1,-2.2 -0.1,-4.4 -0.2,-6.5 -0.6,-22.6 -17.7,-31.1 -38.1,-18.9 -33.7,26 -67.3,51.9 -100.9,77.8 -19.8,11.9 -36,39 -36.8,61.2 0,0.7 0,1.3 0,2 1.2,157.8 2.3,315.6 3.5,473.4 z"
@ -83,7 +91,15 @@
id="stop1530" /><stop
style="stop-color:#493d00;stop-opacity:1;"
offset="1"
id="stop1532" /></linearGradient></defs><sodipodi:namedview
id="stop1532" /></linearGradient><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient269"
id="linearGradient270"
x1="-3047.7795"
y1="1621.7515"
x2="-3036.8545"
y2="1623.5065"
gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
id="namedview4"
pagecolor="#ffffff"
bordercolor="#666666"
@ -92,15 +108,15 @@
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="1.1073979"
inkscape:cx="363.91617"
inkscape:cy="106.5561"
inkscape:zoom="1.4553796"
inkscape:cx="175.55557"
inkscape:cy="90.697986"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g201"
inkscape:current-layer="g4"
inkscape:snap-global="false"
showguides="true"
inkscape:guide-bbox="true"
@ -149,7 +165,7 @@
orientation="1,0"
id="guide115596"
inkscape:locked="false" /><sodipodi:guide
position="440.10738,315.44994"
position="335.99484,7.3461486"
orientation="0,-1"
id="guide39815"
inkscape:locked="false" /><inkscape:page
@ -160,7 +176,7 @@
id="page1"
margin="0"
bleed="0"
inkscape:export-filename="enregistrer_modifications.png"
inkscape:export-filename="..\..\..\..\Documents\Université d'Artois\analyseWriter - vidéo tutoriels\Applications sur Youtube et les forges\avatar et police de caractère forges et youtube\personnages enseignants.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" /></sodipodi:namedview><g
id="g8"
@ -6763,11 +6779,11 @@
id="path33"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3037.2049,1690.6198 100.6608,-140.0264 23.0187,3.5385 z"
d="m -3048.0516,1712.8498 111.5075,-162.2564 23.0187,3.5385 z"
id="path34"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3044.5255,1704.6094 56.0781,-154.016 12.6592,-2.1096 z"
d="m -3050.6719,1714.5544 62.2245,-163.961 12.6592,-2.1096 z"
id="path35"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@ -6795,7 +6811,7 @@
id="path43"
sodipodi:nodetypes="cccc" /><path
style="fill:#007596;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3037.2049,1690.6198 100.6608,-140.0264 3.0462,-1.1632 z"
d="m -3048.4131,1712.2648 110.7843,-162.8414 4.1309,0.01 z"
id="path45"
sodipodi:nodetypes="cccc" /><path
style="fill:#017595;fill-opacity:0.346642;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@ -6887,9 +6903,123 @@
style="opacity:0.5;fill:#0081a5;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3092.4124,1720.4286 17.1472,-182.7655 6.5269,3.0729 z"
id="path77"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3091.8988,1723.9579 56.0516,166.3989 18.7709,-8.5131 z"
id="path270"
sodipodi:nodetypes="cccc" /></g><g
id="g269"
style="stroke-width:0.902143"
transform="matrix(1.6818328,0,0,1.1208753,2451.3512,-595.54445)"><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3051.884,1717.7521 118.5428,188.1157 15.2087,-5.1151 z"
id="path237"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3049.3045,1722.4738 174.2903,186.2223 9.4677,-3.94 z"
id="path238"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3052.1301,1716.5628 244.714,180.8367 37.5354,6.6881 z"
id="path239"
sodipodi:nodetypes="cccc" /><path
style="opacity:1;fill:#0387ab;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3050.6366,1717.8899 315.0809,180.073 0.844,-2.1098 z"
id="path241"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3050.1895,1719.3816 335.4666,141.1271 0.844,-12.6924 z"
id="path242"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3049.8014,1717.4682 328.2244,80.8294 1.0221,-13.4985 z"
id="path243"
sodipodi:nodetypes="cccc" /><rect
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:1.79008;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke"
id="rect243"
width="5.0637345"
height="1.6879115"
x="-2932.3242"
y="-1765.8024"
transform="scale(1,-1)" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3051.9452,1715.5387 331.448,36.2549 -0.2395,-14.9004 z"
id="path245"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3050.5582,1715.65 340.7155,-17.3531 -6.4902,-42.6823 z"
id="path246"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3049.7675,1716.3006 332.1098,-4.8214 v -2.5318 z"
id="path247"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3051.4991,1715.5869 342.2496,-106.4272 1.3705,16.4683 z"
id="path249"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3050.9474,1715.6892 315.356,-142.7552 17.5375,0.4053 z"
id="path250"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3051.7185,1718.0562 281.1313,-148.2544 3.7978,-5.9076 z"
id="path251"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3050.5347,1716.357 338.7234,-117.7477 -0.2534,-12.6913 z"
id="path253"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3052.3841,1716.6767 240.3321,-149.5019 -10.9715,-6.3295 z"
id="path254"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3047.6382,1709.581 173.7982,-143.8284 3.7977,0.8442 z"
id="path255"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3048.0516,1712.8498 111.5075,-162.2564 23.0187,3.5385 z"
id="path257"
sodipodi:nodetypes="cccc" /><path
style="fill:url(#linearGradient270);fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3050.6719,1714.5544 11.2452,-162.206 30.0138,5.4954 z"
id="path258"
sodipodi:nodetypes="cccc" /><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3049.2395,1721.3974 63.9433,188.2624 20.7191,9.5253 z"
id="path259"
sodipodi:nodetypes="cccc" /><path
style="fill:#017595;fill-opacity:0.346642;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3051.6619,1719.6074 103.6411,179.5684 3.736,0.4152 z"
id="path261"
sodipodi:nodetypes="cccc" /><path
style="fill:#0387ab;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3051.3982,1719.9002 176.4441,189.6099 2.2159,-3.9072 z"
id="path262"
sodipodi:nodetypes="cccc" /><path
style="fill:#008ab0;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3051.3047,1716.5628 245.5997,181.5289 -1.4338,3.4796 z"
id="path263"
sodipodi:nodetypes="cccc" /><path
style="fill:#117895;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3050.9119,1718.2129 335.8843,140.6799 0.7686,4.1132 z"
id="path265"
sodipodi:nodetypes="cccc" /><path
style="opacity:0.61;fill:#0090b7;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3050.3205,1716.6767 221.5112,-152.4151 -7.4274,-3.4128 z"
id="path266"
sodipodi:nodetypes="cccc" /><path
style="fill:#007596;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.75"
d="m -3048.4131,1712.2648 110.7843,-162.8414 4.1309,0.01 z"
id="path267"
sodipodi:nodetypes="cccc" /><path
style="fill:#017595;fill-opacity:0.346642;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3050.8073,1720.0973 25.0803,181.9496 5.9097,3.577 z"
id="path269"
sodipodi:nodetypes="cccc" /></g></g><g
id="g182"
transform="matrix(1.7200928,0,0,1.7200928,-42.19384,-1256.4049)"><path
transform="matrix(1.7200928,0,0,1.7200928,-114.98959,-1256.6418)"><path
style="fill:#f0c8b2;fill-opacity:1;stroke:#d18f6b;stroke-width:1.725;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m -2717.7613,1591.4624 v -28.2214 l 34.7269,-53.1668 5.5901,0.2584 35.3879,51.1165 -0.448,29.5653 z"
id="path79"
@ -7228,7 +7358,7 @@
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.75px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -2345.2392,1788.0271 c -6.3141,-0.085 -13.0692,-1.2685 -19.9702,-4.04 -6.1047,0.092 -11.9923,-0.6797 -17.4346,-3.2373 -1.3335,-4.7326 -1.1856,-9.4647 -1.2466,-14.1973 l 5.48,-3.2388 c 1.18,-9.0546 5.2042,-23.7476 12.7031,-29.143 7.499,-5.3955 31.1342,-6.6197 38.609,-3.4864 7.4748,3.1333 18.195,22.8371 20.6733,33.6255 0.3004,0.2827 0.6033,0.5229 0.9052,0.7778 3.5104,2.5245 8.9114,0.7893 9.5567,-2.2719 1.6603,-10.9441 10.8698,-31.3983 18.0879,-35.0845 7.218,-3.6863 30.878,-4.2423 38.7612,0.5742 7.8833,4.8165 13.0006,19.1657 14.8579,28.106 l 5.7085,2.8183 c 0.2949,4.7238 0.7968,9.4305 -0.1772,14.25 -5.2347,2.9594 -11.0473,4.1725 -17.1417,4.5396 -6.6732,3.2824 -13.3199,4.9705 -19.6098,5.5298 -16.0738,1.4302 -29.8183,-4.5012 -35.7334,-9.9668 -1.6246,-1.5013 -1.051,-2.2471 -3.2198,-2.5928 0.5423,0.2307 1.0524,0.4353 1.6173,0.6899 -7.2023,1.3075 -11.6864,1.4845 -14.3599,0.8511 -2.3673,0.5115 -1.6325,1.2069 -3.1831,2.8726 -5.4874,5.8948 -18.7478,12.8419 -34.8838,12.624 z m -0.1347,-5.0039 c 17.8751,-0.2019 32.9424,-9.9335 34.0458,-13.648 1.5351,-5.1679 0.6946,-12.6351 -3.9228,-21.1655 -1.7451,-3.2239 -6.5634,-11.891 -16.6963,-15.6006 -6.2974,-2.3055 -18.616,-1.4425 -26.9121,1.5498 -17.3503,6.258 -19.342,37.9025 -8.1197,43.7915 7.186,3.7709 14.6104,5.1518 21.6051,5.0728 z m 86.3379,-4.3711 c 1.0956,9e-4 2.2028,-0.033 3.3178,-0.104 6.9808,-0.4469 14.2804,-2.3808 21.1626,-6.6812 10.7479,-6.7159 6.3838,-38.1214 -11.3877,-43.0576 -8.4976,-2.3602 -20.8469,-2.2948 -26.9531,0.4776 -9.8254,4.4606 -13.9783,13.4646 -15.4761,16.8105 -3.9632,8.8533 -4.241,16.3635 -2.3218,21.4014 1.2933,3.3946 15.2227,11.1396 31.6583,11.1533 z" /></g></g></g><g
id="g193"
transform="matrix(2.6400655,0,0,-2.6400655,-4285.7366,1352.2946)"><g
transform="matrix(2.6400655,0,0,-2.6400655,-4288.2955,1355.6793)"><g
transform="matrix(3.4017825,0,0,3.4017825,-95.08183,-189.09441)"
id="g183"
style="stroke-width:1.4046;stroke-miterlimit:4;stroke-dasharray:none"><rect
@ -7298,12 +7428,12 @@
id="text196"
transform="scale(1,-1)"><tspan
sodipodi:role="line"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:119.556px;font-family:Pacifico;-inkscape-font-specification:Pacifico;fill:#d40000;stroke-width:8.96672"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:119.556px;font-family:Pacifico;-inkscape-font-specification:Pacifico;fill:#0000ff;stroke-width:8.96672"
x="-4921.5103"
y="-2317.3401"
id="tspan196">Voulez vous enregistrer vos </tspan><tspan
sodipodi:role="line"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:119.556px;font-family:Pacifico;-inkscape-font-specification:Pacifico;fill:#d40000;stroke-width:8.96672"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:119.556px;font-family:Pacifico;-inkscape-font-specification:Pacifico;fill:#0000ff;stroke-width:8.96672"
x="-4921.5103"
y="-2176.7363"
id="tspan198"> modifications avant de quitter ?</tspan></text></g></g><g

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 710 B

View File

@ -26,11 +26,11 @@ import javax.swing.JScrollPane;
import javax.swing.JToolBar;
import javax.swing.KeyStroke;
import javax.swing.SwingConstants;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.filechooser.FileNameExtensionFilter;
import MEPTL.commandes;
import MEPTL.meptl;
@ -68,8 +68,6 @@ public class evaluate extends JFrame {
private JPanel contentPane;
private static JLabel lblPath;
private static JLabel lblFileAnalyse;
// private static JLabel lblFichierCSV;
private static JLabel lblFichierSVG;
private static JLabel lblChargementFichierCSV;
private static JLabel lblImageDossierEtudiant;
private static JLabel lblNoFeedBack;
@ -77,7 +75,6 @@ public class evaluate extends JFrame {
private static JLabel lblnonote;
private static JLabel lblnozip;
private static JLabel lblVerifHistorique;
private static JLabel lblnologo;
private static JLabel lblCsvNote;
private static JLabel lblNameEvaluation;
private static JCheckBox chckbxfichiersEtudiants;
@ -85,11 +82,9 @@ public class evaluate extends JFrame {
private static JCheckBox chckbxnoFeedback;
private static JCheckBox chckbxNoNote;
private static JCheckBox chckCSVNotes;
private static JCheckBox chckbxNoLogo;
private static JCheckBox chckbxVerif;
private static JCheckBox chckbxNewLogo;
private static JCheckBox chckbxNoDetail;
private static JCheckBox chckPasDeProgression = new JCheckBox("<html><p>Ne pas afficher le coef. de progression<br>dans les feedbacks</p></html>");
private static JCheckBox chckPasDeProgression ;
private static afficheText txtpnmessages;
private JButton btnChargeEvaluation = new JButton();
private JButton btnSaveEvaluation = new JButton();
@ -101,6 +96,15 @@ public class evaluate extends JFrame {
* Create the frame.
*/
public void initialize() throws UnsupportedLookAndFeelException{
// Configurer l'arrière-plan et la taille de la police des tooltips globalement
UIManager.put("ToolTip.background", Color.YELLOW);
UIManager.put("ToolTip.font", new Font("SansSerif", Font.BOLD, 14));
UIManager.put("ToolTip.initialDelay", 500); // Délai avant d'afficher le tooltip (500 ms)
UIManager.put("ToolTip.dismissDelay", 8000); // Durée d'affichage du tooltip (8 000 ms)
setSize(1600,900);
ImageIcon img = new ImageIcon(getClass().getResource("/evalwriter.png") );
@ -110,7 +114,6 @@ public class evaluate extends JFrame {
setLocationRelativeTo( null );
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
// setBounds(100, 100, 980, 700);
int screenWidth = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getWidth();
int screenHeight = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getHeight();
setLocation(( (screenWidth) - getWidth()) / 2, (screenHeight - getHeight()) / 2);
@ -145,7 +148,6 @@ public class evaluate extends JFrame {
panelWestBase.add(panelBoutons, BorderLayout.WEST);
panelBoutons.setLayout(new MigLayout("", "[24px][260px]", "[][][][][][][][][][][][][][][]"));
ImageIcon imgDossierEtudiant = new ImageIcon(getClass().getResource("/dossieretudiant.png") );
JLabel lblIconAccueilEvaluation = new JLabel("");
lblIconAccueilEvaluation.setVerticalAlignment(SwingConstants.TOP);
@ -171,36 +173,71 @@ public class evaluate extends JFrame {
// panelWestBaseNord.add("");
chckbxfichiersEtudiants = new JCheckBox("<HTML>Les fichiers des étudiants<BR><b>ne sont pas</b> dans des dossiers nominatifs<HTML>");
chckbxfichiersEtudiants = new JCheckBox("<html>Les fichiers des étudiants<b><br>ne sont pas</b> dans des dossiers nominatifs</html>");
chckbxfichiersEtudiants.setToolTipText("Cochez si les fichiers ne sont pas dans des dossiers nominatifs.");
lblImageDossierEtudiant = new JLabel(new ImageIcon(getClass().getResource("/resources/dossieretudiant.png")));
panelBoutons.add(lblImageDossierEtudiant, "flowx,cell 0 1,alignx left,aligny center");
chckbxfichiersEtudiants.setFont(new Font("Tahoma", Font.PLAIN, 12));
chckbxfichiersEtudiants.setToolTipText("Cochez si les fichiers des étudiants ne sont pas dans des dossier nominatifs");
panelBoutons.add(chckbxfichiersEtudiants, "cell 1 1,growx,aligny center");
chckbxfichiersEtudiants.setSelected(commandes.fichierStudentMoodle);
if(commandes.fichierStudentMoodle) {
chckbxfichiersEtudiants.setToolTipText("Décochez si les fichiers sont dans des dossiers nominatifs.");
lblImageDossierEtudiant.setIcon(new ImageIcon(getClass().getResource("/resources/fichieretudiant.png")));
chckbxfichiersEtudiants.setText("<html>Les fichiers des étudiants<b><br>ne sont pas</b> dans des dossiers nominatifs</html>");
}else {
chckbxfichiersEtudiants.setToolTipText("Cochez si les fichiers ne sont pas dans des dossiers nominatifs.");
lblImageDossierEtudiant.setIcon(new ImageIcon(getClass().getResource("/resources/dossieretudiant.png")));
chckbxfichiersEtudiants.setText("<html>Les fichiers des étudiants<b><br>sont</b> dans des dossiers nominatifs</html>");
}
chckbxfichiersEtudiants.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
if(chckbxfichiersEtudiants.isSelected()) {
commandes.fichierStudentMoodle=true;
chckbxfichiersEtudiants.setToolTipText("Décochez si les fichiers sont dans des dossiers nominatifs.");
chckbxfichiersEtudiants.setText("<html>Les fichiers des étudiants<b><br>ne sont pas</b> dans des dossiers nominatifs</html>");
lblImageDossierEtudiant.setIcon(new ImageIcon(getClass().getResource("/resources/fichieretudiant.png")));
commandes.evaluationChargeEnMemoire.getAttributs().put("fichierStudentMoodle", "true" );
}else {
commandes.fichierStudentMoodle=false;
chckbxfichiersEtudiants.setToolTipText("Cochez si les fichiers ne sont pas dans des dossiers nominatifs.");
chckbxfichiersEtudiants.setText("<html>Les fichiers des étudiants<b><br>sont</b> dans des dossiers nominatifs</html>");
lblImageDossierEtudiant.setIcon(new ImageIcon(getClass().getResource("/resources/dossieretudiant.png")));
commandes.evaluationChargeEnMemoire.getAttributs().put("fichierStudentMoodle", "false" );
}
}
});
JLabel lblafficheprogression = new JLabel(new ImageIcon(create.class.getResource("/resources/afficheprogression.png")));
chckPasDeProgression = new JCheckBox("<html><p><b>Afficher</b> le coefficient de<br>progression dans les feedbacks.</p></html>");
chckPasDeProgression.setToolTipText("Cochez si vous ne voulez pas afficher le coef. de profression dans les feeedbacks.");
JLabel lblafficheprogression = new JLabel((new ImageIcon(create.class.getResource("/resources/afficheprogression.png"))));
panelBoutons.add(lblafficheprogression, "cell 0 0");
if(commandes.noAfficheProgression) {
chckPasDeProgression.setToolTipText("Décochez si vous voulez afficher le coef. de profression dans les feeedbacks.");
chckPasDeProgression.setText("<html><p><b>Ne pas afficher</b> le coefficient de<br>progression dans les feedbacks.</p></html>");
lblafficheprogression.setIcon(new ImageIcon(create.class.getResource("/resources/noafficheprogression.png")));
}else {
chckPasDeProgression.setToolTipText("Cochez si vous ne voulez pas afficher le coef. de profression dans les feeedbacks.");
chckPasDeProgression.setText("<html><p><b>Afficher</b> le coefficient de<br>progression dans les feedbacks.</p></html>");
lblafficheprogression.setIcon(new ImageIcon(create.class.getResource("/resources/afficheprogression.png")));
}
chckPasDeProgression.setFont(new Font("Tahoma", Font.PLAIN, 12));
panelBoutons.add(chckPasDeProgression, "cell 1 0,alignx left,aligny center");
chckPasDeProgression.setSelected(commandes.noAfficheProgression);
chckPasDeProgression.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
if(chckPasDeProgression.isSelected()) {
chckPasDeProgression.setToolTipText("Décochez si vous voulez afficher le coef. de profression dans les feeedbacks.");
commandes.noAfficheProgression=true;
chckPasDeProgression.setText("<html><p><b>Ne pas afficher</b> le coefficient de<br>progression dans les feedbacks.</p></html>");
commandes.evaluationChargeEnMemoire.getAttributs().put("noAfficheProgression", "true" );
lblafficheprogression.setIcon(new ImageIcon(create.class.getResource("/resources/noafficheprogression.png")));
}else {
chckPasDeProgression.setToolTipText("Cochez si vous ne voulez pas afficher le coef. de profression dans les feeedbacks.");
chckPasDeProgression.setText("<html><p><b>Afficher</b> le coefficient de<br>progression dans les feedbacks.</p></html>");
commandes.noAfficheProgression=false;
commandes.evaluationChargeEnMemoire.getAttributs().put("noAfficheProgression", "false" );
lblafficheprogression.setIcon(new ImageIcon(create.class.getResource("/resources/afficheprogression.png")));
@ -208,84 +245,106 @@ public class evaluate extends JFrame {
}
});
lblImageDossierEtudiant = new JLabel(imgDossierEtudiant);
panelBoutons.add(lblImageDossierEtudiant, "flowx,cell 0 1,alignx left,aligny center");
chckbxfichiersEtudiants.setFont(new Font("Tahoma", Font.PLAIN, 12));
chckbxfichiersEtudiants.setToolTipText("Cochez si les fichiers des étudiants ne sont pas dans des dossier nominatifs");
panelBoutons.add(chckbxfichiersEtudiants, "cell 1 1,growx,aligny center");
chckbxfichiersEtudiants.setSelected(commandes.fichierStudentMoodle);
ImageIcon imgDNoFeedBack = new ImageIcon(getClass().getResource("/resources/feedbackstudent.png") );
chckbxnoFeedback = new JCheckBox("Pas de feedback");
chckbxnoFeedback = new JCheckBox("<html><b>Générer</b> des feedbacks<br>pour chaque étudiant.</html>");
chckbxnoFeedback.setToolTipText("Cochez si vous ne voulez pas générer des feedbacks.");
chckbxnoFeedback.setFont(new Font("Tahoma", Font.PLAIN, 12));
panelBoutons.add(chckbxnoFeedback, "cell 1 2,growx,aligny top");
chckbxnoFeedback.setSelected(commandes.sansFeeback);
lblNoFeedBack = new JLabel(new ImageIcon(getClass().getResource("/resources/feedbackstudent.png")));
panelBoutons.add(lblNoFeedBack, "cell 0 2");
if(commandes.sansFeeback) {
chckbxnoFeedback.setToolTipText("Décochez si vous voulez générer des feedbacks.");
chckbxnoFeedback.setText("<html><b>Ne pas générer</b> des feedbacks<br>pour chaque étudiant.</html>");
lblNoFeedBack.setIcon(new ImageIcon(getClass().getResource("/resources/nofeedbackstudent.png")));
}else {
chckbxnoFeedback.setToolTipText("Cochez si vous ne voulez pas générer des feedbacks.");
chckbxnoFeedback.setText("<html><b>Générer</b> des feedbacks<br>pour chaque étudiant.</html>");
lblNoFeedBack.setIcon(new ImageIcon(getClass().getResource("/resources/feedbackstudent.png")));
}
chckbxnoFeedback.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
if(chckbxnoFeedback.isSelected()) {
chckbxnoFeedback.setToolTipText("Décochez si vous voulez générer des feedbacks.");
lblNoFeedBack.setIcon(new ImageIcon(getClass().getResource("/resources/nofeedbackstudent.png")));
commandes.sansFeeback=true;
chckbxnoFeedback.setText("<html><b>Ne pas générer</b> des feedbacks<br>pour chaque étudiant.</html>");
commandes.evaluationChargeEnMemoire.getAttributs().put("sansFeeback", "true" );
}else {
chckbxnoFeedback.setToolTipText("Cochez si vous ne voulez pas générer des feedbacks.");
lblNoFeedBack.setIcon(new ImageIcon(getClass().getResource("/resources/feedbackstudent.png")));
commandes.sansFeeback=false;
chckbxnoFeedback.setText("<html><b>Générer</b> des feedbacks<br>pour chaque étudiant.</html>");
commandes.evaluationChargeEnMemoire.getAttributs().put("sansFeeback", "false" );
}
}
});
lblNoFeedBack = new JLabel(imgDNoFeedBack);
panelBoutons.add(lblNoFeedBack, "cell 0 2");
chckbxnoFeedback.setToolTipText("Cochez si vous ne voulez pas générer des feedbacks");
chckbxnoFeedback.setFont(new Font("Tahoma", Font.PLAIN, 12));
panelBoutons.add(chckbxnoFeedback, "cell 1 2,growx,aligny top");
chckbxnoFeedback.setSelected(commandes.sansFeeback);
ImageIcon imgDNoDetail = new ImageIcon(getClass().getResource("/resources/detailfeedback.png"));
chckbxNoDetail = new JCheckBox("Pas de détails dans les feedbacks");
lblNoDeatail = new JLabel(new ImageIcon(getClass().getResource("/resources/detailfeedback.png")));
chckbxNoDetail = new JCheckBox("<html><b>Afficher</b> les détails des erreurs<br>dans les feedbacks.</html>");
chckbxNoDetail.setFont(new Font("Tahoma", Font.PLAIN, 12));
panelBoutons.add(chckbxNoDetail, "cell 1 3,growx,aligny top");
chckbxNoDetail.setSelected(commandes.noDetail);
chckbxNoDetail.setToolTipText("Cochez si vous ne voulez pas afficher les détails de l'évaluation dans les feedbacks.");
panelBoutons.add(lblNoDeatail, "cell 0 3");
if(commandes.noDetail) {
chckbxNoDetail.setToolTipText("Décochez si vous voulez afficher les détails de l'évaluation dans les feedbacks.");
chckbxNoDetail.setText("<html><b>Ne pas afficher</b> les détails des erreurs<br>dans les feedbacks.</html>");
lblNoDeatail.setIcon(new ImageIcon(getClass().getResource("/resources/nodetailfeedback.png")));
}else {
chckbxNoDetail.setToolTipText("Cochez si vous ne voulez pas afficher les détails de l'évaluation dans les feedbacks.");
chckbxNoDetail.setText("<html><b>Afficher</b> les détails des erreurs<br>dans les feedbacks.</html>");
lblNoDeatail.setIcon(new ImageIcon(getClass().getResource("/resources/detailfeedback.png")));
}
chckbxNoDetail.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
if(chckbxNoDetail.isSelected()) {
chckbxNoDetail.setToolTipText("Décochez si vous voulez afficher les détails de l'évaluation dans les feedbacks.");
lblNoDeatail.setIcon(new ImageIcon(getClass().getResource("/resources/nodetailfeedback.png")));
commandes.noDetail=true;
chckbxNoDetail.setText("<html><b>Ne pas afficher</b> les détails des erreurs<br>dans les feedbacks.</html>");
commandes.evaluationChargeEnMemoire.getAttributs().put("noDetail", "true" );
}else {
lblNoDeatail.setIcon(new ImageIcon(getClass().getResource("/resources/detailfeedback.png")));
commandes.noDetail=false;
chckbxNoDetail.setToolTipText("Cochez si vous ne voulez pas afficher les détails de l'évaluation dans les feedbacks.");
chckbxNoDetail.setText("<html><b>Afficher</b> les détails des erreurs<br>dans les feedbacks.</html>");
commandes.evaluationChargeEnMemoire.getAttributs().put("noDetail", "false" );
}
}
});
lblNoDeatail = new JLabel(imgDNoDetail);
panelBoutons.add(lblNoDeatail, "cell 0 3");
chckbxNoDetail.setToolTipText("Cochez si vous voulez que la table synthèse dans les feedbacks");
chckbxNoDetail.setFont(new Font("Tahoma", Font.PLAIN, 12));
panelBoutons.add(chckbxNoDetail, "cell 1 3,growx,aligny top");
chckbxNoDetail.setSelected(commandes.noDetail);
lblnonote = new JLabel("");
lblnonote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/notestudent.png")));
panelBoutons.add(lblnonote, "cell 0 4");
chckbxNoNote = new JCheckBox("Pas de note dans les feedbacks");
chckbxNoNote.setToolTipText("Cochez si vous voulez pas faire apparaître les notes dans les feedbacks");
chckbxNoNote = new JCheckBox("<html><b>Afficher</b> les notes dans les feedbacks.</html>");
chckbxNoNote.setToolTipText("Cochez si vous ne voulez pas faire apparaître les notes dans les feedbacks.");
chckbxNoNote.setFont(new Font("Tahoma", Font.PLAIN, 12));
chckbxNoNote.setSelected(commandes.noNote);
lblnonote = new JLabel(new ImageIcon(evaluate.class.getResource("/resources/notestudent.png")));
panelBoutons.add(lblnonote, "cell 0 4");
panelBoutons.add(chckbxNoNote, "cell 1 4,grow");
if(commandes.noNote) {
chckbxNoNote.setToolTipText("Décochez si vous voulez faire apparaître les notes dans les feedbacks.");
chckbxNoNote.setText("\"<html><b>Ne pas Afficher</b> les notes dans les feedbacks.</html>\"");
lblnonote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nonotestudent.png")));
}else {
chckbxNoNote.setToolTipText("Cochez si vous ne voulez pas faire apparaître les notes dans les feedbacks.");
chckbxNoNote.setText("<html><b>Afficher</b> les notes dans les feedbacks.</html>");
lblnonote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/notestudent.png")));
}
chckbxNoNote.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
if(chckbxNoNote.isSelected()) {
chckbxNoNote.setToolTipText("Décochez si vous voulez faire apparaître les notes dans les feedbacks.");
lblnonote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nonotestudent.png")));
commandes.noNote=true;
chckbxNoNote.setText("<html><b>Ne pas afficher</b> les notes dans les feedbacks.</html>");
commandes.evaluationChargeEnMemoire.getAttributs().put("noNote", "true" );
}else {
chckbxNoNote.setToolTipText("Cochez si vous ne voulez pas faire apparaître les notes dans les feedbacks.");
lblnonote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/notestudent.png")));
commandes.noNote=false;
chckbxNoNote.setText("<html><b>Afficher</b> les notes dans les feedbacks.</html>");
commandes.evaluationChargeEnMemoire.getAttributs().put("noNote", "false" );
}
}
@ -293,135 +352,110 @@ public class evaluate extends JFrame {
lblnozip = new JLabel("");
lblnozip.setIcon(new ImageIcon(evaluate.class.getResource("/resources/zipstudent.png")));
panelBoutons.add(lblnozip, "cell 0 5");
chckbxZipfeedback = new JCheckBox("Zip les feedbacks");
chckbxZipfeedback.setToolTipText("Cochez si vous voulez placer tous les feedbacks dans une archive ZIP");
chckbxZipfeedback = new JCheckBox("<html><b>Zipper</b> les feedbacks<br>pour les importer dans Moodle.</html>");
chckbxZipfeedback.setToolTipText("Cochez si vous voulez placer les feedbacks dans une archive ZIP");
chckbxZipfeedback.setFont(new Font("Tahoma", Font.PLAIN, 12));
lblnozip = new JLabel(new ImageIcon(evaluate.class.getResource("/resources/zipstudent.png")));
panelBoutons.add(lblnozip, "cell 0 5");
panelBoutons.add(chckbxZipfeedback, "cell 1 5,grow");
chckbxZipfeedback.setSelected(commandes.zipfeedback);
if(commandes.zipfeedback) {
chckbxZipfeedback.setToolTipText("Décochez si vous ne voulez pas placer les feedbacks dans une archive ZIP");
chckbxZipfeedback.setText("<html><b>Ne pas zipper</b> les feedbacks<br>pour les importer dans Moodle.</html>");
lblnozip.setIcon(new ImageIcon(evaluate.class.getResource("/resources/zipstudent.png")));
}else {
chckbxZipfeedback.setToolTipText("Cochez si vous voulez placer les feedbacks dans une archive ZIP");
chckbxZipfeedback.setText("<html><b>Zipper</b> les feedbacks<br>pour les importer dans Moodle.</html>");
lblnozip.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nozipstudent.png")));
}
chckbxZipfeedback.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
if(chckbxZipfeedback.isSelected()) {
chckbxZipfeedback.setToolTipText("Décochez si vous ne voulez pas placer les feedbacks dans une archive ZIP");
lblnozip.setIcon(new ImageIcon(evaluate.class.getResource("/resources/zipstudent.png")));
commandes.zipfeedback=true;
chckbxZipfeedback.setText("<html><b>Ne pas zipper</b> les feedbacks<br>pour les importer dans Moodle.</html>");
commandes.evaluationChargeEnMemoire.getAttributs().put("zipfeedback", "true" );
}else {
chckbxZipfeedback.setToolTipText("Cochez si vous voulez placer les feedbacks dans une archive ZIP");
lblnozip.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nozipstudent.png")));
commandes.zipfeedback=false;
chckbxZipfeedback.setText("<html><b>Zipper</b> les feedbacks<br>pour les importer dans Moodle.</html>");
commandes.evaluationChargeEnMemoire.getAttributs().put("zipfeedback", "false" );
}
}
});
chckbxVerif = new JCheckBox("Vérification des historiques avant analyse");
chckbxVerif = new JCheckBox("<html><b>Ne pas vérifier</b> les historiques avant<br>l'évaluation des fichiers.</html>");
lblVerifHistorique = new JLabel(new ImageIcon(evaluate.class.getResource("/resources/noverifhistoriquestudent.png")));
panelBoutons.add(lblVerifHistorique, "cell 0 6");
chckbxVerif.setFont(new Font("Tahoma", Font.PLAIN, 12));
panelBoutons.add(chckbxVerif, "flowy,cell 1 6,growx,aligny top");
chckbxVerif.setSelected(commandes.verifHisto2);
if(commandes.verifHisto2) {
chckbxVerif.setToolTipText("Décochez si vous voulez ne pas vérifier l'historique des modifications.");
chckbxVerif.setText("<html><b>Vérifier</b> les historiques avant<br>l'évaluation des fichiers.</html>");
lblVerifHistorique.setIcon(new ImageIcon(evaluate.class.getResource("/resources/verifhistoriquestudent.png")));
}else {
chckbxVerif.setToolTipText("Cochez si vous voulez vérifier l'historique des modifications.");
chckbxVerif.setText("<html><b>Ne pas vérifier</b> les historiques avant<br>l'évaluation des fichiers.</html>");
lblVerifHistorique.setIcon(new ImageIcon(evaluate.class.getResource("/resources/noverifhistoriquestudent.png")));
}
chckbxVerif.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
if(chckbxVerif.isSelected()) {
lblVerifHistorique.setIcon(new ImageIcon(evaluate.class.getResource("/resources/verifhistoriquestudent.png")));
commandes.verifHisto2=true;
chckbxVerif.setToolTipText("Décochez si vous voulez ne pas vérifier l'historique des modifications.");
chckbxVerif.setText("<html><b>Vérifier</b> les historiques avant<br>l'évaluation des fichiers.</html>");
commandes.evaluationChargeEnMemoire.getAttributs().put("verifHisto2", "true" );
}else {
chckbxVerif.setToolTipText("Cochez si vous voulez vérifier l'historique des modifications.");
lblVerifHistorique.setIcon(new ImageIcon(evaluate.class.getResource("/resources/noverifhistoriquestudent.png")));
commandes.verifHisto2=false;
chckbxVerif.setText("<html><b>Ne pas vérifier</b> les historiques avant<br>l'évaluation des fichiers.</html>");
commandes.evaluationChargeEnMemoire.getAttributs().put("verifHisto2", "false" );
}
}
});
lblVerifHistorique = new JLabel("");
lblVerifHistorique.setIcon(new ImageIcon(evaluate.class.getResource("/resources/noverifhistoriquestudent.png")));
panelBoutons.add(lblVerifHistorique, "cell 0 6");
chckbxVerif.setToolTipText("Cochez si vous voulez vérifier les échanges de fichiers entre les étudiants.");
chckbxVerif.setFont(new Font("Tahoma", Font.PLAIN, 12));
panelBoutons.add(chckbxVerif, "flowy,cell 1 6,growx,aligny top");
chckbxVerif.setSelected(commandes.verifHisto2);
lblChargementFichierCSV = new JLabel("Pas de liste des étudiants");
lblChargementFichierCSV = new JLabel("<html>Pas de liste des étudiants</html>");
panelBoutons.add(lblChargementFichierCSV, "cell 1 7,alignx left,aligny center");
// lblFichierCSV = new JLabel("<HTML><B><U>Fichier CSV liste des étudiants</U></B></HTML> :");
// lblFichierCSV.setFont(new Font("Tahoma", Font.BOLD, 14));
// panelBoutons.add(lblFichierCSV, "cell 1 8,grow");
lblCsvNote = new JLabel("");
lblCsvNote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nocsvstudent.png")));
lblCsvNote = new JLabel(new ImageIcon(evaluate.class.getResource("/resources/nocsvstudent.png")));
panelBoutons.add(lblCsvNote, "cell 0 9");
chckCSVNotes = new JCheckBox("Créer un fichier CSV des notes");
chckCSVNotes = new JCheckBox("<html><b>Ne pas créer</b> un fichier CSV<br>des notes.</html>");
chckCSVNotes.setToolTipText("Cochez si vous voulez importer les notes dans un fichier CSV.");
panelBoutons.add(chckCSVNotes, "flowx,cell 1 9,grow");
chckCSVNotes.setSelected(commandes.ecritNoteCSV);
if(commandes.ecritNoteCSV) {
chckCSVNotes.setToolTipText("Décochez si vous voulez ne pas importer les notes dans un fichier CSV.");
lblCsvNote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/csvstudent.png")));
chckCSVNotes.setText("<html><b>Ne pas créer</b> un fichier CSV<br>des notes.</html>");
}else {
lblCsvNote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nocsvstudent.png")));
chckCSVNotes.setToolTipText("Cochez si vous voulez importer les notes dans un fichier CSV.");
chckCSVNotes.setText("<html><b>Créer</b> un fichier CSV<br>des notes.</html>");
}
chckCSVNotes.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
if(chckCSVNotes.isSelected()) {
chckCSVNotes.setToolTipText("Décochez si vous voulez ne pas importer les notes dans un fichier CSV.");
lblCsvNote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/csvstudent.png")));
commandes.ecritNoteCSV=true;
chckCSVNotes.setText("<html><b>Ne pas créer</b> un fichier CSV<br>des notes.</html>");
commandes.evaluationChargeEnMemoire.getAttributs().put("ecritNoteCSV", "true" );
}else {
chckCSVNotes.setToolTipText("Cochez si vous voulez importer les notes dans un fichier CSV.");
lblCsvNote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nocsvstudent.png")));
commandes.ecritNoteCSV=false;
chckCSVNotes.setText("<html><b>Créer</b> un fichier CSV<br>des notes.</html>");
commandes.evaluationChargeEnMemoire.getAttributs().put("ecritNoteCSV", "false" );
}
}
});
lblFichierSVG = new JLabel("<HTML><B><U>Fichier SVG</U></B> :</HTML>");
lblFichierSVG.setFont(new Font("Tahoma", Font.BOLD, 14));
panelBoutons.add(lblFichierSVG, "cell 1 10,growx");
JLabel lblNewLogo = new JLabel("");
lblNewLogo.setIcon(new ImageIcon(evaluate.class.getResource("/resources/newlogo.png")));
panelBoutons.add(lblNewLogo, "cell 0 11");
chckbxNewLogo = new JCheckBox("Nouveau logo");
chckbxNewLogo.setSelected(commandes.newLogo);
chckbxNewLogo.setToolTipText("Cochez si vous voulez remplacer le logo par celui au-dessus.");
chckbxNewLogo.setFont(new Font("Tahoma", Font.PLAIN, 12));
panelBoutons.add(chckbxNewLogo, "cell 1 11");
chckbxNewLogo.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
if(chckbxNewLogo.isSelected()) {
lblNewLogo.setIcon(new ImageIcon(evaluate.class.getResource("/resources/newlogo.png")));
chckbxNoLogo.setSelected(true);
commandes.newLogo=true;
commandes.evaluationChargeEnMemoire.getAttributs().put("newLogo", "true" );
}else {
lblNewLogo.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nonewlogo.png")));
commandes.newLogo=false;
commandes.evaluationChargeEnMemoire.getAttributs().put("newLogo", "false" );
}
}
});
lblnologo = new JLabel("");
lblnologo.setIcon(new ImageIcon(evaluate.class.getResource("/resources/logo.png")));
panelBoutons.add(lblnologo, "cell 0 12");
chckbxNoLogo = new JCheckBox("Pas de logo");
chckbxNoLogo.setToolTipText("Cochez si vous voulez pas de logo dans les feedbacks.");
chckbxNoLogo.setFont(new Font("Tahoma", Font.PLAIN, 12));
panelBoutons.add(chckbxNoLogo, "cell 1 12");
chckbxNoLogo.setSelected(commandes.noLogo);
chckbxNoLogo.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
if(chckbxNoLogo.isSelected()) {
lblnologo.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nologo.png")));
commandes.noLogo=true;
commandes.evaluationChargeEnMemoire.getAttributs().put("noLogo", "true" );
}else {
lblnologo.setIcon(new ImageIcon(evaluate.class.getResource("/resources/logo.png")));
commandes.noLogo=false;
commandes.evaluationChargeEnMemoire.getAttributs().put("noLogo", "false" );
}
}
});
JPanel panelCentre = new JPanel();
@ -532,18 +566,10 @@ public class evaluate extends JFrame {
menuItem.setText("Base des évaluations");
mnNewMenu.addSeparator();
mnNewMenu.add( new actSaveEvaluation() );
// mnNewMenu.add( actSaveas );
mnNewMenu.addSeparator();
mnNewMenu.add( new actExit() );
// JMenu mnMenu_Fichier = new JMenu("Base des évaluation");
// menuBar.add(mnMenu_Fichier);
// mnMenu_Fichier.add( actOpen );
// mnMenu_Fichier.addSeparator();
// mnMenu_Fichier.add( actAboutFichierAnalyse );
// mnMenu_Fichier.add( actCodeFichierAnalyse );
// mnMenu_Fichier.add( actModifierFichierAnalyse );
JMenu mnMenu_Liste_Etudiant = new JMenu("Liste des étudiants");
menuBar.add(mnMenu_Liste_Etudiant);
@ -556,11 +582,7 @@ public class evaluate extends JFrame {
mnMenu_Liste_Etudiant.add(actModificationListeEtudiantCSV);
mnMenu_Liste_Etudiant.addSeparator();
mnMenu_Liste_Etudiant.add(actVerifCSV );
JMenu mnMenu_Logo = new JMenu("Logotype");
menuBar.add(mnMenu_Logo);
mnMenu_Logo.add(actChargeLogo);
JMenu mnMenu_Evaluation = new JMenu("Evaluer des étudiants");
menuBar.add(mnMenu_Evaluation);
@ -599,11 +621,7 @@ public class evaluate extends JFrame {
btnSaveEvaluation.setIcon(new ImageIcon(evaluate.class.getResource("/resources/saveEvaluation.png")));
btnSaveEvaluation.setVisible(true);
toolBar.add(btnSaveEvaluation);
// JButton btnSaveEvluation = toolBar.add( new actSaveHistoriqueEvaluation() );
// btnSaveEvluation.setIcon(new ImageIcon(create.class.getResource("/resources/sauvegardehistoriqueevaluation.png")));
// btnSaveEvluation.setHideActionText(true);
// toolBar.add(btnSaveEvluation);
toolBar.addSeparator();
@ -614,6 +632,7 @@ public class evaluate extends JFrame {
JButton btnAfficheCodeFichierAnalyse = toolBar.add( actAboutFichierAnalyse );
btnAfficheCodeFichierAnalyse.setToolTipText("Informations sur l'évaluation chargée en mémoire (Ctrl+K)");
btnAfficheCodeFichierAnalyse.setHideActionText(true);
btnAfficheCodeFichierAnalyse.setIcon(new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyseInfo.png")));
toolBar.add(btnAfficheCodeFichierAnalyse);
@ -663,13 +682,6 @@ public class evaluate extends JFrame {
toolBar.addSeparator();
JButton btnFichierSVG = toolBar.add(actChargeLogo);
btnFichierSVG.setHideActionText(true);
btnFichierSVG.setIcon(new ImageIcon(evaluate.class.getResource("/resources/fichierSVG.png")));
toolBar.add(btnFichierSVG);
toolBar.addSeparator();
JButton btnSelectFolder = toolBar.add(actSelectFolder);
btnSelectFolder.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@ -682,16 +694,6 @@ public class evaluate extends JFrame {
btnEvaluerLesFichiers.setIcon(new ImageIcon(evaluate.class.getResource("/resources/evaluate.png")));
toolBar.add(btnEvaluerLesFichiers);
// JButton btnVerifHistorique = toolBar.add(actVerifHistorique);
// btnVerifHistorique.addActionListener(new ActionListener() {
// public void actionPerformed(ActionEvent e) {
// }
// });
// btnVerifHistorique.setIcon(new ImageIcon(evaluate.class.getResource("/resources/verifhistorique.png")));
// btnVerifHistorique.setHideActionText(true);
// toolBar.add(btnVerifHistorique);
toolBar.addSeparator();
JButton btnAbout = toolBar.add(new actAbout());
@ -716,8 +718,6 @@ public class evaluate extends JFrame {
toolBar.add(btnExit);
// ListenerAction();
}
@ -736,8 +736,8 @@ public class evaluate extends JFrame {
chckbxnoFeedback.setEnabled(false);
chckbxNoNote.setEnabled(false);
chckCSVNotes.setEnabled(false);
chckbxNewLogo.setEnabled(false);
chckbxNoLogo.setEnabled(false);
// chckbxNewLogo.setEnabled(false);
// chckbxNoLogo.setEnabled(false);
chckbxVerif.setEnabled(false);
chckbxNoDetail.setEnabled(false);
chckPasDeProgression.setEnabled(false);
@ -746,19 +746,16 @@ public class evaluate extends JFrame {
chckbxZipfeedback.setSelected(commandes.zipfeedback);
chckbxnoFeedback.setSelected(commandes.sansFeeback);
chckCSVNotes.setSelected(commandes.ecritNoteCSV);
chckbxNewLogo.setSelected(commandes.newLogo);
// chckbxNewLogo.setSelected(commandes.newLogo);
chckbxNoNote.setSelected(commandes.noNote);
chckbxVerif.setSelected(commandes.verifHisto2);
chckbxNoDetail.setSelected(commandes.noDetail);
chckPasDeProgression.setSelected(commandes.noAfficheProgression);
chckbxfichiersEtudiants.setEnabled(true);
chckbxZipfeedback.setEnabled(true);
chckbxnoFeedback.setEnabled(true);
chckbxNoNote.setEnabled(true);
chckCSVNotes.setEnabled(true);
chckbxNewLogo.setEnabled(true);
chckbxNoLogo.setEnabled(true);
chckbxVerif.setEnabled(true);
chckbxNoDetail.setEnabled(true);
chckPasDeProgression.setEnabled(true);
@ -791,9 +788,7 @@ public class evaluate extends JFrame {
if(commandes.NameEvaluationCharger!=null) lblNameEvaluation.setText("<html>Évalution :<br><b> "+ nameEvaluation +"</b></html>");
if(commandes.path!=null) lblPath.setText("<html><p>Dossier de l'analyse :<br><b> " + nameDossierAnalyse + "</b></p><hr></html>");
if(commandes.analysis_filename!=null) lblFileAnalyse.setText("<html>Fichier de l'analyse :<br><b> " + nameFichierAnalyse + "</b></html>");
if(commandes.nameSVG!=null) lblFichierSVG.setText("<html><b><u>Fichier SVG</u></b> :<br>" + commandes.nameSVG.substring(commandes.nameSVG.lastIndexOf("\\")+1,commandes.nameSVG.length()) + "</html>");
// if(commandes.nameCSV!=null) lblFichierCSV.setText("<html><b><u>Fichier CSV</u></b> :<br>" + commandes.nameCSV + "</html>");
}
/**
@ -864,50 +859,6 @@ public class evaluate extends JFrame {
}
};
/**
* Chargement d'un logo SVG.</br>
*/
private AbstractAction actChargeLogo = new AbstractAction() {
private static final long serialVersionUID = 1L;
{
putValue(Action.LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/fichierSVG.png")));
putValue( Action.NAME, "Charge un logo SVG" );
putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierSVGmini.png")));
putValue( Action.MNEMONIC_KEY, KeyEvent.VK_G );
putValue( Action.SHORT_DESCRIPTION, "Charge un logo SVG (CTRL+G)" );
putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_G, InputEvent.CTRL_DOWN_MASK) );
}
@Override
public void actionPerformed( ActionEvent e ) {
JFileChooser chooser = new JFileChooser();
chooser.setDialogTitle("Choisir un fichier SVG");
chooser.setCurrentDirectory(new java.io.File(commandes.path));
chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
FileNameExtensionFilter filter = new FileNameExtensionFilter("Format SVG", "svg");
chooser.setFileFilter(filter);
chooser.setAcceptAllFileFilterUsed(true);
if (chooser.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
System.out.println("getCurrentDirectory(): " + chooser.getCurrentDirectory());
System.out.println("getSelectedFile() : " + chooser.getSelectedFile().getAbsolutePath());
commandes.nameSVG = chooser.getSelectedFile().getAbsolutePath();
commandes.contenuFichierSVG= meptl.chargementFichierSVG();
txtpnmessages.setContentType("text/plain");
txtpnmessages.setText(commandes.contenuFichierSVG);
} else {
commandes.nameSVG = "";
commandes.contenuFichierSVG="";
System.out.println("No Selection ");
}
refreshLabel();
}
};
/**
* Sélectionne le dossier courant contenant les fichiers des étudiants
@ -1337,8 +1288,6 @@ public class evaluate extends JFrame {
}
};
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 75 KiB