MAJ V4.5.0

This commit is contained in:
pablo rodriguez 2024-06-21 16:50:08 +02:00
parent 3328e17d78
commit 57b0e8db6e
16 changed files with 856 additions and 6739 deletions

Binary file not shown.

1
bin/.gitignore vendored
View File

@ -1 +1,2 @@
/analyseWriter/
/resources/

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 82 KiB

View File

@ -18,7 +18,40 @@
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="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
id="linearGradient214"
inkscape:collect="always"><stop
style="stop-color:#c6dce2;stop-opacity:1;"
offset="0"
id="stop214" /><stop
style="stop-color:#c6dce2;stop-opacity:0;"
offset="1"
id="stop215" /></linearGradient><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><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 +116,43 @@
id="stop1530" /><stop
style="stop-color:#493d00;stop-opacity:1;"
offset="1"
id="stop1532" /></linearGradient></defs><sodipodi:namedview
id="stop1532" /></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="linearGradient213"
x1="-2790.4382"
y1="1679.6793"
x2="-2788.0291"
y2="1705.3563"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient214"
id="linearGradient215"
x1="-3014.6995"
y1="1829.689"
x2="-2996.6003"
y2="1815.2848"
gradientUnits="userSpaceOnUse" /><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" /></defs><sodipodi:namedview
id="namedview4"
pagecolor="#ffffff"
bordercolor="#666666"
@ -92,15 +161,15 @@
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="1.1073979"
inkscape:cx="363.91617"
inkscape:cy="106.5561"
inkscape:zoom="2.2609739"
inkscape:cx="200.135"
inkscape:cy="87.572883"
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"
@ -6059,42 +6128,40 @@
transform="matrix(0.17688739,0,0,0.17688739,-2244.3553,1144.3321)"><g
id="g52666"
transform="translate(-6.9362147,-342.84965)" /><g
id="g9"
transform="matrix(2.1147964,0,0,2.1147964,3310.9441,-1711.8055)"><g
id="g6332"
transform="matrix(1.0705515,0,0,0.99277768,190.264,-3.925154)"><rect
style="fill:#ecf0f1;fill-opacity:1;stroke:none;stroke-width:3.07553;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0;paint-order:fill markers stroke"
transform="matrix(2.2639985,0,0,2.0995227,1293.0863,-1699.6756)"><rect
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="rect32012"
width="774.34161"
height="354.51321"
width="832.3233"
height="395.60037"
x="-2897.6877"
y="-1525.7139"
y="-1540.005"
transform="scale(1,-1)" /><g
id="g32052"
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"
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 -3049.3045,1722.4738 174.2903,186.2223 9.4677,-3.94 z"
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 -3052.1301,1716.5628 244.714,180.8367 37.5354,6.6881 z"
d="m -3051.3168,1715.0167 243.9007,182.3828 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 -3050.6366,1717.8899 315.0809,180.073 0.844,-2.1098 z"
d="m -3051.3168,1715.0167 315.7611,182.9462 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 -3050.1895,1719.3816 335.4666,141.1271 0.844,-12.6924 z"
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 -3049.8014,1717.4682 328.2244,80.8294 1.0221,-13.4985 z"
d="m -3051.3168,1715.0167 358.9931,87.7887 8.6836,-16.8793 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"
@ -6105,169 +6172,206 @@
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"
d="m -3051.3168,1715.0167 363.5554,34.523 0.457,-14.9004 z"
id="path32028"
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"
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 366.2389,-9.8309 -10.3598,-45.0634 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 332.1098,-4.8214 v -2.5318 z"
d="m -3049.7675,1716.3006 350.9155,-4.8214 5.572,-7.0396 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.4991,1715.5869 342.2496,-106.4272 1.3705,16.4683 z"
d="m -3051.3168,1715.0167 342.0673,-105.857 1.3705,16.4683 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 -3050.9474,1715.6892 315.356,-142.7552 17.5375,0.4053 z"
d="m -3051.3168,1715.0167 334.5311,-149.9714 19.627,4.9131 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.7185,1718.0562 281.1313,-148.2544 3.7978,-5.9076 z"
d="m -3051.3168,1715.0167 321.8166,-163.7194 -15.2632,4.3727 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 -3050.5347,1716.357 338.7234,-117.7477 -0.2534,-12.6913 z"
d="m -3051.3168,1715.0167 349.9531,-115.2804 1.8361,-12.6913 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 -3052.3841,1716.6767 240.3321,-149.5019 -10.9715,-6.3295 z"
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 173.7982,-143.8284 3.7977,0.8442 z"
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 -3037.2049,1690.6198 100.6608,-140.0264 23.0187,3.5385 z"
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 -3044.5255,1704.6094 56.0781,-154.016 12.6592,-2.1096 z"
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 -3049.2395,1721.3974 63.9433,188.2624 20.7191,9.5253 z"
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.6619,1719.6074 103.6411,179.5684 3.736,0.4152 z"
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.3982,1719.9002 176.4441,189.6099 2.2159,-3.9072 z"
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.3047,1716.5628 245.5997,181.5289 -1.4338,3.4796 z"
d="m -3051.3168,1715.0167 245.6118,183.075 -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 -3050.9119,1718.2129 335.8843,140.6799 0.7686,4.1132 z"
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 -3050.3205,1716.6767 221.5112,-152.4151 -7.4274,-3.4128 z"
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 -3037.2049,1690.6198 100.6608,-140.0264 3.0462,-1.1632 z"
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 -3050.8073,1720.0973 25.0803,181.9496 5.9097,3.577 z"
d="m -3051.3168,1715.0167 25.5898,187.0302 5.9097,3.577 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:#99d8ff;fill-opacity:1;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="stroke-width:0.902143"><path
style="fill:#c6dce2;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
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 -3089.599,1724.366 185.9692,151.9946 -0.8439,-7.5956 z"
d="m -3091.8988,1723.9579 188.269,152.4027 -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 -3089.7927,1723.677 235.5519,144.3706 -11.8192,-19.9352 z"
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 -3090.6689,1721.0436 196.9246,99.896 0.844,-2.1098 z"
d="m -3091.8988,1723.9579 198.1545,96.9817 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 -3092.4552,1723.2687 228.2943,88.9016 14.1413,-14.0276 z"
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 -3088.4157,1722.8733 219.6102,52.9457 -6.7531,-15.994 z"
d="m -3091.8988,1723.9579 223.0933,51.8611 -6.7531,-15.994 z"
id="path32064"
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="rect32066"
width="5.0637345"
height="1.6879115"
x="-2932.3242"
y="-1765.8024"
transform="scale(1,-1)" /><path
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 -3090.2795,1721.995 206.6079,27.4114 -1.6888,-9.8077 z"
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 -3090.0079,1720.8521 196.7051,-0.3826 0.422,-7.5955 z"
d="m -3091.8988,1723.9579 198.596,-3.4884 0.422,-7.5955 z"
id="path32070"
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.3498,1720.9886 201.7732,-29.9848 v -2.5318 z"
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 -3092.4465,1723.0281 215.3465,-61.5138 -3.8006,-9.9143 z"
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 -3087.8384,1722.4465 203.1976,-99.6948 0.6359,7.8742 z"
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 -3088.6548,1720.3726 201.4821,-111.1242 1.0594,-12.3395 z"
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 -3090.9475,1718.8188 209.4812,-179.3603 1.2649,12.8642 z"
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 -3092.3784,1719.579 140.6374,-210.3879 40.9407,16.9774 z"
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 -3090.9357,1719.3667 77.2642,-181.3554 20.4285,5.236 z"
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:#0089ae;fill-opacity:1;stroke:none;stroke-width:0.676608px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m -3092.3255,1722.3414 229.853,132.4477 0.8449,-12.019 z"
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 -3092.454,1720.3726 210.2857,-122.3483 -4.0085,-3.4371 z"
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.7792,1718.4252 22.0931,-177.5887 12.2464,-0.1005 z"
d="m -3091.8988,1723.9579 22.2127,-183.1214 12.2464,-0.1005 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 -3092.4124,1720.4286 17.1472,-182.7655 6.5269,3.0729 z"
d="m -3091.8988,1723.9579 16.6336,-186.2948 6.5269,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"
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 -565.3609,78.3042 15.071,-7.4987 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" /></g></g><g
id="g7"
transform="matrix(0.81336093,0,0,0.81336093,-484.79282,213.52967)"><path
transform="matrix(1.7200928,0,0,1.7200928,131.15765,-2016.4268)"><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="path52662"
@ -6606,8 +6710,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="g13"
transform="matrix(1.2483781,0,0,-1.2483781,-2491.3892,1447.0761)"
style="opacity:1"><g
transform="matrix(2.6400655,0,0,-2.6400655,-4176.6494,1354.0479)"><g
transform="matrix(3.4017825,0,0,3.4017825,-95.08183,-189.09441)"
id="g3-5"
style="stroke-width:1.4046;stroke-miterlimit:4;stroke-dasharray:none"><rect
@ -6650,7 +6753,8 @@
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="path12-5"
sodipodi:nodetypes="ccsscc" /></g></g><g
id="g10"><text
id="g10"
transform="matrix(2.1147964,0,0,2.1147964,961.94178,-1124.8307)"><text
xml:space="preserve"
style="font-size:56.5331px;line-height:1.15;font-family:handwriting-draft_free-version;-inkscape-font-specification:handwriting-draft_free-version;fill:#ffffff;stroke:#ffffff;stroke-width:9.7916"
x="-2895.2173"
@ -6668,7 +6772,7 @@
y="-1377.0603"
id="tspan10"> analyseWriter ?</tspan></text><text
xml:space="preserve"
style="font-size:56.5331px;line-height:1.15;font-family:handwriting-draft_free-version;-inkscape-font-specification:handwriting-draft_free-version;stroke-width:4.23999"
style="font-size:56.5331px;line-height:1.15;font-family:handwriting-draft_free-version;-inkscape-font-specification:handwriting-draft_free-version;display:inline;stroke-width:4.23999"
x="-2895.2173"
y="-1443.546"
id="text6"
@ -6679,12 +6783,12 @@
x="-2895.2173"
y="-1443.546">Voulez vous quitter </tspan><tspan
sodipodi:role="line"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:56.5331px;font-family:Pacifico;-inkscape-font-specification:Pacifico;stroke-width:4.23999"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:56.5331px;font-family:Pacifico;-inkscape-font-specification:Pacifico;fill:#0000ff;stroke:none;stroke-width:4.23999"
x="-2895.2173"
y="-1377.0603"
id="tspan7"> analyseWriter ?</tspan></text></g></g><g
id="tspan7"> analyseWriter ?</tspan></text></g><g
id="g79"
transform="matrix(2.2639985,0,0,2.0995227,1385.4139,-1716.2776)"><rect
transform="matrix(2.2639985,0,0,2.0995227,-961.62982,-1693.3049)"><rect
style="fill:#ecf0f1;fill-opacity:1;stroke:none;stroke-width:3.07553;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0;paint-order:fill markers stroke"
id="rect10"
width="774.34161"
@ -6889,7 +6993,7 @@
id="path77"
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,-685.42931,-2129.6035)"><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 +7332,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,-7275.1769,1409.9623)"><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
@ -7272,7 +7376,7 @@
id="path191"
sodipodi:nodetypes="ccsscc" /></g></g><g
id="g201"
transform="translate(-3.8287826,-413.50852)"><g
transform="translate(-17.05162,-422.36058)"><g
id="g202"
transform="translate(-233.55574,-547.51591)"><text
xml:space="preserve"
@ -7292,24 +7396,24 @@
y="-2176.7363"
id="tspan202"> modifications avant de quitter ?</tspan></text><text
xml:space="preserve"
style="font-size:119.556px;line-height:1.15;font-family:handwriting-draft_free-version;-inkscape-font-specification:handwriting-draft_free-version;stroke-width:8.96672"
style="font-size:119.556px;line-height:1.15;font-family:handwriting-draft_free-version;-inkscape-font-specification:handwriting-draft_free-version;fill:#0000ff;stroke-width:8.96672"
x="-4921.5103"
y="-2317.3401"
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
id="g3-2"
style="stroke-width:13.7079"
transform="matrix(2.1645892,0,0,-2.1645892,-3628.4513,1164.3086)"><path
transform="matrix(2.1645892,0,0,-2.1645892,-4264.9143,1175.347)"><path
id="path482-4"
style="fill:url(#linearGradient1536);fill-opacity:1;stroke:#000000;stroke-width:1.37079;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stop-color:#000000"
d="m -16.520619,25.419019 c -3.983159,-7.79e-4 -7.950702,0.07889 -10.205706,0.241511 -22.960022,1.655814 -42.191822,8.32558 -51.283842,17.789242 -2.465411,2.566195 -4.386313,5.672166 -5.016601,8.107974 -0.48734,1.883394 -0.511216,5.236711 -0.0483,6.969421 1.938452,7.25569 9.854292,14.02713 22.033008,18.85193 9.72993,3.85468 19.621891,5.93414 34.57795,7.27303 4.120226,0.36885 16.494693,0.31703 21.0048509,-0.0896 8.874732,-0.80033 15.270519,-1.79583 21.7362841,-3.38122 3.204338,-0.78567 10.131242,-2.99522 12.013612,-3.82973 0.715264,-0.31708 1.711982,-0.73605 2.208131,-0.93155 1.966379,-0.77475 6.348118,-3.14717 8.715217,-4.71299 11.786283,-7.7964 14.560911,-17.659385 7.466252,-26.559629 C 38.536945,34.931691 18.033776,27.38549 -6.2321051,25.667567 -8.5417751,25.50406 -12.537456,25.419928 -16.520613,25.419153 Z m -66.519948,41.637058 0.531333,24.19976 c 9.466339,32.413833 120.999814,32.648673 132.984689,0 v -24.19976 c -15.899351,33.948003 -118.549388,36.267983 -133.516022,0 z m 0.234613,31.71429 0.531332,24.199723 c 9.466338,32.41383 120.992916,32.64868 132.977789,0 V 98.770367 c -15.899347,33.947963 -118.542485,36.267983 -133.509121,0 z m -0.807348,28.843713 0.531332,24.19285 c 9.466341,32.4138 120.992917,32.64864 132.977791,0 v -24.19285 c -15.899351,33.94797 -118.542488,36.26798 -133.509123,0 z" /><g

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 82 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 125 KiB

