Maj V2.0.1

This commit is contained in:
pablo rodriguez 2024-06-25 09:51:51 +02:00
parent e1cafcb8b1
commit abfbf87722
15 changed files with 863 additions and 302 deletions

Binary file not shown.

2
bin/.gitignore vendored
View File

@ -7,3 +7,5 @@
/nodeAC/ /nodeAC/
/resources/ /resources/
/onLine/ /onLine/
/accueil_new_version.png
/accueill new version.svg

View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg <svg
inkscape:export-ydpi="128" inkscape:export-ydpi="96"
inkscape:export-xdpi="128" inkscape:export-xdpi="96"
inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\accueilanalysecalc.png" inkscape:export-filename="accueilanalysecalc.png"
sodipodi:docname="accueilanalyseCalcl.svg" sodipodi:docname="accueilanalyseCalcl.svg"
inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
id="svg8" id="svg8"
version="1.1" version="1.1"
viewBox="0 0 67.230724 17.388617" viewBox="0 0 135.99583 33.3375"
height="65.720757" height="126"
width="254.10037" width="514"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
@ -20,6 +20,18 @@
xmlns:dc="http://purl.org/dc/elements/1.1/"> xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs <defs
id="defs2"> id="defs2">
<linearGradient
id="linearGradient5">
<stop
offset="0"
stop-color="#18a303"
id="stop3"
style="stop-color:#064501;stop-opacity:1;" />
<stop
offset="1"
stop-color="#43c330"
id="stop5" />
</linearGradient>
<linearGradient <linearGradient
id="k" id="k"
gradientTransform="matrix(7.99974,0,0,7.9977797,-873.96742,-7808.7674)" gradientTransform="matrix(7.99974,0,0,7.9977797,-873.96742,-7808.7674)"
@ -46,7 +58,8 @@
x1="108.00134" x1="108.00134"
x2="20.001341" x2="20.001341"
y1="122" y1="122"
y2="6"> y2="6"
gradientTransform="matrix(0.13140715,0,0,0.12826325,9.4577708,48.418245)">
<stop <stop
offset="0" offset="0"
stop-color="#e6e6e6" stop-color="#e6e6e6"
@ -158,7 +171,7 @@
</linearGradient> </linearGradient>
<linearGradient <linearGradient
id="k-1" id="k-1"
gradientTransform="matrix(7.99974,0,0,7.9977797,-873.96742,-7808.7674)" gradientTransform="matrix(1.051223,0,0,1.0258212,-105.3878,-953.15964)"
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
x1="122.75008" x1="122.75008"
x2="111.74973" x2="111.74973"
@ -181,16 +194,16 @@
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
x1="546" x1="546"
x2="458" x2="458"
xlink:href="#a-1" xlink:href="#linearGradient5"
y1="121.99995" y1="121.99995"
y2="5.9999499" /> y2="5.9999499" />
<linearGradient <linearGradient
id="c-0" id="c-0"
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
x1="508.06174" x1="532.39862"
x2="508.06174" x2="497.16809"
y1="109.9985" y1="109.3368"
y2="83.998497"> y2="83.932327">
<stop <stop
offset="0" offset="0"
stop-color="#727272" stop-color="#727272"
@ -198,7 +211,8 @@
<stop <stop
offset="1" offset="1"
stop-color="#9a9a9a" stop-color="#9a9a9a"
id="stop10" /> id="stop10"
style="stop-color:#111111;stop-opacity:1;" />
</linearGradient> </linearGradient>
<linearGradient <linearGradient
id="d-8" id="d-8"
@ -301,6 +315,110 @@
stop-color="#ccf4c6" stop-color="#ccf4c6"
id="stop40" /> id="stop40" />
</linearGradient> </linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient216"
id="radialGradient217"
cx="-2690.3884"
cy="-1320.9919"
fx="-2690.3884"
fy="-1320.9919"
r="387.17081"
gradientTransform="matrix(0.44083784,0.01508006,-0.0139405,0.47636047,-1513.0004,-656.27584)"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient216"
inkscape:collect="always">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop216" />
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0.12528473"
id="stop220" />
<stop
style="stop-color:#f9ffce;stop-opacity:1;"
offset="0.15717539"
id="stop219" />
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0.1833971"
id="stop218" />
<stop
style="stop-color:#b3cfd5;stop-opacity:1;"
offset="1"
id="stop217" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient212"
id="linearGradient213"
x1="-2743.2283"
y1="1659.8406"
x2="-2737.7463"
y2="1709.3241"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient212"
inkscape:collect="always">
<stop
style="stop-color:#c6dce2;stop-opacity:1;"
offset="0"
id="stop212" />
<stop
style="stop-color:#c6dce2;stop-opacity:0;"
offset="1"
id="stop213" />
</linearGradient>
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter9"
x="-0.045252179"
y="-0.0012351727"
width="1.0905044"
height="1.0024703">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.093745546"
id="feGaussianBlur9" />
</filter>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient212"
id="linearGradient215"
x1="-3014.6995"
y1="1829.689"
x2="-2996.6003"
y2="1815.2848"
gradientUnits="userSpaceOnUse" />
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter23"
x="-0.013449297"
y="-0.047202686"
width="1.0268986"
height="1.0944054">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.084339672"
id="feGaussianBlur23" />
</filter>
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter25"
x="-0.020148346"
y="-0.34613519"
width="1.0402967"
height="1.6922704">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.1641416"
id="feGaussianBlur25" />
</filter>
</defs> </defs>
<sodipodi:namedview <sodipodi:namedview
inkscape:window-maximized="1" inkscape:window-maximized="1"
@ -321,9 +439,9 @@
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="36.86866" inkscape:cy="63.050667"
inkscape:cx="66.698758" inkscape:cx="257"
inkscape:zoom="2.9835638" inkscape:zoom="1.459144"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
borderopacity="1.0" borderopacity="1.0"
@ -335,15 +453,19 @@
inkscape:snap-intersection-paths="true" inkscape:snap-intersection-paths="true"
inkscape:snap-smooth-nodes="true" inkscape:snap-smooth-nodes="true"
inkscape:object-paths="true" inkscape:object-paths="true"
inkscape:snap-page="true"> inkscape:snap-page="true"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1">
<sodipodi:guide <sodipodi:guide
id="guide1680" id="guide1680"
orientation="0,-1" orientation="0,-1"
position="36.945035,2.9637157" /> position="-2.5688102,12.182592"
inkscape:locked="false" />
<sodipodi:guide <sodipodi:guide
position="-0.1773606,32.641629" position="-0.1773606,32.641628"
orientation="-0.71102562,0.7031661" orientation="-0.71102562,0.7031661"
id="guide2372" /> id="guide2372"
inkscape:locked="false" />
</sodipodi:namedview> </sodipodi:namedview>
<metadata <metadata
id="metadata5"> id="metadata5">
@ -361,41 +483,356 @@
id="layer1" id="layer1"
inkscape:groupmode="layer" inkscape:groupmode="layer"
inkscape:label="Calque 1"> inkscape:label="Calque 1">
<g
id="g6332"
transform="matrix(0.1648432,0,0,-0.08707046,508.87124,180.15207)"
style="display:inline;stroke-width:1.20245;stroke-miterlimit:4;stroke-dasharray:none">
<rect <rect
style="fill:none;stroke:none;stroke-width:0.148;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000" style="fill:url(#radialGradient217);stroke:none;stroke-width:3.36831;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0;paint-order:fill markers stroke"
id="rect4845" id="rect32012"
width="66.024391" width="849.70654"
height="16.182283" height="409.83182"
x="31.987135" x="-2897.6877"
y="46.825306" /> y="-1540.005"
transform="scale(1,-1)" />
<g
id="g32052"
style="display:inline;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.3168,1715.0167 117.9756,190.8511 15.2087,-5.1151 z"
id="path32014"
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.3168,1715.0167 176.3026,193.6794 9.4677,-3.94 z"
id="path32016"
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.3168,1715.0167 272.8332,202.1873 37.5354,6.6881 z"
id="path32018"
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 -3051.3168,1715.0167 350.2709,204.7311 0.844,-2.1098 z"
id="path32020"
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.3168,1715.0167 369.2094,157.8283 9.7391,-9.2656 z"
id="path32022"
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.3168,1715.0167 376.0613,99.6919 v -20.847 z"
id="path32024"
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="rect32026"
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.3168,1715.0167 376.0613,39.6068 v -16.0165 z"
id="path32028"
sodipodi:nodetypes="cccc" />
<path
style="fill:url(#linearGradient213);stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3051.3168,1715.0167 377.9716,0.4852 -5.0522,-58.5537 z"
id="path32030"
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 372.9841,9.4625 3.0578,-11.0074 z"
id="path32032"
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.3168,1715.0167 375.8685,-110.6183 3.6053,12.5006 z"
id="path32034"
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.3168,1715.0167 360.5106,-171.3972 14.5987,16.8163 z"
id="path32036"
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.3168,1715.0167 336.3428,-170.8613 -22.247,-2.7693 z"
id="path32038"
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.3168,1715.0167 376.7706,-120.0417 -2.9128,-15.8655 z"
id="path32040"
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.3168,1715.0167 277.3868,-167.0318 -7.1593,-17.9805 z"
id="path32042"
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 221.2389,-180.1521 4.2212,2.9003 z"
id="path32044"
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.3168,1715.0167 129.1743,-181.5571 25.5602,8.336 z"
id="path32046"
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.3168,1715.0167 62.8694,-164.4233 12.6592,-2.1096 z"
id="path32048"
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.3168,1715.0167 66.0206,194.6431 20.7191,9.5253 z"
id="path32050"
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.3168,1715.0167 103.296,184.1591 3.736,0.4152 z"
id="path56859"
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.3168,1715.0167 176.3627,194.4934 2.2159,-3.9072 z"
id="path58172"
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.3168,1715.0167 280.4702,207.8306 -1.4338,3.4796 z"
id="path58402"
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 -3051.3168,1715.0167 371.1145,158.5265 -1.3209,5.2401 z"
id="path58499"
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 -3051.3168,1715.0167 259.3587,-172.001 -9.9688,-3.4128 z"
id="path58957"
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 -3051.3168,1715.0167 114.7727,-164.4233 3.0462,-1.1632 z"
id="path59453"
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.3168,1715.0167 32.9692,242.1953 -1.4697,-51.5881 z"
id="path6"
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.3168,1715.0167 -17.5742,-179.0661 21.7091,-2.1096 z"
id="path8"
sodipodi:nodetypes="cccc" />
<path
style="mix-blend-mode:normal;fill:#007596;fill-opacity:0.556837;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter9)"
d="m -3051.3168,1715.0167 4.1349,-181.1757 -4.9719,-0.9764 z"
id="path9"
sodipodi:nodetypes="cccc" />
<path
style="fill:#007494;fill-opacity:0.345098;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3051.3168,1715.0167 83.4612,243.8547 -4.9351,-3.1499 z"
id="path212"
sodipodi:nodetypes="cccc" />
</g>
<g
id="g32086"
transform="matrix(-1.0962043,0,0,-1.1208753,-6069.8062,3259.1172)"
style="display:inline;stroke-width:0.902143">
<path
style="fill:url(#linearGradient215);stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3091.8988,1723.9579 116.1018,163.8657 37.987,-0.9136 z"
id="path32054"
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 209.6614,170.2267 -0.8439,-7.5956 z"
id="path32056"
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 237.658,144.0897 -11.8192,-19.9352 z"
id="path32058"
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 230.7779,111.835 0.844,-2.1098 z"
id="path32060"
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 227.7379,88.2124 14.1413,-14.0276 z"
id="path32062"
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 223.0933,51.8611 -6.7531,-15.994 z"
id="path32064"
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 208.2272,25.4485 -1.6888,-9.8077 z"
id="path32068"
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 198.596,-3.4884 0.422,-7.5955 z"
id="path32070"
sodipodi:nodetypes="cccc" />
<path
style="fill:#f6e16d;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3091.8988,1723.9579 202.3222,-32.9541 v -2.5318 z"
id="path32072"
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 214.7988,-62.4436 -3.8006,-9.9143 z"
id="path32074"
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 207.258,-101.2062 0.6359,7.8742 z"
id="path32076"
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 204.7261,-114.7095 1.0594,-12.3395 z"
id="path32078"
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 210.4325,-184.4994 1.2649,12.8642 z"
id="path32080"
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 140.1578,-214.7668 40.9407,16.9774 z"
id="path32082"
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 78.2273,-185.9466 20.4285,5.236 z"
id="path32084"
sodipodi:nodetypes="cccc" />
<path
style="opacity:0.7;fill:#99d8ff;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3091.8988,1723.9579 229.4263,130.8312 0.8449,-12.019 z"
id="path62436"
sodipodi:nodetypes="cccc" />
<path
style="opacity:0.8;fill:#0081a5;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3091.8988,1723.9579 209.7305,-125.9336 -4.0085,-3.4371 z"
id="path62571"
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 17.4457,-200.7742 15.8216,-6.7203 z"
id="path4"
sodipodi:nodetypes="cccc" />
<path
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 -3091.8988,1723.9579 13.6542,-197.3278 4.1434,3.0729 z"
id="path5"
sodipodi:nodetypes="cccc" />
<path
style="fill:#f6e16d;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3091.8988,1723.9579 -36.0109,176.562 -1.9249,0.6428 z"
id="path78"
sodipodi:nodetypes="cccc" />
<path
style="fill:#f6e16d;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3091.8988,1723.9579 -247.9263,151.8141 -5.6517,6.4086 z"
id="path91-6"
sodipodi:nodetypes="cccc" />
<path
style="fill:#f6e16d;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3091.8988,1723.9579 -573.9326,76.7171 -3.3583,-5.9116 z"
id="path104"
sodipodi:nodetypes="cccc" />
<path
style="fill:#f6e16d;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3091.8988,1723.9579 -562.5351,-137.2586 10.3613,-0.5451 z"
id="path139"
sodipodi:nodetypes="cccc" />
<path
style="fill:#f6e16d;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3091.8988,1723.9579 -382.6241,-225.6692 16.013,4.4218 z"
id="path165"
sodipodi:nodetypes="cccc" />
<path
style="fill:#f6e16d;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3091.8988,1723.9579 -155.6159,171.6816 16.9549,-14.4523 z"
id="path209"
sodipodi:nodetypes="cccc" />
<path
style="fill:#f6e16d;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3091.8988,1723.9579 76.102,-227.656 7.5354,-10.4788 z"
id="path211"
sodipodi:nodetypes="cccc" />
<path
style="fill:#f6e16d;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3091.8988,1723.9579 89.8833,165.2892 6.3888,7.5317 z"
id="path215"
sodipodi:nodetypes="cccc" />
<path
style="fill:#fcf4c8;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3091.8988,1723.9579 -35.9237,-286.1309 5.1519,4.9674 z"
id="path7"
sodipodi:nodetypes="cccc" />
</g>
</g>
<g
id="g4"
inkscape:label="Titre"
transform="matrix(1.0620466,0,0,1.0620466,-2.8272111,-3.9747456)">
<text <text
xml:space="preserve" xml:space="preserve"
style="font-size:9.96044px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;stroke-width:0.233446" style="font-size:14.4639px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;fill:#ffffff;stroke:#ffffff;stroke-width:1.5;filter:url(#filter23)"
x="44.636173" x="66.430458"
y="60.949116" y="68.562744"
id="text23"
transform="scale(1.0448769,0.95705053)"><tspan
sodipodi:role="line"
id="tspan23"
x="66.430458"
y="68.562744"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.4639px;font-family:Pacifico;-inkscape-font-specification:Pacifico;fill:#ffffff;stroke:#ffffff;stroke-width:1.5">analyseCalc</tspan></text>
<text
xml:space="preserve"
style="font-size:14.4639px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;stroke-width:0.233446"
x="66.430458"
y="68.562744"
id="text835" id="text835"
transform="scale(1.0448769,0.95705052)"><tspan transform="scale(1.0448769,0.95705053)"><tspan
sodipodi:role="line" sodipodi:role="line"
id="tspan833" id="tspan833"
x="44.636173" x="66.430458"
y="60.949116" y="68.562744"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.96044px;font-family:Pacifico;-inkscape-font-specification:Pacifico;stroke-width:0.233446">analyseCalc</tspan></text> style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.4639px;font-family:Pacifico;-inkscape-font-specification:Pacifico;stroke-width:0.233446">analyseCalc</tspan></text>
</g>
<g <g
id="g964" id="g21"
transform="matrix(0.13140715,0,0,0.12826325,30.208961,46.733319)"> inkscape:label="Logo"
<path transform="matrix(1.6436639,0,0,1.6436639,-16.300465,-27.934742)">
d="m 17.253295,0 c -0.25037,0 -0.50072,0.011156 -0.75,0.035156 -3.66708,0.6998 -4.56576,2.2662469 -4.5,5.9980468 V 122.00195 c 4e-4,4.1875 1.81149,5.99765 6,5.99805 h 91.998055 c 4.1885,-4e-4 5.99764,-1.81055 5.99804,-5.99805 V 50.183594 c 0.048,-2.1119 -0.78004,-4.230247 -2.25,-5.748047 L 71.589245,2.2851562 c -1.51819,-1.4691999 -3.63759,-2.2988999 -5.75,-2.25 H 18.003295 C 17.754105,0.0111562 17.503675,0 17.253295,0 Z m 70.00978,0.013672 c -0.20997,0 -0.41948,0.016828 -0.62695,0.048828 -2.66247,0.8528 -3.55843,4.904547 -1.50586,6.810547 L 109.22596,31.09375 c 2.22593,2.1217 6.6581,0.306209 6.77538,-2.775391 V 4.097656 C 116.0011,1.9839562 114.08836,0.0628 111.98573,0.0625 H 87.891975 c -0.20758,-0.032 -0.41894,-0.048828 -0.6289,-0.048828 z"
fill="url(#k)"
id="path49"
style="fill:url(#k-1)" />
<path
d="M 18.001355,6 V 122 H 110.00137 V 50 L 66.001375,6 Z"
fill="url(#j)"
id="path51"
style="fill:url(#j)" />
<g <g
transform="translate(-437.99866,2)" transform="matrix(0.2200885,0,0,0.21482291,-70.978396,36.994978)"
id="g105"> id="g105">
<g
id="g2"
transform="matrix(1.0898443,0,0,1.0898443,-42.136972,-9.5233151)">
<path <path
d="m 469,53.998 v 2 8 2 8 2 8 2 8 2 8 2 h 60 v -2 -50 h -58 z" d="m 469,53.998 v 2 8 2 8 2 8 2 8 2 8 2 h 60 v -2 -50 h -58 z"
fill="url(#b)" fill="url(#b)"
@ -403,16 +840,20 @@
style="fill:url(#b-8)" /> style="fill:url(#b-8)" />
<g <g
fill="#92e285" fill="#92e285"
id="g61"> id="g61"
style="fill:#ffff00">
<path <path
d="m 470.99924,55.99855 h 17 v 8 h -17 z" d="m 470.99924,55.99855 h 17 v 8 h -17 z"
id="path55" /> id="path55"
style="fill:#ffff00" />
<path <path
d="m 489.99748,55.99855 h 17.99994 v 8 h -17.99994 z" d="m 489.99748,55.99855 h 17.99994 v 8 h -17.99994 z"
id="path57" /> id="path57"
style="fill:#ffff00" />
<path <path
d="m 509.99924,55.99855 h 17 v 8 h -17 z" d="m 509.99924,55.99855 h 17 v 8 h -17 z"
id="path59" /> id="path59"
style="fill:#ffff00" />
</g> </g>
<g <g
fill="#ccf4c6" fill="#ccf4c6"
@ -444,7 +885,21 @@
<path <path
d="m 470.99924,95.99855 h 17 v 8 h -17 z" d="m 470.99924,95.99855 h 17 v 8 h -17 z"
id="path79" /> id="path79" />
<path
d="m 509.99924,86.085049 h 17 v 8 h -17 z"
id="path2" />
<path
d="m 509.87618,95.41506 h 17 v 8 h -17 z"
id="path3" />
</g> </g>
<path
d="m 489.99748,65.99855 h 17.99994 v 8 h -17.99994 z"
fill="#ccf4c6"
id="path103" />
</g>
<g
id="g1"
transform="matrix(1.205185,0,0,1.4416716,-121.74764,-43.636504)">
<path <path
d="m 493.99924,81.99855 h 39 v 28 h -39 z" d="m 493.99924,81.99855 h 39 v 28 h -39 z"
fill="url(#c)" fill="url(#c)"
@ -492,15 +947,33 @@
fill="url(#i)" fill="url(#i)"
id="path101" id="path101"
style="fill:url(#i-0)" /> style="fill:url(#i-0)" />
<path
d="m 489.99748,65.99855 h 17.99994 v 8 h -17.99994 z"
fill="#ccf4c6"
id="path103" />
</g> </g>
</g> </g>
<g
id="g3"
transform="matrix(1.2868275,0,0,1.2868275,-10.940039,-14.868657)">
<path
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.148;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 44.803173,59.695644 42.192167,58.964933 43.943798,57.1318 Z"
id="path886" />
<path
style="fill:#ffcc00;stroke:#000000;stroke-width:0.148;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 42.192167,58.964933 -8.058075,-8.342879 1.797443,-1.817533 8.012263,8.327279 z"
id="path888"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#cccccc;stroke:#000000;stroke-width:0.148;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 34.134092,50.622054 1.797442,-1.817533 1.382596,1.405365 -1.834819,1.855341 z"
id="path896"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#000000;stroke:none;stroke-width:0.148;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 44.803173,59.695644 -0.556231,-1.659447 c -0.179234,0.151786 0.144863,0.645778 0.06664,0.77083 -0.06898,0.110267 -0.443628,-0.09683 -0.554142,-0.0072 -0.165227,0.134015 0.618232,0.607951 0.03103,0.612398 z"
id="path1247"
sodipodi:nodetypes="ccsscc" />
<g <g
id="g3176" id="g3176"
transform="translate(-29.2645,18.09078)" transform="translate(-28.851241,18.415485)"
inkscape:export-filename="C:\Users\pabr6\eclipse-workspace\analyseCalc\images\accueilanalysecalc.png" inkscape:export-filename="C:\Users\pabr6\eclipse-workspace\analyseCalc\images\accueilanalysecalc.png"
inkscape:export-xdpi="128" inkscape:export-xdpi="128"
inkscape:export-ydpi="128"> inkscape:export-ydpi="128">
@ -514,30 +987,84 @@
d="m 65.185528,30.771366 0.962387,-0.638019 c 0.838489,1.245007 0.419423,1.619401 2.562142,3.767338" d="m 65.185528,30.771366 0.962387,-0.638019 c 0.838489,1.245007 0.419423,1.619401 2.562142,3.767338"
style="fill:none;stroke:#686868;stroke-width:0.480582;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:none;stroke:#686868;stroke-width:0.480582;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="ccc" /> sodipodi:nodetypes="ccc" />
<g
id="g901"
style="stroke-width:1.20245;stroke-miterlimit:4;stroke-dasharray:none"
transform="matrix(0.10789957,-0.05670569,0.05420981,0.11191121,44.387897,27.140948)">
<path
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.20245;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 165.60421,210.25518 -16.67346,-14.97786 19.49947,-6.49982 z"
id="path886" />
<path
style="fill:#ffcc00;stroke:#000000;stroke-width:1.20245;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 148.93075,195.27732 -29.6731,-89.58453 19.78207,-6.217222 29.3905,89.301932 z"
id="path888"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#cccccc;stroke:#000000;stroke-width:1.20245;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 119.25765,105.69279 19.78206,-6.217223 5.18467,15.184943 -20.19347,6.3466 z"
id="path896"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#000000;stroke:none;stroke-width:1.20245;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 165.60421,210.25518 1.82913,-13.90142 c -1.86721,0.41019 -1.24071,5.14178 -2.26609,5.73964 -0.90416,0.52717 -2.9307,-2.35026 -4.06786,-2.12548 -1.70014,0.33605 2.39156,6.64425 -1.96215,4.47795 z"
id="path1247"
sodipodi:nodetypes="ccsscc" />
</g> </g>
</g> </g>
</g> </g>
<g
id="g23"
inkscape:label="Logo ODF"
transform="matrix(0.8895534,0,0,0.8895534,144.40382,4.187939)">
<g
id="g22">
<path
d="m 11.724977,48.418245 c -0.0329,0 -0.0658,0.0014 -0.09856,0.0045 -0.481881,0.08976 -0.599974,0.290676 -0.591332,0.769329 v 14.874529 c 5.2e-5,0.537102 0.238042,0.769278 0.788442,0.769329 H 23.91273 c 0.550399,-5.1e-5 0.788132,-0.232227 0.788185,-0.769329 v -9.211656 c 0.0063,-0.270879 -0.102503,-0.542585 -0.295666,-0.737263 l -5.540145,-5.406346 c -0.199501,-0.188445 -0.478005,-0.294865 -0.755591,-0.288593 h -6.285986 c -0.03275,-0.0031 -0.06565,-0.0045 -0.09855,-0.0045 z m 9.199786,0.0018 c -0.02759,0 -0.05512,0.0022 -0.08239,0.0063 -0.349868,0.109383 -0.467603,0.629074 -0.197881,0.873543 l 3.166347,3.106626 c 0.292503,0.272137 0.874922,0.03928 0.890333,-0.35598 v -3.106626 c -3.1e-5,-0.27111 -0.251379,-0.517524 -0.52768,-0.517563 h -3.166091 c -0.02728,-0.0041 -0.05505,-0.0063 -0.08264,-0.0063 z"
fill="url(#k)"
id="path49"
style="fill:url(#k-1);stroke-width:0.129826" />
<path
d="M 11.823278,49.187824 V 64.066361 H 23.912737 V 54.831407 L 18.130823,49.187824 Z"
fill="url(#j)"
id="path51"
style="fill:url(#j);stroke-width:0.129826" />
</g>
<rect
style="fill:#34b820;fill-opacity:1;stroke:none;stroke-width:0.213859;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke"
id="rect25418"
width="12.932077"
height="5.9413943"
x="6.88204"
y="51.444801" />
<text
xml:space="preserve"
style="font-size:4.39335px;line-height:1.25;font-family:'C.A. Gatintas';-inkscape-font-specification:'C.A. Gatintas';fill:#ffffff;stroke-width:0.113167"
x="9.2405291"
y="53.578899"
id="text24468"
transform="scale(0.955729,1.0463217)"><tspan
sodipodi:role="line"
id="tspan24466"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Rounded MT Bold';-inkscape-font-specification:'Arial Rounded MT Bold, ';fill:#ffffff;stroke-width:0.113167"
x="9.2405291"
y="53.578899">ODF</tspan></text>
</g>
<g
id="g6"
transform="matrix(1.6164319,0,0,1.6164319,14.055588,-63.518442)"
style="display:inline">
<text
xml:space="preserve"
style="font-size:3.175px;line-height:1.15;font-family:handwriting-draft_free-version;-inkscape-font-specification:handwriting-draft_free-version;letter-spacing:-0.0818418px;word-spacing:0.0982101px;display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.23729;stroke-linecap:round;stroke-linejoin:round;filter:url(#filter25)"
x="34.449642"
y="87.123672"
id="text25"><tspan
sodipodi:role="line"
id="tspan24"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.175px;font-family:'Arial Nova';-inkscape-font-specification:'Arial Nova Bold';letter-spacing:-0.0818418px;word-spacing:0.0982101px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.23729;stroke-linecap:round;stroke-linejoin:round"
x="34.449642"
y="87.123672"
dx="0 0 0 0 0 0 0 0 0 0 0 0">Évaluer les tableurs au format ODF.</tspan><tspan
sodipodi:role="line"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.175px;font-family:'Arial Nova';-inkscape-font-specification:'Arial Nova Bold';letter-spacing:-0.0818418px;word-spacing:0.0982101px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.23729;stroke-linecap:round;stroke-linejoin:round"
x="34.449642"
y="90.774925"
id="tspan25" /></text>
<text
xml:space="preserve"
style="font-size:3.175px;line-height:1.15;font-family:handwriting-draft_free-version;-inkscape-font-specification:handwriting-draft_free-version;letter-spacing:-0.0818418px;word-spacing:0.0982101px;fill:#000000;fill-opacity:1;stroke-width:0.264583"
x="34.449642"
y="87.123672"
id="text2"><tspan
sodipodi:role="line"
id="tspan2"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.175px;font-family:'Arial Nova';-inkscape-font-specification:'Arial Nova Bold';letter-spacing:-0.0818418px;word-spacing:0.0982101px;fill:#000000;fill-opacity:1;stroke-width:0.264583"
x="34.449642"
y="87.123672"
dx="0 0 0 0 0 0 0 0 0 0 0 0">Évaluer les tableurs au format ODF.</tspan><tspan
sodipodi:role="line"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.175px;font-family:'Arial Nova';-inkscape-font-specification:'Arial Nova Bold';letter-spacing:-0.0818418px;word-spacing:0.0982101px;fill:#000000;fill-opacity:1;stroke-width:0.264583"
x="34.449642"
y="90.774925"
id="tspan4" /></text>
</g>
</g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

