From 51125695933e997d880ebade11a5e83ed4108c58 Mon Sep 17 00:00:00 2001 From: pablo rodriguez <58742538+1-pablo-rodriguez@users.noreply.github.com> Date: Wed, 25 May 2022 15:28:58 +0200 Subject: [PATCH] MAJ interface graphique --- bin/.gitignore | 1 + bin/MEPTL/meptl.class | Bin 66530 -> 67372 bytes bin/MEPTL/verificationFichierAnalyse.class | Bin 23458 -> 23448 bytes bin/app/evaluate$1.class | Bin 1770 -> 1770 bytes bin/app/evaluate$2.class | Bin 986 -> 986 bytes bin/app/evaluate.class | Bin 9997 -> 10598 bytes bin/app/mainApp.class | Bin 4062 -> 3897 bytes bin/evaluate.png | Bin 790 -> 2116 bytes bin/evaluate.svg | 139 ++++++--- bin/evalwriter.svg | 113 ++++--- bin/resources/evaluate.png | Bin 790 -> 2116 bytes icons/evaluate.png | Bin 790 -> 2116 bytes icons/evaluate.svg | 139 ++++++--- icons/evalwriter.svg | 113 ++++--- icons/fichierAnalyse.png | Bin 0 -> 2764 bytes icons/fichier_analyse.svg | 325 +++++++++++++++++++++ icons/open.svg | 126 ++++++++ icons/open2.png | Bin 0 -> 1627 bytes src/MEPTL/commandes.java | 2 +- src/MEPTL/meptl.java | 23 +- src/MEPTL/verificationFichierAnalyse.java | 20 +- src/app/evaluate.java | 135 +++++---- src/app/mainApp.java | 2 - src/resources/evaluate.png | Bin 790 -> 2116 bytes src/resources/fichierAnalyse.png | Bin 0 -> 2764 bytes src/resources/open2.png | Bin 0 -> 1627 bytes 26 files changed, 851 insertions(+), 287 deletions(-) create mode 100644 icons/fichierAnalyse.png create mode 100644 icons/fichier_analyse.svg create mode 100644 icons/open.svg create mode 100644 icons/open2.png create mode 100644 src/resources/fichierAnalyse.png create mode 100644 src/resources/open2.png diff --git a/bin/.gitignore b/bin/.gitignore index 4c2dcb6..cc3666c 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,2 +1,3 @@ +/resources/ /app/ /MEPTL/ diff --git a/bin/MEPTL/meptl.class b/bin/MEPTL/meptl.class index dedb2a8332198375b91b7764d14b5929881765c2..b364931fadd4108f1f2632452f036dff232d250d 100644 GIT binary patch delta 8699 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 delta 8569 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 Mb4?`I8B*SV0e}eumjD0& delta 2029 zcmZvcd34WL8pfaJc`uO=G&FV+gjzxcp%Rp!YDw%F4UIufRfpEJm{Ieaqn0Ap980uS zweLE9MTvbWB6ezDI#r5V2Ggi@Zgu{g^F815-uvGB-uwAJ?{mJh)^px^e$^#DGz9_y z-4FJRzom!}7sR@M0x*;XSQtsczORI^!c5&m7RvdBLcedv25j`RZ2wk5$;=szqDq7! z3?0$QAGpb9h0O>D3LFR?Y*a;-h49S0#2(LMx5mH6wT<6=K96jY{#y(VYci05`Mz=i z92O!!79kXi{f$dd1WOTtWq1+GQ4%Xq1}jk>s}POVsEn@>hxJInH)!Fx+IzBYo-EyS z4Db|x#umJft@r@jFdEx22|F+oJ24l#{HeRK7T@}+T%SFF{Q(@raU8;V9L5zK!EGGH z102I6pM8e!SOO;*g;T7C(~QFzCg3bv;2b;PJUin8Q}F|P;W7u{3g5?74#7_h;2J-{ zbxy?%&c@GNgqvK3TU?2IT!;JIj$gP3dCbKF22S8tUcf_M#UtLqV?M?c0Z(N#6{1rK z=2H#kS3QQPF$<^_LzTiXrLmyWSxCKER0H^ehA=|oSxlKMuFv?Q7BW(+SV9|FQd?L` z+gVOIEUy!+plgiMT}JB>D+bK5l7+Lfm12yQV-<^Hb*s)A7SEd2hOyR}wX7#=TR*;R zgILFgGtL66Ya`jfGT6{&@fBOaMz)p-wv~ytmyPWRo7j0aweR_=U1lrG<7=(}Tf0(x z-Bo8Bm&mp*neALJMz?o^ne0X}#m!&`w}c(tMs{+!?CdVEi@U?rpf%4&n}%YU1(W*3 zK1S6L^nQr=|2L@ie5t`>{BIB(krd9BeGtmND9yJ}nf(yYKOvECqdWU!2;V`#w{A4w z#W)T`1_xmp-@|I(%3Kb{3I4^m`vY9$u;8H<(H0nqeEb-(9EGkNjgL463pf^QIS!jS z9@{tpIn3~`nCKlb$#;D+!#IUiIhC=T#yT9&Mx4#2{FKT3oI^OrKVNV+=kf=B$)}vJ zqFkV2T&VI~Z>S&>IrlSf&P$JmU=*^1vW zl_#0TQ+$i3If!RCoM%1#IZomQX7M8D^AcC`dv4&rxYyI?2Kb{dx#Ck-d4oSOkJpr+ z*A>QF-ov*Q!#k?Uf2%IuB}l$%T|5crFhFx13Rdu0XwBv?UI_=O*OaMYT-;RU5Hw_aJ}Xt)!J3i>n=uZ zTs5_Gv1;$?D%m9}#kEui*H#@}in_QS>gwK9svE37xS{IqM(7PUMrm%cdbsK8>9UmW z7OIz9u0Oi3)!S`WAGcF|-5zm3uug~5jQ$XXGz3u^iYgk0+WIRR>ThVK;b^0e&_RJ< zjZPcce=NfF2})@kVl^JkH36-afwwggBQ*&VG#OJh1=BSHt27fkGz*87g_D|%^ZFE* z^%?H#b3D`>mevyo-y}#}ol+gxM)kaiP zHfm~4RoB1{U5H4yn%I+gLR4@>NNizp)(w-vz(%HoS}=%(xuG2ZWm*&d93SR ztQ%g1pOK)OXrWtZuiNORJLsXiNY}mKqg1hep4asOBJ``@{?Kdt$ZPx9Yx~51!Bem8 zGmJ1`jS<-<>@q`+xnNxPXx0fqVJm>*7K(}%hL@}$>R2H(vT!6>VGOe(SZPJE&R)P) zi@GlVfDGlVnb XGDI*GFhnv`FvKv_GsI2qWJ?498WJ?4952p@J diff --git a/bin/app/evaluate$2.class b/bin/app/evaluate$2.class index 64d7395c86b238a44c37dcdc59a25b2efa0439e1..ab19070cb2385f5995aec6ef3174fcce2fbe4264 100644 GIT binary patch delta 31 mcmcb`ev5qr8#80tWOn9s-b@B|hAakdh8zZdhWyFZ%<%w!MF%qg delta 31 mcmcb`ev5qr8#814WOn9s-XsQghGYhAhExWAhK$M8%<%wya0d_o diff --git a/bin/app/evaluate.class b/bin/app/evaluate.class index e0028baf8d268e0e508dffcf7c6e04dffc9d6f93..72b4a8436205563cc3dbad44e98634532aacfc7e 100644 GIT binary patch literal 10598 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 literal 9997 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 EKMOJo6aWAK diff --git a/bin/app/mainApp.class b/bin/app/mainApp.class index efe59e1c8c5227199fc367bc9ed176dda384a59d..9d2f758b5cffbd32d332120399a772b35273a86b 100644 GIT binary patch delta 257 zcmXAize_@K6vaQ!M0sDuH`4m{Yj8H|4+Z0yiNcpOlLR1?_JA1+8lIcnbaj z4o=Y$y|N#swKt0Q*|~7ex%VFK^-}JR8ZG)mpulfO{h8S?uLe=8TFsT~R>ihzWras7 z%)5c&FM420S~w4DcM@+WGa3=EUKn zBk46V!n-KpGa}e%&e`UIJsRX`amXb_t~lbFV{XVwGV%Y314;NO@yQnkQ}H2!dQ->c Z^0#yWX3RykxTL5L7vd}PBOF>S+$G=%ImiG2 delta 383 zcmYL@%P#{_7{z~6LT8jnNlCn#*cc6^J1cCgSV=5wWN^jAq@>e|$3l>h*ftjY0TRoW zv?+;=*pOI>1@V5>`?0VTx4Lj{@}2XY@7#O8RP}j{w*RxW1GMlJ)4o+*rHl&~msBW} z4w(bPrU&i)&Dci&Xe6wW-q5v%T=fKpJYYrpiYjN?;&@gmh;!&ZN^rc* zX_B)z=POz7N_zi^o4>?el85?D0tpU$3HGGiSVP?=o#ZJdAI_mp)&MS9Z3>9sW`Zgv z@i9d+)3h>67jtwY=ILbt!6G9pq01|t>~=KCXa*L~yrA$ZwUaz|c}bzGSbp**dk61) UNOntADLI2wmiUyM_vfd60ne#qYybcN diff --git a/bin/evaluate.png b/bin/evaluate.png index e7422ad181d5d7fcfa6d48d286039ed49bfb4da1..47a4da8ba164bde3667a53a65fa66cc3cc07641c 100644 GIT binary patch delta 2080 zcmV+*2;cXX2E-5{iBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hmj#Xe+SV? zL_t(&fz_CMP*v9z#(xLjnjjbiAK(L=2^v#_cJR>#(Ue-z)}+4Ls*PG5tF*V&~-G0F%1dm3himnT;@_nSxr+jAlkd5h*Dp? z`3ObmvM#Hqde*j$X$V~(ETX#TLm!TFoWmUEJm-BpnwMuFTG6_rJ9?x?e+pBWBcBG% zfKLU)Dputxmn40l51jdVSHOgVmPSDD}nWO14a-*CYiLN6#yqW$!6;J0_p=l0PWlvjA5*) zZ7jG|!n%U5NM4b~{B6@{da()o59kNX2mTCvYxQqI3(`sFC0+tRhy)TaWA?28Dk}#7 zEo}|gZkLdB^-Jcx^LGrxVCK~KS&%l3CjFYgJzzKB4=l3wSGN?vni|Y8Dz+Hca8+;p*SNzf2~Rf6Ou~Mll}ei{}s^!5u*d z#}e*wcT&PHb^ZEvrT%k<%5odkAzyPB??VZ51}P&WLx7T#la;LGdL_K)6d=KJaI~cq zrQ9YkJ|T+r+;`c>7Td?dm^3HG;9!_O z9lrSnwrr_we?4qKjN@uF2r}2^F>a5E3dhUk8A5|iOdhz4h|njPLQLF$>ptA^n7?zh zYX`Zxuw)6Oq(FRpZI2hgRXN=n4*d;=ZH32AU60i%#KiAk-$Up4$4~;q1D;PpT?7Te z{{8Us%htAb?Hszg-VX%8p~WzK6FhMvA~MWG%19W5g0SBBpn>#{g zB8=P!CN~AQIe9Rsw#W(#l=!&q^FtqG`Kq4wFv11v~^}~y_)bbr&yVsKqtd>B>tTa z<=GJPr&&Z!SxFO`*gM?11+lSk;ezWxR^%Db+f!$!2n(U-l980Un+2UjDYH?Qzai!2 zf7!ozvss!jp}w`yY4F0qR^d&~56&ce#WMH4<0e4iG=FmMerInm3`k0XK7HyvzE@7> zUa#QxkW5(afru$%%gFy?7AKA$f-0NL7!Uw^_u6M*58$<<#a>U~7n!hjm3!YQL$8v% zb0Vi>`$1}|)zG#r95?{oyL&vYSI@^OAoZ{=r6Cll|o(>MS z)I#Cm9*ybs!`*x$HxYKcVdm1L@vvu))essA2M9Yq5d#(q-71%pi?Kv$$<_|c8=BX+3|YJsJDsy)mAoTcXaBLe|H{I z_xEAM#JQ9_eF~#S!J$J|hi=_0Yr@H1z-th!vHM4l9{nuK=47R7B)}=y!45 zB}t{FrTQ#1)YA9G7o}sz?DIrko~7O6Qlg;(^7HMIRQAZ9Yx7Ji`TTVB+czTYI4+Ni zv-S@NkWQVl7cq6JPX#2|1<%Q`e`eS@b0kn!07{#WuJ1-;28OD#vQm;%rg8-;QtfZ| zP?2qnpdjhoIjaC$ftLG}HwC<}+Ji4#C=DBCH|Wj)6x*YvzC3zVX0zF%QD${jU!nF| z92aU&GB8kDus|9y!ci%a0q%-9&jq}OWlG(~s{p=e-kh^xVN^v%64<{#b~&@ZWk<^l z2B!w|-*IO>9rlj~BsYMzJ?eZ$9^O|$O9!-9{Fs|6T>xq_R| zdD5mzkjb^rL&2x2J`(~jeL}T__yHZEcERtB(A+S<%>mC34F3l@^7?!Un;m=r0000< KMNUMnLSTYK%JX&r delta 744 zcmV}hekjvwRPTQlZ+IE#DFIq&Z|_kGWMxUkI@#Lkd* z;4aV!q+@0mfY-on0=`vDhwMgXe=u1K3~aJVWVmwi5a41`@w93C?6cl_ktL)yi9{-9 zyeWy38ftjTQ^px*fdzmJuqVmd9Z4pYvpVW{#Vb;z7-8hE*H;9PBE=9xoZ$?oIgMC} zyAmeXqZsdX?}oVd+pp??1Eun!xvBuqd}gh+EAG#F)@7HScRtGee*%b0f5H{}%x50( zfPjEq>|%fcQl#jmmpSJCeUoKv)fYJAA@k;a=}VvcT-8xW%N@LihxYW87C(4UCnvQ~h#||^KKsKx6SST_xqit<#cbduQ=x8{;w50p@M`MlE05~aVU!T5z zukG!n6E2g{!9jiVK1S>66mk`duY$N=_72$C^TPS0{u5ot!g1gP;U7;q`wF}b;8Rk7 aZMWat&_CxnE(oFk0000 + viewBox="0 0 12.7 12.7" + height="48" + width="48" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="base" + inkscape:pagecheckerboard="0" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-midpoints="true" + inkscape:object-paths="true" + inkscape:snap-global="false"> + position="-2.471617e-08,4.4381936" /> + @@ -54,46 +69,92 @@ image/svg+xml - + inkscape:label="Calque 1" + transform="translate(-0.92013353,-0.34176359)"> + id="g919" + transform="matrix(2.0256057,0,0,2.085527,3.6658321,-4.3064178)" + style="stroke-width:0.772273"> - + style="fill:#ff0000;fill-rule:evenodd;stroke-width:0.0501977;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.0573248" + rx="0.5800662" /> - + style="fill:none;stroke:#ffffff;stroke-width:0.436334;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + + + + + + + + + + + diff --git a/bin/evalwriter.svg b/bin/evalwriter.svg index d539367..c4adf04 100644 --- a/bin/evalwriter.svg +++ b/bin/evalwriter.svg @@ -1,37 +1,24 @@ + width="48" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - + inkscape:guide-bbox="true" + inkscape:pagecheckerboard="0"> image/svg+xml - @@ -168,41 +146,50 @@ y="83.64991" ry="2.5985754" /> - + id="g3916" + transform="matrix(12.151193,0,0,12.151193,-148.91629,70.970167)" + style="stroke-width:0.768356"> + style="fill:#ffaaaa;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 17.348583,0.95935787 -0.754518,-0.8270232 c -0.268896,-0.002875 -0.502454,-0.0608291 -0.917307,0.1638007 -0.4601,0.3530892 -0.68116,0.6506762 -0.877185,0.94245073 -0.17669,0.3432441 -0.139712,0.5859875 -0.100073,0.8274788 l 0.801458,0.761569 z" + id="path1605" + sodipodi:nodetypes="ccccccc" /> + id="path903" + d="m 18.286926,1.8124245 0.989256,-0.6558316 c 0.804095,1.2322882 0.673903,1.9306982 2.412766,3.6971397" + style="fill:none;stroke:#000000;stroke-width:0.379568;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + sodipodi:nodetypes="ccc" /> + + + + + + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 26.491378,12.121819 -0.924862,-0.25883 c 0.276834,-0.388494 -0.747363,-1.194931 0.483177,-1.058882 z" + id="path3258" + sodipodi:nodetypes="cccc" /> - diff --git a/bin/resources/evaluate.png b/bin/resources/evaluate.png index e7422ad181d5d7fcfa6d48d286039ed49bfb4da1..47a4da8ba164bde3667a53a65fa66cc3cc07641c 100644 GIT binary patch delta 2080 zcmV+*2;cXX2E-5{iBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hmj#Xe+SV? zL_t(&fz_CMP*v9z#(xLjnjjbiAK(L=2^v#_cJR>#(Ue-z)}+4Ls*PG5tF*V&~-G0F%1dm3himnT;@_nSxr+jAlkd5h*Dp? z`3ObmvM#Hqde*j$X$V~(ETX#TLm!TFoWmUEJm-BpnwMuFTG6_rJ9?x?e+pBWBcBG% zfKLU)Dputxmn40l51jdVSHOgVmPSDD}nWO14a-*CYiLN6#yqW$!6;J0_p=l0PWlvjA5*) zZ7jG|!n%U5NM4b~{B6@{da()o59kNX2mTCvYxQqI3(`sFC0+tRhy)TaWA?28Dk}#7 zEo}|gZkLdB^-Jcx^LGrxVCK~KS&%l3CjFYgJzzKB4=l3wSGN?vni|Y8Dz+Hca8+;p*SNzf2~Rf6Ou~Mll}ei{}s^!5u*d z#}e*wcT&PHb^ZEvrT%k<%5odkAzyPB??VZ51}P&WLx7T#la;LGdL_K)6d=KJaI~cq zrQ9YkJ|T+r+;`c>7Td?dm^3HG;9!_O z9lrSnwrr_we?4qKjN@uF2r}2^F>a5E3dhUk8A5|iOdhz4h|njPLQLF$>ptA^n7?zh zYX`Zxuw)6Oq(FRpZI2hgRXN=n4*d;=ZH32AU60i%#KiAk-$Up4$4~;q1D;PpT?7Te z{{8Us%htAb?Hszg-VX%8p~WzK6FhMvA~MWG%19W5g0SBBpn>#{g zB8=P!CN~AQIe9Rsw#W(#l=!&q^FtqG`Kq4wFv11v~^}~y_)bbr&yVsKqtd>B>tTa z<=GJPr&&Z!SxFO`*gM?11+lSk;ezWxR^%Db+f!$!2n(U-l980Un+2UjDYH?Qzai!2 zf7!ozvss!jp}w`yY4F0qR^d&~56&ce#WMH4<0e4iG=FmMerInm3`k0XK7HyvzE@7> zUa#QxkW5(afru$%%gFy?7AKA$f-0NL7!Uw^_u6M*58$<<#a>U~7n!hjm3!YQL$8v% zb0Vi>`$1}|)zG#r95?{oyL&vYSI@^OAoZ{=r6Cll|o(>MS z)I#Cm9*ybs!`*x$HxYKcVdm1L@vvu))essA2M9Yq5d#(q-71%pi?Kv$$<_|c8=BX+3|YJsJDsy)mAoTcXaBLe|H{I z_xEAM#JQ9_eF~#S!J$J|hi=_0Yr@H1z-th!vHM4l9{nuK=47R7B)}=y!45 zB}t{FrTQ#1)YA9G7o}sz?DIrko~7O6Qlg;(^7HMIRQAZ9Yx7Ji`TTVB+czTYI4+Ni zv-S@NkWQVl7cq6JPX#2|1<%Q`e`eS@b0kn!07{#WuJ1-;28OD#vQm;%rg8-;QtfZ| zP?2qnpdjhoIjaC$ftLG}HwC<}+Ji4#C=DBCH|Wj)6x*YvzC3zVX0zF%QD${jU!nF| z92aU&GB8kDus|9y!ci%a0q%-9&jq}OWlG(~s{p=e-kh^xVN^v%64<{#b~&@ZWk<^l z2B!w|-*IO>9rlj~BsYMzJ?eZ$9^O|$O9!-9{Fs|6T>xq_R| zdD5mzkjb^rL&2x2J`(~jeL}T__yHZEcERtB(A+S<%>mC34F3l@^7?!Un;m=r0000< KMNUMnLSTYK%JX&r delta 744 zcmV}hekjvwRPTQlZ+IE#DFIq&Z|_kGWMxUkI@#Lkd* z;4aV!q+@0mfY-on0=`vDhwMgXe=u1K3~aJVWVmwi5a41`@w93C?6cl_ktL)yi9{-9 zyeWy38ftjTQ^px*fdzmJuqVmd9Z4pYvpVW{#Vb;z7-8hE*H;9PBE=9xoZ$?oIgMC} zyAmeXqZsdX?}oVd+pp??1Eun!xvBuqd}gh+EAG#F)@7HScRtGee*%b0f5H{}%x50( zfPjEq>|%fcQl#jmmpSJCeUoKv)fYJAA@k;a=}VvcT-8xW%N@LihxYW87C(4UCnvQ~h#||^KKsKx6SST_xqit<#cbduQ=x8{;w50p@M`MlE05~aVU!T5z zukG!n6E2g{!9jiVK1S>66mk`duY$N=_72$C^TPS0{u5ot!g1gP;U7;q`wF}b;8Rk7 aZMWat&_CxnE(oFk0000#(Ue-z)}+4Ls*PG5tF*V&~-G0F%1dm3himnT;@_nSxr+jAlkd5h*Dp? z`3ObmvM#Hqde*j$X$V~(ETX#TLm!TFoWmUEJm-BpnwMuFTG6_rJ9?x?e+pBWBcBG% zfKLU)Dputxmn40l51jdVSHOgVmPSDD}nWO14a-*CYiLN6#yqW$!6;J0_p=l0PWlvjA5*) zZ7jG|!n%U5NM4b~{B6@{da()o59kNX2mTCvYxQqI3(`sFC0+tRhy)TaWA?28Dk}#7 zEo}|gZkLdB^-Jcx^LGrxVCK~KS&%l3CjFYgJzzKB4=l3wSGN?vni|Y8Dz+Hca8+;p*SNzf2~Rf6Ou~Mll}ei{}s^!5u*d z#}e*wcT&PHb^ZEvrT%k<%5odkAzyPB??VZ51}P&WLx7T#la;LGdL_K)6d=KJaI~cq zrQ9YkJ|T+r+;`c>7Td?dm^3HG;9!_O z9lrSnwrr_we?4qKjN@uF2r}2^F>a5E3dhUk8A5|iOdhz4h|njPLQLF$>ptA^n7?zh zYX`Zxuw)6Oq(FRpZI2hgRXN=n4*d;=ZH32AU60i%#KiAk-$Up4$4~;q1D;PpT?7Te z{{8Us%htAb?Hszg-VX%8p~WzK6FhMvA~MWG%19W5g0SBBpn>#{g zB8=P!CN~AQIe9Rsw#W(#l=!&q^FtqG`Kq4wFv11v~^}~y_)bbr&yVsKqtd>B>tTa z<=GJPr&&Z!SxFO`*gM?11+lSk;ezWxR^%Db+f!$!2n(U-l980Un+2UjDYH?Qzai!2 zf7!ozvss!jp}w`yY4F0qR^d&~56&ce#WMH4<0e4iG=FmMerInm3`k0XK7HyvzE@7> zUa#QxkW5(afru$%%gFy?7AKA$f-0NL7!Uw^_u6M*58$<<#a>U~7n!hjm3!YQL$8v% zb0Vi>`$1}|)zG#r95?{oyL&vYSI@^OAoZ{=r6Cll|o(>MS z)I#Cm9*ybs!`*x$HxYKcVdm1L@vvu))essA2M9Yq5d#(q-71%pi?Kv$$<_|c8=BX+3|YJsJDsy)mAoTcXaBLe|H{I z_xEAM#JQ9_eF~#S!J$J|hi=_0Yr@H1z-th!vHM4l9{nuK=47R7B)}=y!45 zB}t{FrTQ#1)YA9G7o}sz?DIrko~7O6Qlg;(^7HMIRQAZ9Yx7Ji`TTVB+czTYI4+Ni zv-S@NkWQVl7cq6JPX#2|1<%Q`e`eS@b0kn!07{#WuJ1-;28OD#vQm;%rg8-;QtfZ| zP?2qnpdjhoIjaC$ftLG}HwC<}+Ji4#C=DBCH|Wj)6x*YvzC3zVX0zF%QD${jU!nF| z92aU&GB8kDus|9y!ci%a0q%-9&jq}OWlG(~s{p=e-kh^xVN^v%64<{#b~&@ZWk<^l z2B!w|-*IO>9rlj~BsYMzJ?eZ$9^O|$O9!-9{Fs|6T>xq_R| zdD5mzkjb^rL&2x2J`(~jeL}T__yHZEcERtB(A+S<%>mC34F3l@^7?!Un;m=r0000< KMNUMnLSTYK%JX&r delta 744 zcmV}hekjvwRPTQlZ+IE#DFIq&Z|_kGWMxUkI@#Lkd* z;4aV!q+@0mfY-on0=`vDhwMgXe=u1K3~aJVWVmwi5a41`@w93C?6cl_ktL)yi9{-9 zyeWy38ftjTQ^px*fdzmJuqVmd9Z4pYvpVW{#Vb;z7-8hE*H;9PBE=9xoZ$?oIgMC} zyAmeXqZsdX?}oVd+pp??1Eun!xvBuqd}gh+EAG#F)@7HScRtGee*%b0f5H{}%x50( zfPjEq>|%fcQl#jmmpSJCeUoKv)fYJAA@k;a=}VvcT-8xW%N@LihxYW87C(4UCnvQ~h#||^KKsKx6SST_xqit<#cbduQ=x8{;w50p@M`MlE05~aVU!T5z zukG!n6E2g{!9jiVK1S>66mk`duY$N=_72$C^TPS0{u5ot!g1gP;U7;q`wF}b;8Rk7 aZMWat&_CxnE(oFk0000 + viewBox="0 0 12.7 12.7" + height="48" + width="48" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="base" + inkscape:pagecheckerboard="0" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-midpoints="true" + inkscape:object-paths="true" + inkscape:snap-global="false"> + position="-2.471617e-08,4.4381936" /> + @@ -54,46 +69,92 @@ image/svg+xml - + inkscape:label="Calque 1" + transform="translate(-0.92013353,-0.34176359)"> + id="g919" + transform="matrix(2.0256057,0,0,2.085527,3.6658321,-4.3064178)" + style="stroke-width:0.772273"> - + style="fill:#ff0000;fill-rule:evenodd;stroke-width:0.0501977;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.0573248" + rx="0.5800662" /> - + style="fill:none;stroke:#ffffff;stroke-width:0.436334;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + + + + + + + + + + + diff --git a/icons/evalwriter.svg b/icons/evalwriter.svg index d539367..c4adf04 100644 --- a/icons/evalwriter.svg +++ b/icons/evalwriter.svg @@ -1,37 +1,24 @@ + width="48" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - - - - - + inkscape:guide-bbox="true" + inkscape:pagecheckerboard="0"> image/svg+xml - @@ -168,41 +146,50 @@ y="83.64991" ry="2.5985754" /> - + id="g3916" + transform="matrix(12.151193,0,0,12.151193,-148.91629,70.970167)" + style="stroke-width:0.768356"> + style="fill:#ffaaaa;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 17.348583,0.95935787 -0.754518,-0.8270232 c -0.268896,-0.002875 -0.502454,-0.0608291 -0.917307,0.1638007 -0.4601,0.3530892 -0.68116,0.6506762 -0.877185,0.94245073 -0.17669,0.3432441 -0.139712,0.5859875 -0.100073,0.8274788 l 0.801458,0.761569 z" + id="path1605" + sodipodi:nodetypes="ccccccc" /> + id="path903" + d="m 18.286926,1.8124245 0.989256,-0.6558316 c 0.804095,1.2322882 0.673903,1.9306982 2.412766,3.6971397" + style="fill:none;stroke:#000000;stroke-width:0.379568;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + sodipodi:nodetypes="ccc" /> + + + + + + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 26.491378,12.121819 -0.924862,-0.25883 c 0.276834,-0.388494 -0.747363,-1.194931 0.483177,-1.058882 z" + id="path3258" + sodipodi:nodetypes="cccc" /> - diff --git a/icons/fichierAnalyse.png b/icons/fichierAnalyse.png new file mode 100644 index 0000000000000000000000000000000000000000..1cbea180e4e7eb929c57979a54b93dc8438ad098 GIT binary patch literal 2764 zcmV;-3N!VIP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H13Ry`+ zK~!jg?U`$El+_u>e`mAV+!JzJE^>zkBTOn#KnVg$3~c}u!uvdRf;1O zL?&LqS^?2Ij2CQhpmMJhNP*&rw1l8Q2!WJfAYmaP+0ABm-=`mT_uYLHl57&D^+V6h z?mq8%&*lF==eeBcEd0OxZ;J|k=>1;#7*OL8Woo^P7WAX}o&t3mo^o?j%wI1&+s6^y ztNWWLrX%zKkGI0(?cmW{ctC~it66;e=}r;o^KQj3F=@wu*1?M)2ndL)2~YhMwAxFE z%ZZ9hCM@2HvP2>xr%a;Vd-0i}6#(7eC>{vvjEE@XINq^95D^fms#!9!7fMN}1k5_N zFzqJ@rrVM&OzabR1MuLeucdg;7ET`A!`UN6xSWkGnnm|b$8_uXArTo_2X1-$*x1U2 zKfPcM53hAKxoSbWd2x$(KoP`8z(=Y_|CjegoP(AFw?_cq$`7|%cz$%Ep;1Fa18df- z;hooC$7Zv&IiS7bd#L!H`n~J>L=2tqUDTMI$(2v1AF#erJQ+=Pix3w8?%ev~H51`lu66;eLyy^pfQa6=AQBe`u+1XsZdR4C*J9aFK7A+zxD~s6JSl`Nd zi>7HDJ$jT)n>Mk2{RWzvoQS(gNp;1Wrs%lz%S(pOPhIuxWPzQC#N5yhI#_OKup+{# zQ>Vzu$p5jiNIIm#deI z{JSPvj)*iOy6zL$k**N%8I|2`XZrN%y1ow{Jeb3W4>M!N3>|E9@Xh7Eef#p&?j6kf z<&yyt4OfO`d@C_j3=jU_!wAURcB_*+K+cpLb8gxUj z{^uLXX0w?O-+PC<@1Gi2Ah&Z<>~kMkZND9}Thp{0g*bJC?%ED`Km^CNE396uIOBnqeCnV zDkLJD+P96mx;g+xjT*(n4?o;#@ct4P7ss-tFX_*&lEVJV~Os8#moZbC2>j9 z_!A2!J3B%^_d*^(iBNiQm;Q3@+_?rYtpN;$NN#Q}d3kv_91h(7K7psMW{fE|X;;c? z2kxuM8@CzQ+!5gZ64(K^SA{MV9|k}v#gr*iLIT*99r)##m>4EboapPMVZKld$er#+ z*_FDiFt#(`jRXLXy%txa9e|XS6s%TjyWl$_`)vu}k-l!C%nFo@b*iwPoh4x)pw(6D zvejx0$z66t?$M)%{%mnvWmC=|qRa{<+Bhd_NB8G;$8>>!2P{$gQ+<8CVe!50B|~;96EF;B=DiiMMXt=T}DQRPH;m1 zc#8BSwrc66|CoHl9XB7@YZlPGIB4jodT)*UUfU3V`>W9OvDh z#6!0xFtebXA*nHXe|_ae{{n>LZ!OiQ8Iv^?v)LQ~-)wO@O+ZBGHFP8sCQM-e{{7hP zc0OGBJO|f(gi>DB^sjDwL>QHIO{80+>1FjE6O^M4aXTR{)iBBVgWLJxs8=18Ns&G0 zsb=7VcA?V*Jc0Cj#flYVW@aKHY}>k(>X;W9H)nA`O$0J~N7FaKsIIR49}ulMXu9`V zFnix!DJy3GYxDIs!>3H8XP*Hrqr2RMd_Y7HO=HA}5iDIA*z$jTyoQ3+FHl-zr_9zw zsjZPK4mbX7H!1LZw-0yK8N^XX^w%F@5;x~RU(NOfS-2bx0L0%ikRiFR80Is`T~BBN z`DtEW9=W->`kS+RKc;-uqs)mu$;a9K$i1x_B0{)HkQAVzJV>yYR~KHK;%0L8_{WM^k%whmzQ#4K_q zWm0?5#5c!3;i{vCW5?^Ls63DD(p5A~YcZL-$;qDOa~ae9L+%-HKc=cGv~JxXB7%Ss zcPI=5igne|nJKHjm1nk>iNoO#yWK8!yIm@6*JZ)Vccojh)xSicf0Pn)`Vi?pGgHD7 z!u9%y$S5gUyH>Q+RB5{VZn0HX%D`9lNc55~g#|kzI)b}JN~txAo|*`E+&6>#ZHIVd z!3!jJ@74aOVd0pEO(OD%w@{OoQIk3knY0j7f_HW24Nl{>#fwqZ)r1!o68qR=M7kQg z>P9_28!~!_bJv{YeO2kz(LOVXe0CbC7fZ>gKTe{vnlF!*A+9D&(FvFmQn2*Pz|t=R zB4doXZqMFm14c7o>+9s7Ie~Hp@|N(zLf)&WWyZ7@a1h-&0&Wl98$B@^*zoRAoSdI- zAO*t^$=2J1oL<^_HYBXG%0x+)ZD4V}n&hfM{v~4Fp_XV3J!?BH8+j zv`(dw?OllJ$^P=?e0J;yp7>^ahe@5rlK?{l({c%v2EiwKg2bSAA&jLIHSX&0gM2=#$=^o2 zyYO}^Bu)Xt+93DiC<01gO<>;;fl`5V=yU@5-z~nKSP58xJ-`;#ft=w-UH$|0pJ#CS S33UDd0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/open.svg b/icons/open.svg new file mode 100644 index 0000000..69a5a63 --- /dev/null +++ b/icons/open.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/open2.png b/icons/open2.png new file mode 100644 index 0000000000000000000000000000000000000000..a50d959a4a643feb5aac04f7a8b8caedea76e1c9 GIT binary patch literal 1627 zcmV-h2Bi6kP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11?Wjc zK~!jg?U`##Q)e8;p92L7L8QWvCP<i;7%=%(7DyEm|&8XoXVXaQ1}~F74@Q3+_vQpWe&= z{lCw1&UxSWoEC85!i5VLPCx(vP18iB8YgK2N#+h3a3g@FQ&kgyYpG$xbqD4Mh>MGh z=kxgyMx${=uh)|bg`x()g!A&J3{;TxVGt;05uC9rjJU%lu}~Fb#;(!iW^6n2j4Zu1ZNs`Q^xw zBZ+)I--9VuDwXz@mX_WuE-pR^2k!_606<_lXxqUA0e`0c^z`)PoSdAW_Uzdc!DjOK z`1qi>xVVDAz`)3|va)?09Uc8_#?8dd-T~GS3WbUJ`T1AaiZ{dMa&hL&ndGBKkBXwB zql4|8cR>uq#>R%_=H_1BzI}U$BjX8zKtVylhV1O@n*hA+8Vdjwope8F1h9yo0AQHe zKu=Dhv%b_f|6mT|^Uel}qEJ{^c<222^Lqg{54HUU=An{T;Xv9}EcNpP02mAgh{O_T z2S+hVb1*(Z!PC`VI$q3gqlgV2u0b(yh^ZKAEpU5CA}NIM`+?TI-XLkWkpv)YLDLNKUg_ z11|=FXKyWZ@FFohYPWs>zNk|hkz*t3cy_y`q1a*qOZBo-roMeT(-IDq_0?>D0brRx>4Z z8h~1W%TH(?A&l-qR3Pxh-t~xz$Z$B9N~My`tXnlOG66i%Iy}!T{KtE6V)uvG5)Ew>x60*m>C85Z2F55r@y4mS z=JAfd1>ZmM!HsgU!#PNje1JK7ibVsDwZO=@!}C~WG-w@ue!db#*UN1O&q1rzQZkwB z-rV+i1}GYM(Cwf?7EJP1;pV$dIPt>`&@}rUqN=K@O(K!h&TXG(ptTnmbm;ZK4*dA2 z^~=E5MSoy?oZYQftJN}CIFe==paC>!7DS>=2rpkK0yFXDx4%JeFfhjU_xDfA2P zeX|Ux-U2A6I`4 z+VIT0vuDp9uB)q?UWt{Jm8zPWnt9u&84dvS4#QnFU@hc5L8GoUmr%3m9bpXDbD;@wylGK1fJTPS- z!XNv1+=cnW!5-WQAYvILmlB9`j^-fDg~I#v65|MB7DgI7C=Yc1`Uye4&pBPVaN%NM Z`46UAE>6&b1rY!M002ovPDHLkV1o161=j!o literal 0 HcmV?d00001 diff --git a/src/MEPTL/commandes.java b/src/MEPTL/commandes.java index 836f5ae..dcf48d7 100644 --- a/src/MEPTL/commandes.java +++ b/src/MEPTL/commandes.java @@ -107,7 +107,7 @@ public class commandes { //** Variables pour l'interface du logiciel public static String Titre = "analyseWriter"; public static String filename=""; - public static boolean fichierAnalyseValide = false; + public static boolean fichierAnalyseValide = false; //mise à jour de la valeur dans MEPTL.verificationFichierAnalyse public static String Annee ="2022"; diff --git a/src/MEPTL/meptl.java b/src/MEPTL/meptl.java index 789db65..5b334c7 100644 --- a/src/MEPTL/meptl.java +++ b/src/MEPTL/meptl.java @@ -2019,54 +2019,55 @@ public class meptl { boolean flagError = Boolean.valueOf(erreurs.getAttributs().get("oneError")); if(!commandes.fichierStudentMoodle) { - Text.append("\t Dossier analysé : " + ouverture.getAttributs().get("dossier")); + Text.append("\n Dossier analysé : " + ouverture.getAttributs().get("dossier")); System.out.println("\t Dossier analysé : " + ouverture.getAttributs().get("dossier"));} else { - Text.append("\t Fichier analysé : " + ouverture.getAttributs().get("dossier")); + Text.append("\n Fichier analysé : " + ouverture.getAttributs().get("dossier")); System.out.println("\t Fichier analysé : " + ouverture.getAttributs().get("dossier"));} if(notation.getAttributs().get("baremeABC").equals("true")) { - Text.append("\t Note : " + notation.getAttributs().get("noteABC")); + Text.append("\n Note : " + notation.getAttributs().get("noteABC")); System.out.println("\t Note : " + notation.getAttributs().get("noteABC")); }else { - Text.append("\t Note : " + notation.getAttributs().get("note") + "/" + ouverture.getAttributs().get("notefrom")); + Text.append("\n Note : " + notation.getAttributs().get("note") + "/" + ouverture.getAttributs().get("notefrom")); System.out.println("\t Note : " + notation.getAttributs().get("note") + "/" + ouverture.getAttributs().get("notefrom")); } if(flagError) { - Text.append("\t ERREUR dans le fichier de l'étudiant."); + Text.append("\n ERREUR dans le fichier de l'étudiant."); System.out.println("\t ERREUR dans le fichier de l'étudiant."); if(Boolean.valueOf(erreurs.getAttributs().get("manqueHistorique"))) { - Text.append("\t Erreur : Il n'y a pas d'historique dans le fichier.Peut être que le fichier n'a pas été modifié ou il a été réïnitialisé par l'étudiant."); + Text.append("\n Erreur : Il n'y a pas d'historique dans le fichier.Peut être que le fichier n'a pas été modifié ou il a été réïnitialisé par l'étudiant."); System.out.println("\t Erreur : Il n'y a pas d'historique dans le fichier.Peut être que le fichier n'a pas été modifié ou il a été réïnitialisé par l'étudiant."); } if(Boolean.valueOf(erreurs.getAttributs().get("manqueCreationDate"))) { - Text.append("\t Erreur : Ce n'est pas la bonne date de création du fichier. Le fichier a été réïnitialisé ou ce n'est pas le fichier de l'évaluation."); + Text.append("\n Erreur : Ce n'est pas la bonne date de création du fichier. Le fichier a été réïnitialisé ou ce n'est pas le fichier de l'évaluation."); System.out.println("\t Erreur : Ce n'est pas la bonne date de création du fichier. Le fichier a été réïnitialisé ou ce n'est pas le fichier de l'évaluation."); } if(Boolean.valueOf(erreurs.getAttributs().get("manqueValeurCreationDate"))) { - Text.append("\t Erreur : Ce n'est pas la bonne date de création du fichier."); + Text.append("\n Erreur : Ce n'est pas la bonne date de création du fichier."); System.out.println("\t Erreur : Ce n'est pas la bonne date de création du fichier."); } if(Boolean.valueOf(erreurs.getAttributs().get("manqueMetaSujet"))) { - Text.append("\t Erreur : La propriété personnalisé \"Sujet\" a été supprimé dans le fichier de l'étudiant."); + Text.append("\n Erreur : La propriété personnalisé \"Sujet\" a été supprimé dans le fichier de l'étudiant."); System.out.println("\t Erreur : La propriété personnalisé \"Sujet\" a été supprimé dans le fichier de l'étudiant."); } if(Boolean.valueOf(erreurs.getAttributs().get("manqueValeurMetaSujet"))) { - Text.append("\t Erreur : La propriété personnalisé \"Sujet \" a été modifié par l'étudiant.\nLa valeur de cette propriété personnalisé dans le fichier de l'étudiant est \"" + ouverture.getAttributs().get("metaSujet")+"\".\nCe n'est pas la valeur correct."); + Text.append("\n Erreur : La propriété personnalisé \"Sujet \" a été modifié par l'étudiant.\nLa valeur de cette propriété personnalisé dans le fichier de l'étudiant est \"" + ouverture.getAttributs().get("metaSujet")+"\".\nCe n'est pas la valeur correct."); System.out.println("\t Erreur : La propriété personnalisé \"Sujet \" a été modifié par l'étudiant.\nLa valeur de cette propriété personnalisé dans le fichier de l'étudiant est \"" + ouverture.getAttributs().get("metaSujet")+"\".\nCe n'est pas la valeur correct."); } if(Boolean.valueOf(erreurs.getAttributs().get("manqueInitialCreator"))) { - Text.append("\t Erreur : La propriété personnalisé \"Sujet\" n'est pas correct."); + Text.append("\n Erreur : La propriété personnalisé \"Sujet\" n'est pas correct."); System.out.println("\t Erreur : La propriété personnalisé \"Sujet\" n'est pas correct."); } } + Text.append("\n"); System.out.println(); return Text; diff --git a/src/MEPTL/verificationFichierAnalyse.java b/src/MEPTL/verificationFichierAnalyse.java index ed196c0..7bfa506 100644 --- a/src/MEPTL/verificationFichierAnalyse.java +++ b/src/MEPTL/verificationFichierAnalyse.java @@ -148,7 +148,12 @@ public class verificationFichierAnalyse { } - if(!erreur) commandes.fichierAnalyseValide = true; + // Mise à jour de la variable fichierAnalyseValide + if(!erreur) { + commandes.fichierAnalyseValide = true; + }else { + commandes.fichierAnalyseValide = false; + } } @@ -198,8 +203,7 @@ public class verificationFichierAnalyse { erreur=true; } } - - + // le node fichier doit contenir l'attribut metaSujet et une valeur non vide if(attribut.get("metaSujet")==null) { messageErreur.append("\n**-** Erreur dans le fichier d'analyse, dans le node ."); @@ -258,7 +262,7 @@ public class verificationFichierAnalyse { if(attribut.get("baremeABC")!=null) { String p = attribut.get("baremeABC"); - if(!p.equalsIgnoreCase("true")||!p.equalsIgnoreCase("false")) { + if(!(p.equalsIgnoreCase("true")||p.equalsIgnoreCase("false"))) { messageErreur.append("\n**-** Erreur dans le fichier d'analyse, dans le node ."); messageErreur.append("\nL'attribut \"baremeABC\" n'a pas une valeur logique."); messageErreur.append("\nVoir la documentation d'analyseWriter."); @@ -271,7 +275,7 @@ public class verificationFichierAnalyse { if(attribut.get("controleDateCreation")!=null) { String p = attribut.get("controleDateCreation"); - if(!p.equalsIgnoreCase("true")||!p.equalsIgnoreCase("false")) { + if(!(p.equalsIgnoreCase("true")||p.equalsIgnoreCase("false"))) { messageErreur.append("\n**-** Erreur dans le fichier d'analyse, dans le node ."); messageErreur.append("\nL'attribut \"controleDateCreation\" n'a pas une valeur logique."); messageErreur.append("\nVoir la documentation d'analyseWriter."); @@ -284,7 +288,7 @@ public class verificationFichierAnalyse { if(attribut.get("presenceMetaSujet")!=null) { String p = attribut.get("presenceMetaSujet"); - if(!p.equalsIgnoreCase("true")||!p.equalsIgnoreCase("false")) { + if(!(p.equalsIgnoreCase("true")||p.equalsIgnoreCase("false"))) { messageErreur.append("\n**-** Erreur dans le fichier d'analyse, dans le node ."); messageErreur.append("\nL'attribut \"presenceMetaSujet\" n'a pas une valeur logique."); messageErreur.append("\nVoir la documentation d'analyseWriter."); @@ -297,7 +301,7 @@ public class verificationFichierAnalyse { if(attribut.get("controle_Initial_Creator")!=null) { String p = attribut.get("controle_Initial_Creator"); - if(!p.equalsIgnoreCase("true")||!p.equalsIgnoreCase("false")) { + if(!(p.equalsIgnoreCase("true")||p.equalsIgnoreCase("false"))) { messageErreur.append("\n**-** Erreur dans le fichier d'analyse, dans le node ."); messageErreur.append("\nL'attribut \"controle_Initial_Creator\" n'a pas une valeur logique."); messageErreur.append("\nVoir la documentation d'analyseWriter."); @@ -310,7 +314,7 @@ public class verificationFichierAnalyse { if(attribut.get("historiquePresent")!=null) { String p = attribut.get("historiquePresent"); - if(!p.equalsIgnoreCase("true")||!p.equalsIgnoreCase("false")) { + if(!(p.equalsIgnoreCase("true")||p.equalsIgnoreCase("false"))) { messageErreur.append("\n**-** Erreur dans le fichier d'analyse, dans le node ."); messageErreur.append("\nL'attribut \"historiquePresent\" n'a pas une valeur logique."); messageErreur.append("\nVoir la documentation d'analyseWriter."); diff --git a/src/app/evaluate.java b/src/app/evaluate.java index 362edb9..cbbce4a 100644 --- a/src/app/evaluate.java +++ b/src/app/evaluate.java @@ -31,6 +31,12 @@ import MEPTL.meptl; import cXML.Run; import cXML.node; import net.lingala.zip4j.exception.ZipException; +import javax.swing.SwingConstants; +import java.awt.GridLayout; +import javax.swing.JTextArea; +import javax.swing.JScrollPane; +import java.awt.Component; +import javax.swing.Box; public class evaluate extends JFrame { @@ -40,11 +46,12 @@ public class evaluate extends JFrame { private static final long serialVersionUID = 1L; private JPanel contentPane; private JLabel lblPath = new JLabel(); + private JLabel lblFileAnalyse = new JLabel(); private JCheckBox chckbxfichiersEtudaints = new JCheckBox(); private JCheckBox chckbxZipfeedback = new JCheckBox(); private JCheckBox chckbxnoFeedback = new JCheckBox(); private JCheckBox chckbxNoNote = new JCheckBox(); - private JTextPane textPane = new JTextPane(); + private JTextArea textAreaMessage = new JTextArea(); /** * Create the frame. @@ -54,7 +61,7 @@ public class evaluate extends JFrame { setIconImage(Toolkit.getDefaultToolkit().getImage(evaluate.class.getResource("/resources/evalwriter.ico"))); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - setBounds(100, 100, 882, 533); + setBounds(100, 100, 960, 677); contentPane = new JPanel(); contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); setContentPane(contentPane); @@ -63,7 +70,7 @@ public class evaluate extends JFrame { JToolBar toolBar = new JToolBar(); contentPane.add(toolBar, BorderLayout.NORTH); - JButton btnSelectFolder = new JButton("Selection dossier"); + JButton btnSelectFolder = new JButton("Selection dossier d'analyse"); btnSelectFolder.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -86,12 +93,12 @@ public class evaluate extends JFrame { } }); - btnSelectFolder.setIcon(new ImageIcon(evaluate.class.getResource("/resources/open.png"))); + btnSelectFolder.setIcon(new ImageIcon(evaluate.class.getResource("/resources/open2.png"))); btnSelectFolder.setSelectedIcon(new ImageIcon(evaluate.class.getResource("/resources/evalwriter.png"))); - btnSelectFolder.setToolTipText("Sélectionner un dossier (CTRL+O)"); + btnSelectFolder.setToolTipText("Sélectionner le dossier d'analyse (CTRL+O)"); toolBar.add(btnSelectFolder); - JButton btnNewButton = new JButton("Evaluer"); + JButton btnNewButton = new JButton("Evaluer les fichiers des étudiants"); btnNewButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { @@ -103,74 +110,61 @@ public class evaluate extends JFrame { } }); + + JButton btnSelectFileAnalyse = new JButton("Selection fichier analyse"); + btnSelectFileAnalyse.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + new filechooserXML(); + refreshLabel(); + } + }); + btnSelectFileAnalyse.setToolTipText("Sélection du fichier d'analyse"); + btnSelectFileAnalyse.setIcon(new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyse.png"))); + toolBar.add(btnSelectFileAnalyse); btnNewButton.setIcon(new ImageIcon(evaluate.class.getResource("/resources/evaluate.png"))); toolBar.add(btnNewButton); JPanel panel = new JPanel(); contentPane.add(panel, BorderLayout.WEST); - GridBagLayout gbl_panel = new GridBagLayout(); - gbl_panel.columnWidths = new int[]{104, 0}; - gbl_panel.rowHeights = new int[]{14, 0, 0, 0, 0, 0, 0, 0}; - gbl_panel.columnWeights = new double[]{0.0, Double.MIN_VALUE}; - gbl_panel.rowWeights = new double[]{0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Double.MIN_VALUE}; - panel.setLayout(gbl_panel); + panel.setLayout(new GridLayout(0, 1, 0, 0)); + + lblFileAnalyse = new JLabel("Fichier de l'analyse : "); + lblFileAnalyse.setHorizontalAlignment(SwingConstants.LEFT); + lblFileAnalyse.setFont(new Font("Tahoma", Font.PLAIN, 14)); + panel.add(lblFileAnalyse); + lblPath.setHorizontalAlignment(SwingConstants.LEFT); lblPath.setFont(new Font("Tahoma", Font.PLAIN, 14)); lblPath.setText("Dossier de l'analyse : " + commandes.path.substring(commandes.path.lastIndexOf("\\")+1,commandes.path.length()) + ""); - - - - GridBagConstraints gbc_lblPath = new GridBagConstraints(); - gbc_lblPath.insets = new Insets(0, 0, 5, 0); - gbc_lblPath.anchor = GridBagConstraints.NORTHWEST; - gbc_lblPath.gridx = 0; - gbc_lblPath.gridy = 1; - panel.add(lblPath, gbc_lblPath); + panel.add(lblPath); chckbxfichiersEtudaints = new JCheckBox("Les fichiers ne sont pas dans des dossiers nominatifs"); chckbxfichiersEtudaints.setFont(new Font("Tahoma", Font.PLAIN, 12)); chckbxfichiersEtudaints.setToolTipText("Cochez si les fichiers des étudiants ne sont pas dans des dossier nominatifs"); - GridBagConstraints gbc_chckbxfichiersEtudaints = new GridBagConstraints(); - gbc_chckbxfichiersEtudaints.anchor = GridBagConstraints.WEST; - gbc_chckbxfichiersEtudaints.insets = new Insets(0, 0, 5, 0); - gbc_chckbxfichiersEtudaints.gridx = 0; - gbc_chckbxfichiersEtudaints.gridy = 2; - panel.add(chckbxfichiersEtudaints, gbc_chckbxfichiersEtudaints); + panel.add(chckbxfichiersEtudaints); chckbxnoFeedback = new JCheckBox("Pas de feedback"); chckbxnoFeedback.setFont(new Font("Tahoma", Font.PLAIN, 12)); - GridBagConstraints gbc_chckbxnoFeedback = new GridBagConstraints(); - gbc_chckbxnoFeedback.anchor = GridBagConstraints.WEST; - gbc_chckbxnoFeedback.insets = new Insets(0, 0, 5, 0); - gbc_chckbxnoFeedback.gridx = 0; - gbc_chckbxnoFeedback.gridy = 4; - panel.add(chckbxnoFeedback, gbc_chckbxnoFeedback); + panel.add(chckbxnoFeedback); chckbxZipfeedback = new JCheckBox("Zip les feedbacks"); chckbxZipfeedback.setFont(new Font("Tahoma", Font.PLAIN, 12)); - GridBagConstraints gbc_chckbxZipfeedback = new GridBagConstraints(); - gbc_chckbxZipfeedback.insets = new Insets(0, 0, 5, 0); - gbc_chckbxZipfeedback.anchor = GridBagConstraints.NORTHWEST; - gbc_chckbxZipfeedback.gridx = 0; - gbc_chckbxZipfeedback.gridy = 5; - panel.add(chckbxZipfeedback, gbc_chckbxZipfeedback); + panel.add(chckbxZipfeedback); chckbxNoNote = new JCheckBox("Pas de note dans les feedbacks"); chckbxNoNote.setFont(new Font("Tahoma", Font.PLAIN, 12)); - GridBagConstraints gbc_chckbxNoNote = new GridBagConstraints(); - gbc_chckbxNoNote.anchor = GridBagConstraints.WEST; - gbc_chckbxNoNote.gridx = 0; - gbc_chckbxNoNote.gridy = 6; - panel.add(chckbxNoNote, gbc_chckbxNoNote); + panel.add(chckbxNoNote); JPanel panel_1 = new JPanel(); contentPane.add(panel_1, BorderLayout.CENTER); - panel_1.setLayout(null); + panel_1.setLayout(new GridLayout(1, 0, 0, 0)); - textPane = new JTextPane(); - textPane.setFont(new Font("Tahoma", Font.PLAIN, 12)); - textPane.setBounds(30, 28, 495, 412); - panel_1.add(textPane); + JScrollPane scrollPane = new JScrollPane(); + panel_1.add(scrollPane); + + textAreaMessage = new JTextArea(); + scrollPane.setViewportView(textAreaMessage); + textAreaMessage.setText(""); @@ -181,15 +175,42 @@ public class evaluate extends JFrame { private void refreshLabel() { if(!commandes.fichierAnalyseValide) { - textPane.setText(MEPTL.verificationFichierAnalyse.messageErreur.toString()); + textAreaMessage.setText(MEPTL.verificationFichierAnalyse.messageErreur.toString()); chckbxfichiersEtudaints.setEnabled(false); chckbxZipfeedback.setEnabled(false); chckbxnoFeedback.setEnabled(false); chckbxNoNote.setEnabled(false); + }else { + chckbxfichiersEtudaints.setEnabled(true); + chckbxZipfeedback.setEnabled(true); + chckbxnoFeedback.setEnabled(true); + chckbxNoNote.setEnabled(true); + + StringBuilder text = new StringBuilder(); + + text.append("Le titre de l'exercice est " + commandes.analyse_titre); + text.append("\n"); + text.append("Le sujet (metaSujet) est " + commandes.analyse_metaSujet); + text.append("\n"); + text.append("L'auteur de l'exercice est " + commandes.analyse_auteur); + text.append("\n"); + text.append("\n"); + if(commandes.analyse_baremeABC==true) { + text.append("La notation est sous la forme d'un barème alphabétique ABCDE."); + text.append("\n"); + }else { + text.append("La notation est sous la forme d'une note numérique."); + text.append("Le barème est sur " + String.valueOf(commandes.analyse_notefrom)); + text.append("\n"); + } + + textAreaMessage.setText(text.toString()); + } lblPath.setText("Dossier de l'analyse : " + commandes.path.substring(commandes.path.lastIndexOf("\\")+1,commandes.path.length()) + ""); - + lblFileAnalyse.setText("Fichier de l'analyse : " + commandes.filename + ""); + } @@ -294,15 +315,7 @@ public class evaluate extends JFrame { } if(commandes.zipfeedback) { // Dans une archive pour Moodle try { -// long size = 48000000; //valeur par défaut -// String nameZip = "feedbackMoodle"; //nom zip par défaut -// node zip = commandes.sujet.retourneFirstEnfantsByName("zip"); -// if(zip!=null) { -// if(zip.getAttributs().get("size")!=null)size = Long.valueOf(zip.getAttributs().get("size")); -// if(zip.getAttributs().get("name")!=null)nameZip = zip.getAttributs().get("name"); -// } - //a.AddStreamToZip(feedbackForZip(ana, verif), retourneLeNomDuFeedback(a.getLectDossiers().getEC().getListeNomFichierFeedBack().get(i),ana, verif),size,nameZip); - a.AddStreamToZip(feedbacks.feedback(ana, verif, true), meptl.retourneLeNomDuFeedback(a.getLectDossiers().getEC().getListeNomFichierFeedBack().get(i),ana, verif),commandes.analyse_size,commandes.analyse_nameZip); + a.AddStreamToZip(feedbacks.feedback(ana, verif, true), meptl.retourneLeNomDuFeedback(a.getLectDossiers().getEC().getListeNomFichierFeedBack().get(i),ana, verif),commandes.analyse_size,commandes.analyse_nameZip); } catch (ZipException e) { e.printStackTrace(); } catch (IOException e) { @@ -320,7 +333,7 @@ public class evaluate extends JFrame { //** Message dans la console sur l'analyse de l'étudiant ** //********************************************************* textMessage.append(meptl.messageSystem(ana).toString()); - textPane.setText(textMessage.toString()); + textAreaMessage.setText(textMessage.toString()); } } diff --git a/src/app/mainApp.java b/src/app/mainApp.java index 7fb29e1..cfbff36 100644 --- a/src/app/mainApp.java +++ b/src/app/mainApp.java @@ -120,13 +120,11 @@ public class mainApp extends JFrame implements ActionListener{ if(e.getSource()==actCharge) { if(!commandes.console) System.out.println( "Début chargement du fichier d'analyse." ); new filechooserXML(); - if(commandes.fichierAnalyseValide) System.out.println("Le chargement du fichier d'analyse est réussi."); // tree.setModel(utils.getTree().getModel()) ; // textNodeSelect.setText("Le chargement de la nouvelle structure est réussi."); // create.this.MAJToolBar(); - if(!commandes.console) System.out.println( "Fin chargement du fichier d'analyse" ); new evaluate(); frmEvalwriter.dispose(); } diff --git a/src/resources/evaluate.png b/src/resources/evaluate.png index e7422ad181d5d7fcfa6d48d286039ed49bfb4da1..47a4da8ba164bde3667a53a65fa66cc3cc07641c 100644 GIT binary patch delta 2080 zcmV+*2;cXX2E-5{iBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hmj#Xe+SV? zL_t(&fz_CMP*v9z#(xLjnjjbiAK(L=2^v#_cJR>#(Ue-z)}+4Ls*PG5tF*V&~-G0F%1dm3himnT;@_nSxr+jAlkd5h*Dp? z`3ObmvM#Hqde*j$X$V~(ETX#TLm!TFoWmUEJm-BpnwMuFTG6_rJ9?x?e+pBWBcBG% zfKLU)Dputxmn40l51jdVSHOgVmPSDD}nWO14a-*CYiLN6#yqW$!6;J0_p=l0PWlvjA5*) zZ7jG|!n%U5NM4b~{B6@{da()o59kNX2mTCvYxQqI3(`sFC0+tRhy)TaWA?28Dk}#7 zEo}|gZkLdB^-Jcx^LGrxVCK~KS&%l3CjFYgJzzKB4=l3wSGN?vni|Y8Dz+Hca8+;p*SNzf2~Rf6Ou~Mll}ei{}s^!5u*d z#}e*wcT&PHb^ZEvrT%k<%5odkAzyPB??VZ51}P&WLx7T#la;LGdL_K)6d=KJaI~cq zrQ9YkJ|T+r+;`c>7Td?dm^3HG;9!_O z9lrSnwrr_we?4qKjN@uF2r}2^F>a5E3dhUk8A5|iOdhz4h|njPLQLF$>ptA^n7?zh zYX`Zxuw)6Oq(FRpZI2hgRXN=n4*d;=ZH32AU60i%#KiAk-$Up4$4~;q1D;PpT?7Te z{{8Us%htAb?Hszg-VX%8p~WzK6FhMvA~MWG%19W5g0SBBpn>#{g zB8=P!CN~AQIe9Rsw#W(#l=!&q^FtqG`Kq4wFv11v~^}~y_)bbr&yVsKqtd>B>tTa z<=GJPr&&Z!SxFO`*gM?11+lSk;ezWxR^%Db+f!$!2n(U-l980Un+2UjDYH?Qzai!2 zf7!ozvss!jp}w`yY4F0qR^d&~56&ce#WMH4<0e4iG=FmMerInm3`k0XK7HyvzE@7> zUa#QxkW5(afru$%%gFy?7AKA$f-0NL7!Uw^_u6M*58$<<#a>U~7n!hjm3!YQL$8v% zb0Vi>`$1}|)zG#r95?{oyL&vYSI@^OAoZ{=r6Cll|o(>MS z)I#Cm9*ybs!`*x$HxYKcVdm1L@vvu))essA2M9Yq5d#(q-71%pi?Kv$$<_|c8=BX+3|YJsJDsy)mAoTcXaBLe|H{I z_xEAM#JQ9_eF~#S!J$J|hi=_0Yr@H1z-th!vHM4l9{nuK=47R7B)}=y!45 zB}t{FrTQ#1)YA9G7o}sz?DIrko~7O6Qlg;(^7HMIRQAZ9Yx7Ji`TTVB+czTYI4+Ni zv-S@NkWQVl7cq6JPX#2|1<%Q`e`eS@b0kn!07{#WuJ1-;28OD#vQm;%rg8-;QtfZ| zP?2qnpdjhoIjaC$ftLG}HwC<}+Ji4#C=DBCH|Wj)6x*YvzC3zVX0zF%QD${jU!nF| z92aU&GB8kDus|9y!ci%a0q%-9&jq}OWlG(~s{p=e-kh^xVN^v%64<{#b~&@ZWk<^l z2B!w|-*IO>9rlj~BsYMzJ?eZ$9^O|$O9!-9{Fs|6T>xq_R| zdD5mzkjb^rL&2x2J`(~jeL}T__yHZEcERtB(A+S<%>mC34F3l@^7?!Un;m=r0000< KMNUMnLSTYK%JX&r delta 744 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 Z`46UAE>6&b1rY!M002ovPDHLkV1o161=j!o literal 0 HcmV?d00001