View File

@ -80,7 +80,6 @@ public class commandes {
public static String contenuFichierSVG =""; // Le nouveau logo
public static String path ="";
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 os = System.getProperty("os.name");

View File

@ -16,8 +16,10 @@ import javax.swing.SwingUtilities;
import analyseWriter.MEPTL.commandes;
import analyseWriter.fenetres.baseDonneesEvaluations;
import analyseWriter.fenetres.baseDonneesListesEtudiants;
import analyseWriter.fenetres.create;
import analyseWriter.fenetres.evaluate;
import analyseWriter.fenetres.mainApp;
public class actExit extends AbstractAction {
@ -30,7 +32,6 @@ public class actExit extends AbstractAction {
putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_Q, KeyEvent.CTRL_DOWN_MASK ) );
}
/**
* Fermeture de l'application analyseWriter.
*/
@ -83,9 +84,11 @@ public class actExit extends AbstractAction {
// Actions des boutons
buttonYes.addActionListener((ActionEvent evt) -> {
baseDonneesListesEtudiants.ferme(false);
baseDonneesEvaluations.ferme();
create.fermeCreate();
evaluate.ferme();
mainApp.ferme();
dialog.dispose();
System.exit(0); // Fermer l'application
});
@ -142,16 +145,16 @@ public class actExit extends AbstractAction {
dialog.setResizable(false);
dialog.setLocationRelativeTo(null); // Pour centrer la boîte de dialogue à l'écran
// Définir le bouton par défaut
dialog.getRootPane().setDefaultButton(buttonSave);
// Actions des boutons
buttonYes.addActionListener((ActionEvent evt) -> {
baseDonneesListesEtudiants.ferme(false);
baseDonneesEvaluations.ferme();
create.fermeCreate();
evaluate.ferme();
mainApp.ferme();
dialog.dispose();
System.exit(0); // Fermer l'application
});

View File

@ -42,7 +42,7 @@ public final class about extends JFrame {
setResizable(false);
setTitle(commandes.Titre);
setLocation(100, 100);
setSize(518,415);
setSize(530,415);
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);
@ -63,35 +63,35 @@ public final class about extends JFrame {
lblNewLabelTitre.setIcon(img2);
lblNewLabelTitre.setHorizontalAlignment(SwingConstants.LEFT);
lblNewLabelTitre.setFont(new Font("Pacifico", Font.PLAIN, 26));
lblNewLabelTitre.setBounds(0, 0, 502, 100);
lblNewLabelTitre.setBounds(0, 0, 514, 126);
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.setBounds(20, 120, 240, 20);
lblNewLabelVersion.setBounds(20, 145, 240, 20);
contentPane.add(lblNewLabelVersion);
JLabel lblNewLabelAnnee = new JLabel("<HTML><B><U>Année :</U></B> " + commandes.Annee + "</HTML>");
lblNewLabelAnnee.setFont(new Font("Tahoma", Font.PLAIN, 16));
lblNewLabelAnnee.setBounds(20, 142, 240, 20);
lblNewLabelAnnee.setBounds(20, 163, 240, 20);
contentPane.add(lblNewLabelAnnee);
JLabel lblCredit = new JLabel("<HTML><U>Crédit</U></HTML>");
lblCredit.setFont(new Font("Tahoma", Font.BOLD | Font.ITALIC, 14));
lblCredit.setBounds(20, 260, 112, 20);
lblCredit.setBounds(20, 287, 112, 20);
getContentPane().add(lblCredit);
JLabel lblNewLabelAuteur = new JLabel("Auteur développeur : Pablo Rodriguez");
JLabel lblNewLabelAuteur = new JLabel("Pablo Rodriguez");
lblNewLabelAuteur.setFont(new Font("Tahoma", Font.PLAIN, 14));
lblNewLabelAuteur.setBounds(20, 282, 250, 20);
lblNewLabelAuteur.setBounds(20, 310, 250, 20);
contentPane.add(lblNewLabelAuteur);
JLabel lblCommentaire = new JLabel("<HTML>Outil permettant lévaluation des fichiers réalisés par des étudiants avec un traitement de texte au format ODF.</html>");
lblCommentaire.setFont(new Font("Tahoma", Font.PLAIN, 14));
lblCommentaire.setHorizontalAlignment(SwingConstants.LEFT);
lblCommentaire.setVerticalAlignment(SwingConstants.TOP);
lblCommentaire.setBounds(20, 199, 472, 72);
lblCommentaire.setBounds(20, 230, 472, 46);
getContentPane().add(lblCommentaire);
JLabel lblLicence = new JLabel("<HTML><B><U>Licence : GNU GLP 3.0</U></B> </HTML>");
@ -116,7 +116,7 @@ public final class about extends JFrame {
}
});
btnNewButton.setBounds(270, 111, 222, 72);
btnNewButton.setBounds(270, 146, 222, 72);
getContentPane().add(btnNewButton);
JLabel lblGPL3 = new JLabel("");

View File

@ -233,6 +233,19 @@ public class baseDonneesListesEtudiants extends JFrame{
}
/**
* Si ReturnEvaluate alors recharge une nouvelle fois la fenêtre evaluate.
* @param returnEvaluate
*/
public static void ferme(boolean returnEvaluate) {
if(!isDispose) {
isDispose=true;
instance.dispose();
if(returnEvaluate) evaluate.getInstance();
}
}
private void ListenerAction() {
/**
@ -252,9 +265,7 @@ public class baseDonneesListesEtudiants extends JFrame{
*/
btnFermer.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
evaluate.getInstance();
isDispose=true;
dispose();
ferme(true);
}
});