20
saveExport.xml Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project default="create_run_jar" name="Create Runnable Jar for Project analyseCalc">
<!--this file was created by Eclipse Runnable JAR Export Wizard-->
<!--ANT 1.7 is required -->
<!--define folder properties-->
<property name="dir.buildfile" value="."/>
<property name="dir.workspace" value="C:/Users/pabr6/eclipse-workspace"/>
<property name="dir.jarfile" value="${dir.buildfile}"/>
<target name="create_run_jar">
<jar destfile="${dir.jarfile}/analyseCalc.jar" filesetmanifest="mergewithoutmain">
<manifest>
<attribute name="Main-Class" value="fenetres.mainApp"/>
<attribute name="Class-Path" value="."/>
</manifest>
<fileset dir="${dir.jarfile}/bin"/>
<zipfileset excludes="META-INF/*.SF" src="${dir.workspace}/zip4j-1.2.7.jar"/>
<zipfileset excludes="META-INF/*.SF" src="${dir.jarfile}/miglayout15-swing.jar"/>
</jar>
</target>
</project>

View File

@ -15,7 +15,7 @@ import xml.node;
*/ */
public class commandes { public class commandes {
//** LenodeAC du fichier d'analyse //** Le node du fichier d'analyse
public static node sujet = new node(); public static node sujet = new node();
public static node sujetSauvegarde = new node(); public static node sujetSauvegarde = new node();
public static JTree tree = new JTree(); public static JTree tree = new JTree();
@ -28,6 +28,11 @@ public class commandes {
public static String branch = "Origin"; public static String branch = "Origin";
public static String Annee ="2022"; public static String Annee ="2022";
//** Le node base de données des évaluations
public static node evaluationsBase = null;
public static node evaluationChargeEnMemoire = null;
public static int hashCodeEvaluationSave = 0;
//*************************************************** //***************************************************
//** Les commandes par défaut à travers la console ** //** Les commandes par défaut à travers la console **
//*************************************************** //***************************************************
@ -56,7 +61,6 @@ public class commandes {
public static String contenuFichierSVG =""; // Le nouveau logo public static String contenuFichierSVG =""; // Le nouveau logo
public static String path =""; public static String path ="";
public static String pathDestination =""; //Pour le mode console uniquement public static String pathDestination =""; //Pour le mode console uniquement
public static String nomDeLaBranch = "Origin"; //Branche de développement
public static String Command =""; //récupère le texte de la commande dans la console public static String Command =""; //récupère le texte de la commande dans la console
//** setting valeur par défaut //** setting valeur par défaut
@ -101,7 +105,7 @@ public class commandes {
public static int analyse_tolerance_rouge = 30; public static int analyse_tolerance_rouge = 30;
public static int analyse_tolerance_vert = 30; public static int analyse_tolerance_vert = 30;
public static int analyse_tolerance_bleu = 30; public static int analyse_tolerance_bleu = 30;
public static long analyse_size = 48000000; public static long analyse_size = 98000000;
public static String analyse_nameZip = "feedbackMoodle"; public static String analyse_nameZip = "feedbackMoodle";
public static String analyse_hash = ""; public static String analyse_hash = "";
public static String analysis_filename = ""; public static String analysis_filename = "";

View File

@ -56,7 +56,7 @@ public final class about extends JFrame {
lblNewLabelTitre.setBounds(10, 10, 429, 90); lblNewLabelTitre.setBounds(10, 10, 429, 90);
contentPane.add(lblNewLabelTitre); contentPane.add(lblNewLabelTitre);
JLabel lblNewLabelVersion = new JLabel("<HTML><B><U>Version :</U></B> " + commandes.version + " "+ commandes.nomDeLaBranch + "</HTML>"); JLabel lblNewLabelVersion = new JLabel("<HTML><B><U>Version :</U></B> " + commandes.version + " "+ commandes.branch + "</HTML>");
lblNewLabelVersion.setFont(new Font("Tahoma", Font.PLAIN, 16)); lblNewLabelVersion.setFont(new Font("Tahoma", Font.PLAIN, 16));
lblNewLabelVersion.setBounds(20, 100, 240, 20); lblNewLabelVersion.setBounds(20, 100, 240, 20);
contentPane.add(lblNewLabelVersion); contentPane.add(lblNewLabelVersion);

View File

@ -3,6 +3,7 @@ package fenetres;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font; import java.awt.Font;
import java.awt.GridLayout; import java.awt.GridLayout;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
@ -14,17 +15,22 @@ import java.util.regex.Pattern;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JMenu; import javax.swing.JMenu;
import javax.swing.JMenuBar; import javax.swing.JMenuBar;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JPopupMenu; import javax.swing.JPopupMenu;
import javax.swing.JScrollBar;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JSplitPane; import javax.swing.JSplitPane;
import javax.swing.JToggleButton; import javax.swing.JToggleButton;
import javax.swing.JToolBar; import javax.swing.JToolBar;
import javax.swing.JTree; import javax.swing.JTree;
import javax.swing.SwingUtilities;
import javax.swing.UnsupportedLookAndFeelException; import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.plaf.SplitPaneUI;
import javax.swing.plaf.basic.BasicSplitPaneUI;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.TreeNode; import javax.swing.tree.TreeNode;
@ -74,11 +80,16 @@ import fenetres.create_act.actTutoriels;
import fenetres.create_act.actUpNode; import fenetres.create_act.actUpNode;
import fenetres.create_act.actsautfalse; import fenetres.create_act.actsautfalse;
import fenetres.create_act.actsauttrue; import fenetres.create_act.actsauttrue;
import net.miginfocom.swing.MigLayout;
import xml.node; import xml.node;
/**
* analyseCalc
* @author pabr6
*
*/
public final class create extends JFrame { public final class create extends JFrame {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -87,15 +98,14 @@ public final class create extends JFrame {
private static DefaultMutableTreeNode selectNode; private static DefaultMutableTreeNode selectNode;
private static afficheText textNodeSelect = new afficheText(); private static afficheText textNodeSelect = new afficheText();
private JToolBar toolBarPrincipal; private JToolBar toolBarPrincipal;
private JMenuBar menuBar = new JMenuBar(); private JMenuBar menuBar = new JMenuBar();
private static JButton buttonEvaluate; private static JButton buttonEvaluate;
private static JToggleButton tglbtnTousLesNodes; private static JToggleButton tglbtnTousLesNodes;
// private JPanel panelPrincipal;
private JPanel panelPrincipal; private static JScrollPane ScrollPaneTableBouton = new JScrollPane( );
private static JScrollBar verticalScrollBar = ScrollPaneTableBouton.getVerticalScrollBar();
private static JLabel lblInfo = new JLabel("Fichier d'analyse");
private JPanel panelDroiteBoutons= new JPanel();
private static create instance; private static create instance;
@ -126,20 +136,24 @@ public final class create extends JFrame {
*/ */
private void initialize() throws UnsupportedLookAndFeelException { private void initialize() throws UnsupportedLookAndFeelException {
setBackground(new Color(255, 255, 255));
setSize(1200,800); setSize(1200,800);
int screenWidth = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getWidth(); int screenWidth = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getWidth();
int screenHeight = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getHeight(); int screenHeight = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getHeight();
setLocation(( (screenWidth) - getWidth()) / 2, (screenHeight - getHeight()) / 2); setLocation(( (screenWidth) - getWidth()) / 2, (screenHeight - getHeight()) / 2);
setLocationRelativeTo( null );
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
ImageIcon img = new ImageIcon(mainApp.class.getResource("/resources/evalcalc.png")); ImageIcon img = new ImageIcon(mainApp.class.getResource("/resources/evalcalc.png"));
setTitle(commandes.Titre + " - " + commandes.version + " " + commandes.branch); setTitle(commandes.Titre + " - " + commandes.version + " " + commandes.branch);
setIconImage(img.getImage()); setIconImage(img.getImage());
setLocationRelativeTo( null );
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
// Construction et injection de la barre de menu // Construction et injection de la barre de menu
setJMenuBar( this.createMenuBar() ); setJMenuBar( this.createMenuBar() );
// coloration et nombre de ligne de l'arbre
tree.setBackground(new Color(255, 255, 255));
tree.setVisibleRowCount(30); tree.setVisibleRowCount(30);
// Ajoute le menu contextuel de la tree // Ajoute le menu contextuel de la tree
@ -147,42 +161,121 @@ public final class create extends JFrame {
this.createToolBar(); this.createToolBar();
panelPrincipal = new JPanel(); FlowLayout layout = new FlowLayout(FlowLayout.LEFT);
getContentPane().add(panelPrincipal, BorderLayout.NORTH); toolBarPrincipal.setLayout(layout);
getContentPane().add(toolBarPrincipal,BorderLayout.NORTH);
// panelPrincipal = new JPanel();
// getContentPane().add(panelPrincipal, BorderLayout.NORTH);
this.createPopupMenuTree(null); this.createPopupMenuTree(null);
// The content of the window // The content of the window
if(commandes.fichierAnalyseValide) tree = commandes.tree; // if(commandes.fichierAnalyseValide) tree = commandes.tree;
// JScrollPane leftScrollPane = new JScrollPane( );
// leftScrollPane.setPreferredSize( new Dimension(400, 0) );
// JScrollPane rightScrollPane = new JScrollPane( );
//
//
// JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftScrollPane, rightScrollPane );
// splitPane.setBounds(10, 10, 1364, 783);
// rightScrollPane.setViewportView(textNodeSelect);
// textNodeSelect.setFont(new Font("Monospaced", Font.PLAIN, 15));
//
// leftScrollPane.setViewportView(tree);
// tree.setFont(new Font("Tahoma", Font.PLAIN, 14));
//
// getContentPane().add(splitPane, BorderLayout.CENTER);
// panelPrincipal.setLayout(new GridLayout(1, 1, 0, 0));
// panelPrincipal.add(toolBarPrincipal);
JPanel panelLeft = new JPanel();
panelLeft.setLayout(new BorderLayout());
JPanel panelNorth = new JPanel();
panelNorth.setLayout(new GridLayout(2,1,0,0));
JScrollPane leftScrollPane = new JScrollPane( ); JScrollPane leftScrollPane = new JScrollPane( );
leftScrollPane.setPreferredSize( new Dimension(400, 0) ); leftScrollPane.setPreferredSize( new Dimension(400, 0) );
JScrollPane rightScrollPane = new JScrollPane( );
JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftScrollPane, rightScrollPane ); JLabel lblNewLabel = new JLabel("");
splitPane.setBounds(10, 10, 1364, 783); // lblNewLabel.setIcon(new ImageIcon(create.class.getResource("/resources/accueil fichier anlyse.png")));
rightScrollPane.setViewportView(textNodeSelect); panelNorth.add(lblNewLabel);
lblInfo.setFont(new Font("Tahoma", Font.BOLD, 12));
panelNorth.add(lblInfo);
panelLeft.add(panelNorth,BorderLayout.NORTH);
panelLeft.add(leftScrollPane,BorderLayout.CENTER);
JScrollPane rightScrollPane = new JScrollPane();
textNodeSelect.setBackground(Color.LIGHT_GRAY);
textNodeSelect.setFont(new Font("Monospaced", Font.PLAIN, 15)); textNodeSelect.setFont(new Font("Monospaced", Font.PLAIN, 15));
ScrollPaneTableBouton = new JScrollPane( );
panelDroiteBoutons.setBackground(Color.LIGHT_GRAY);
panelDroiteBoutons.setBorder(null);
panelDroiteBoutons.setLayout(new MigLayout("", "[40px:n,fill][40px:n,fill][40px:n,fill][40px:n,fill][40px:n,fill][40px:n,fill]", "[20px][40px][40px][60px][60px][60px][60px][60px][60px][60px][60px][60px][60px]"));
rightScrollPane.setViewportView(panelDroiteBoutons);
ScrollPaneTableBouton.setViewportView(textNodeSelect);
JSplitPane splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, rightScrollPane, ScrollPaneTableBouton );
splitPane2.setBounds(10, 10, 1364, 783);
splitPane2.setDividerLocation(0.4);
splitPane2.setOneTouchExpandable(true);
SplitPaneUI spui = splitPane2.getUI();
if (spui instanceof BasicSplitPaneUI) {
((BasicSplitPaneUI) spui).getDivider().addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent arg0) {
if (arg0.getClickCount() == 2) {
Dimension size1 = rightScrollPane.getPreferredSize();
int dividerLocation = splitPane2.getOrientation() == JSplitPane.HORIZONTAL_SPLIT ?
size1.width : size1.height;
splitPane2.setDividerLocation(dividerLocation);
}
}
});
}
JSplitPane splitPane1 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, panelLeft, splitPane2 );
splitPane1.setBounds(10, 10, 1364, 783); //10, 10, 1364, 783
splitPane1.setDividerLocation(0.25);
leftScrollPane.setViewportView(tree); leftScrollPane.setViewportView(tree);
tree.setFont(new Font("Tahoma", Font.PLAIN, 14)); tree.setFont(new Font("Tahoma", Font.PLAIN, 16));
getContentPane().add(splitPane, BorderLayout.CENTER); getContentPane().add(splitPane1, BorderLayout.CENTER);
panelPrincipal.setLayout(new GridLayout(1, 1, 0, 0));
panelPrincipal.add(toolBarPrincipal);
if(commandes.fichierAnalyseValide) {
tree.setVisible(true);
constructionTree();
}else {
tree.setVisible(false);
}
// panelPrincipal.add(bRecherche, "cell 0 1,alignx left,aligny top");
// panelPrincipal.add(bRecherche2, "cell 0 1,alignx left,aligny top");
// panelPrincipal.add(label, "cell 2 1,alignx left,aligny center");
if(commandes.fichierAnalyseValide) constructionTree();
this.setExtendedState(MAXIMIZED_BOTH); this.setExtendedState(MAXIMIZED_BOTH);
rightScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
// if(commandes.fichierAnalyseValide) constructionTree();
//
// this.setExtendedState(MAXIMIZED_BOTH);
positionScrollDebut();
ListenerAction(); ListenerAction();
@ -224,22 +317,6 @@ public final class create extends JFrame {
}); });
// chckbxtoolBarRecherche.addChangeListener(new ChangeListener() {
// public void stateChanged(ChangeEvent e) {
// if(chckbxtoolBarRecherche.isSelected()) {
//// panelPrincipal.add(bRecherche);
// panelPrincipal.add(bRecherche, "cell 0 1,alignx left,aligny top");
// bRecherche.setVisible(true);
// bRecherche.setEnabled(true);
// }else {
// bRecherche.setVisible(false);
// bRecherche.setEnabled(false);
// panelPrincipal.remove(bRecherche);
// }
// }
// });
} }
@ -429,13 +506,6 @@ public final class create extends JFrame {
JMenu mnuEdit = new JMenu( "Edition" ); JMenu mnuEdit = new JMenu( "Edition" );
mnuEdit.setMnemonic( 'E' ); mnuEdit.setMnemonic( 'E' );
// mnuEdit.add( actUndo );
// mnuEdit.add( actRedo );
// mnuEdit.addSeparator();
// mnuEdit.add( actCopy );
// mnuEdit.add( actCut );
// mnuEdit.add( actPaste );
menuBar.add(mnuEdit); menuBar.add(mnuEdit);
JMenu mnAffiche = new JMenu("Affichage"); JMenu mnAffiche = new JMenu("Affichage");
@ -751,76 +821,14 @@ public final class create extends JFrame {
} }
// void saySomething(String eventDescription, TreeExpansionEvent e) { public static void positionScrollDebut() {
// System.out.println(eventDescription + "; " + "path = " + e.getPath()); // Positionne le curseur au début du texte pour que le JScrollPane affiche le haut
// } SwingUtilities.invokeLater(() -> {
// textNodeSelect.setCaretPosition(0);
// verticalScrollBar.setValue(verticalScrollBar.getMinimum());
// // Required by TreeExpansionListener interface. });
// public void treeExpanded(TreeExpansionEvent e) { }
// saySomething("Tree-expanded event detected", e);
// }
//
// // Required by TreeExpansionListener interface.
// public void treeCollapsed(TreeExpansionEvent e) {
// saySomething("Tree-collapsed event detected", e);
// }
} }
//class MyTreeWillExpandListener implements TreeWillExpandListener {
//
//
// public void treeWillExpand(TreeExpansionEvent evt) throws ExpandVetoException {
// JTree tree = (JTree) evt.getSource();
//
// TreePath path = evt.getPath();
// boolean veto = false;
// if (veto) {
// throw new ExpandVetoException(evt);
// }
// }
//
// public void treeWillCollapse(TreeExpansionEvent evt) throws ExpandVetoException {
// JTree tree = (JTree) evt.getSource();
//
// TreePath path = evt.getPath();
// boolean veto = false;
// if (veto) {
// throw new ExpandVetoException(evt);
// }
// }
//}
//class MyTreeExpansionListener implements TreeExpansionListener {
//
// public ArrayList<TreePath> Chemin = new ArrayList<TreePath>();
//
// public ArrayList<TreePath> getChemin() {
// return Chemin;
// }
//
// public void setChemin(ArrayList<TreePath> chemin) {
// Chemin = chemin;
// }
//
// public void treeExpanded(TreeExpansionEvent evt) {
// TreePath path = evt.getPath();
// Chemin.add(path);
// System.out.println("treeExpanded");
// }
//
// public void treeCollapsed(TreeExpansionEvent evt) {
// TreePath path = evt.getPath();
// Chemin.remove(path);
// System.out.println("treeCollapsed");
//
// }
//}

View File

@ -18,7 +18,6 @@ import org.xml.sax.SAXException;
import AnalyseCalc.Classeur2; import AnalyseCalc.Classeur2;
import fenetres.evaluate; import fenetres.evaluate;
import outils.verificationFichierAnalyse;
import xml.LecturesDossiers; import xml.LecturesDossiers;
import xml.ecritureFileXML; import xml.ecritureFileXML;
import xml.node; import xml.node;
@ -99,6 +98,7 @@ public class actNewFichierAnalyse extends AbstractAction{
// new verificationFichierAnalyse(); // new verificationFichierAnalyse();
if(calc.commandes.fichierAnalyseValide) { if(calc.commandes.fichierAnalyseValide) {
calc.commandes.sujetSauvegarde = calc.commandes.sujet.clone(); calc.commandes.sujetSauvegarde = calc.commandes.sujet.clone();
fenetres.create.getTree().setVisible(true);
fenetres.create.constructionTree(); fenetres.create.constructionTree();
fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse(); fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse();
}else { }else {