View File

@ -19,32 +19,41 @@ import javax.swing.UIManager;
import analyseWriter.MEPTL.commandes;
import analyseWriter.OnLineVersions.verificationNewVersion;
import analyseWriter.action.actAbout;
import analyseWriter.action.actExit;
import analyseWriter.baseEvaluations.CreerBaseParDefautEvaluation;
import analyseWriter.baseEvaluations.recupeNodeBaseEvaluations;
import analyseWriter.baseEvaluations.validatorBaseEvaluation;
import analyseWriter.baseListesEtudiants.CreerBaseParDefautListesEtudiants;
public class mainApp extends JFrame implements ActionListener{
public final class mainApp extends JFrame {
private static final long serialVersionUID = 1L;
private JFrame frmEvalwriter;
JButton btnCreate;
JButton actCharge;
private static JButton btnCreate;
private static JButton actCharge;
public static boolean isDispose = true;
private static mainApp instance;
/**
* Launch the application.
*/
public static void main(String[] args) {
try {
mainApp window = new mainApp();
System.out.println("Système = " + commandes.os);
window.frmEvalwriter.setVisible(true);
} catch (Exception e) {
e.printStackTrace();
}
getInstance();
// try {
//
// if (isDispose) {
// mainApp window = new mainApp();
// System.out.println("Système = " + commandes.os);
// window.setVisible(true);
// isDispose=false;
// }
//
//
// } catch (Exception e) {
// e.printStackTrace();
// }
}
/**
@ -55,6 +64,23 @@ public class mainApp extends JFrame implements ActionListener{
initialize();
}
public static mainApp getInstance() {
if (isDispose) {
instance = new mainApp();
}
instance.setVisible(true);
isDispose=false;
return instance;
}
public static void ferme() {
if(!isDispose) {
isDispose=true;
instance.dispose();
}
}
/**
* Initialize the contents of the frame.
*/
@ -95,28 +121,28 @@ public class mainApp extends JFrame implements ActionListener{
frmEvalwriter = new JFrame();
frmEvalwriter.setResizable(false);
frmEvalwriter.setBounds(100, 100, 530, 391);
// frmEvalwriter = new JFrame();
setResizable(false);
setBounds(100, 100, 530, 420);
int screenWidth = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getWidth();
int screenHeight = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getHeight();
frmEvalwriter.setLocation(( (screenWidth) - frmEvalwriter.getWidth()) / 2, (screenHeight - frmEvalwriter.getHeight()) / 2);
setLocation(( (screenWidth) - getWidth()) / 2, (screenHeight - getHeight()) / 2);
frmEvalwriter.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
frmEvalwriter.getContentPane().setLayout(null);
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
getContentPane().setLayout(null);
ImageIcon img = new ImageIcon(getClass().getResource("/resources/evalwriter.png") );
frmEvalwriter.setIconImage(img.getImage());
setIconImage(img.getImage());
btnCreate = new JButton("Créer ou modifier un fichier d'analyse");
btnCreate.setToolTipText("<html>Création et/ou modification d'un fichier d'analyse d'une évaluation.</html>");
btnCreate.setHorizontalAlignment(SwingConstants.LEFT);
btnCreate.setIcon(new ImageIcon(mainApp.class.getResource("/resources/fichierAnalyseModif.png")));
btnCreate.setFont(new Font("Arial", Font.BOLD, 16));
btnCreate.addActionListener(this);
// btnCreate.addActionListener(this);
btnCreate.setBounds(10, 191, 494, 60);
frmEvalwriter.getContentPane().add(btnCreate);
btnCreate.setBounds(10, 208, 494, 60);
getContentPane().add(btnCreate);
actCharge = new JButton("Evaluer les fichiers des étudiants");
actCharge.setToolTipText("<html>Chargement d'une évaluation présente dans la base<br>pour réaliser l'évaluation des fichiers des étudiants.</html>");
@ -125,8 +151,8 @@ public class mainApp extends JFrame implements ActionListener{
actCharge.setIcon(new ImageIcon(mainApp.class.getResource("/resources/evaluate.png")));
actCharge.setBackground(SystemColor.inactiveCaption);
actCharge.setFont(new Font("Arial", Font.BOLD, 16));
actCharge.setBounds(10, 120, 494, 60);
frmEvalwriter.getContentPane().add(actCharge);
actCharge.setBounds(10, 137, 494, 60);
getContentPane().add(actCharge);
if(LaBaseEvaluationsExiste) {
actCharge.setEnabled(!validatorBaseEvaluation.isVide());
}else {
@ -142,8 +168,8 @@ public class mainApp extends JFrame implements ActionListener{
lblNewLabel.setIcon(img2);
lblNewLabel.setHorizontalAlignment(SwingConstants.CENTER);
lblNewLabel.setFont(new Font("Pacifico", Font.PLAIN, 26));
lblNewLabel.setBounds(0, 0, 514, 111);
frmEvalwriter.getContentPane().add(lblNewLabel);
lblNewLabel.setBounds(0, 0, 514, 126);
getContentPane().add(lblNewLabel);
JButton btnNewButton = new JButton(new actAbout());
btnNewButton.setText("Verif. version");
@ -151,8 +177,8 @@ public class mainApp extends JFrame implements ActionListener{
btnNewButton.setHorizontalAlignment(SwingConstants.LEFT);
btnNewButton.setFont(new Font("Arial", Font.PLAIN, 14));
btnNewButton.setIcon(new ImageIcon(mainApp.class.getResource("/resources/apropos.png")));
btnNewButton.setBounds(10, 262, 240, 60);
frmEvalwriter.getContentPane().add(btnNewButton);
btnNewButton.setBounds(10, 279, 242, 60);
getContentPane().add(btnNewButton);
JButton btnTutoriels = new JButton();
btnTutoriels.setText("Documentation");
@ -172,35 +198,44 @@ public class mainApp extends JFrame implements ActionListener{
btnTutoriels.setIcon(new ImageIcon(mainApp.class.getResource("/resources/documentation.png")));
btnTutoriels.setHorizontalAlignment(SwingConstants.LEFT);
btnTutoriels.setFont(new Font("Arial", Font.PLAIN, 14));
btnTutoriels.setBounds(260, 262, 240, 60);
frmEvalwriter.getContentPane().add(btnTutoriels);
btnTutoriels.setBounds(262, 279, 242, 60);
getContentPane().add(btnTutoriels);
JLabel lblpath = new JLabel(Paths.get("").toAbsolutePath().toString());
lblpath.setFont(new Font("Tahoma", Font.PLAIN, 9));
lblpath.setBounds(10, 322, 494, 30);
frmEvalwriter.getContentPane().add(lblpath);
lblpath.setBounds(10, 340, 494, 30);
getContentPane().add(lblpath);
actCharge.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
new recupeNodeBaseEvaluations();
if(commandes.evaluationsBase!=null) {
new chargeBaseAuDemarrage();
frmEvalwriter.dispose();
dispose();
}else {
evaluate.getInstance();
frmEvalwriter.dispose();
dispose();
}
}
});
frmEvalwriter.setTitle(commandes.Titre + " " + commandes.version + " " + commandes.branch);
}
@Override
btnCreate.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent e) {
if(e.getSource()==btnCreate) {
create.getInstance();
frmEvalwriter.dispose();
dispose();
}
});
addWindowListener(new java.awt.event.WindowAdapter() {
@Override
public void windowClosing(java.awt.event.WindowEvent windowEvent) {
new actExit().actionPerformed(null);
}
});
setTitle(commandes.Titre + " " + commandes.version + " " + commandes.branch);
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 82 KiB