MAJ interface graphique

bin/.gitignore

@@ -1,2 +1,3 @@
+/resources/
 /app/
 /MEPTL/

bin/evaluate.svg

@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    inkscape:export-ydpi="96"
    inkscape:export-xdpi="96"
-   inkscape:export-filename="C:\Users\pabr6\eclipse-workspace\evalWriter\icons\evaluate.png"
+   inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\evaluate.png"
    sodipodi:docname="evaluate.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
    id="svg8"
    version="1.1"
-   viewBox="0 0 8.4666665 8.4666669"
+   viewBox="0 0 12.7 12.7"
-   height="32"
+   height="48"
-   width="32">
+   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/">
   <defs
      id="defs2" />
   <sodipodi:namedview
      inkscape:window-maximized="1"
      inkscape:window-y="-8"
      inkscape:window-x="-8"
-     inkscape:window-height="1017"
+     inkscape:window-height="1009"
      inkscape:window-width="1920"
      inkscape:guide-bbox="true"
      showguides="true"
@@ -32,19 +32,34 @@
      inkscape:document-rotation="0"
      inkscape:current-layer="layer1"
      inkscape:document-units="mm"
-     inkscape:cy="15.649515"
+     inkscape:cy="40.32958"
-     inkscape:cx="15.699196"
+     inkscape:cx="42.267337"
-     inkscape:zoom="11.789096"
+     inkscape:zoom="8.2569668"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
      bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base">
+     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">
     <sodipodi:guide
        id="guide14"
        orientation="1,0"
-       position="0.92013351,8.1249031" />
+       position="-2.471617e-08,4.4381936" />
+    <sodipodi:guide
+       position="2.1052607,7.3945287"
+       orientation="-0.7110256,0.70316613"
+       id="guide2079" />
   </sodipodi:namedview>
   <metadata
      id="metadata5">
@@ -54,46 +69,92 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      id="layer1"
      inkscape:groupmode="layer"
-     inkscape:label="Calque 1">
+     inkscape:label="Calque 1"
+     transform="translate(-0.92013353,-0.34176359)">
     <g
-       transform="translate(1.0884882,-0.04488611)"
+       id="g919"
-       id="g850">
+       transform="matrix(2.0256057,0,0,2.085527,3.6658321,-4.3064178)"
+       style="stroke-width:0.772273">
       <rect
-         style="fill:#00ff00;fill-rule:evenodd;stroke-width:0.0649999;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.0573248"
+         ry="0.56339979"
-         id="rect10"
-         width="3.8382711"
-         height="3.7594025"
-         x="0.92013353"
-         y="0.34176376"
-         ry="0.7402463" />
-      <rect
-         ry="0.7402463"
          y="4.3255968"
          x="0.92013353"
          height="3.7594025"
          width="3.8382711"
          id="rect12"
-         style="fill:#ff0000;fill-rule:evenodd;stroke-width:0.0649999;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.0573248" />
+         style="fill:#ff0000;fill-rule:evenodd;stroke-width:0.0501977;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.0573248"
+         rx="0.5800662" />
       <path
-         style="fill:#ffffff;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="fill:none;stroke:#ffffff;stroke-width:0.436334;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 1.593457,2.0535396 C 1.4943041,2.7068656 2.197488,3.3900316 2.5136223,3.4113444 2.8387438,3.3861864 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.1987413,1.5678792 2.4575146,2.8390465 1.9733255,2.8095448 1.9097547,2.360559 1.593457,2.0535396 Z"
-         id="path16"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#ffffff;stroke-width:0.565;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 1.6159,5.0384659 3.9724208,7.4062084"
          id="path841" />
       <path
          id="path843"
          d="M 3.9724208,5.0384659 1.6159,7.4062084"
-         style="fill:none;stroke:#ffffff;stroke-width:0.565;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;stroke:#ffffff;stroke-width:0.436334;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g923"
+       transform="matrix(1.9487365,0,0,2.0063839,0.20283407,0.11078427)"
+       style="stroke-width:0.772273">
+      <rect
+         style="fill:#00ff00;fill-rule:evenodd;stroke-width:0.0501977;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.0573248"
+         id="rect10"
+         width="3.8382711"
+         height="3.7594025"
+         x="0.92013353"
+         y="0.34176376"
+         ry="0.56339979"
+         rx="0.5800662" />
+      <path
+         style="fill:#ffffff;stroke:none;stroke-width:0.20433px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 1.593457,2.0535396 C 1.4943041,2.7068656 2.197488,3.3900316 2.5136223,3.4113444 2.8387438,3.3861864 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.1987413,1.5678792 2.4575146,2.8390465 1.9733255,2.8095448 1.9097547,2.360559 1.593457,2.0535396 Z"
+         id="path16"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+    <g
+       id="g3916"
+       transform="matrix(0.76793268,0,0,0.76793268,-9.9063953,2.901519)">
+      <path
+         style="fill:#ffaaaa;stroke:none;stroke-width:0.264583px;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" />
+      <path
+         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.494;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <g
+         id="g901"
+         style="stroke-width:2.01247;stroke-miterlimit:4;stroke-dasharray:none"
+         transform="matrix(0.11091199,-0.05828884,0.05572328,0.11503563,-3.5922226,-2.4121403)">
+        <path
+           style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.22512;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.22512;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 148.93075,195.27732 -30.23831,-89.30193 20.34727,-6.499823 29.39051,89.301933 z"
+           id="path888"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#e6e6e6;stroke:#000000;stroke-width:0.742976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 118.69244,105.97539 20.34727,-6.499822 3.49123,9.469182 -20.63688,6.48588 z"
+           id="path896"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <path
+         style="fill:#00ff19;fill-opacity:1;stroke:none;stroke-width:0.264583px;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" />
     </g>
   </g>
 </svg>

bin/evalwriter.svg

@@ -1,37 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    inkscape:export-ydpi="128"
    inkscape:export-xdpi="128"
    inkscape:export-filename="C:\Users\pabr6\eclipse-workspace\evalWriter\icons\evalwriter.png"
    sodipodi:docname="evalwriter.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
    id="svg8"
    version="1.1"
    viewBox="0 0 12.7 12.7"
    height="48"
-   width="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/">
   <defs
      id="defs2">
-    <linearGradient
-       id="linearGradient952"
-       inkscape:collect="always">
-      <stop
-         id="stop948"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1" />
-      <stop
-         id="stop950"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
     <pattern
        id="EMFhbasepattern"
        patternUnits="userSpaceOnUse"
@@ -39,21 +26,12 @@
        height="6"
        x="0"
        y="0" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="199.1955"
-       x2="161.70084"
-       y1="203.60699"
-       x1="163.67088"
-       id="linearGradient946"
-       xlink:href="#linearGradient952"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      inkscape:window-maximized="1"
      inkscape:window-y="-8"
      inkscape:window-x="-8"
-     inkscape:window-height="1017"
+     inkscape:window-height="1009"
      inkscape:window-width="1920"
      units="px"
      inkscape:object-paths="true"
@@ -61,10 +39,10 @@
      inkscape:snap-global="true"
      showgrid="false"
      inkscape:document-rotation="0"
-     inkscape:current-layer="g982"
+     inkscape:current-layer="g3916"
      inkscape:document-units="mm"
-     inkscape:cy="6.1574106"
+     inkscape:cy="6.0861963"
-     inkscape:cx="6.3727047"
+     inkscape:cx="-4.7337082"
      inkscape:zoom="5.9150245"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -73,7 +51,8 @@
      pagecolor="#ffffff"
      id="base"
      showguides="true"
-     inkscape:guide-bbox="true">
+     inkscape:guide-bbox="true"
+     inkscape:pagecheckerboard="0">
     <sodipodi:guide
        position="4.7596113,6.9802172"
        orientation="0,-1"
@@ -135,7 +114,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -168,41 +146,50 @@
              y="83.64991"
              ry="2.5985754" />
           <path
-             style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:5.61828829;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+             style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:5.61829;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
              d="M 71.512572,88.41099 60.11298,113.78783 43.185151,105.76978 55.59032,107.11953 Z"
              id="path882"
              sodipodi:nodetypes="ccccc" />
         </g>
-        <path
-           transform="matrix(1.315503,-0.76811157,0.73918702,1.366979,-196.76404,56.095615)"
-           id="path903"
-           d="m 142.61305,103.6418 9.43978,-0.5287 8.16471,31.20047"
-           style="stroke-width:3.90457;stroke-miterlimit:4;stroke-dasharray:none;fill:none;stroke:#686868;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-           sodipodi:nodetypes="ccc" />
         <g
-           id="g901"
+           id="g3916"
-           style="stroke-width:2.01247;stroke-miterlimit:4;stroke-dasharray:none"
+           transform="matrix(12.151193,0,0,12.151193,-148.91629,70.970167)"
-           transform="matrix(1.3484552,-0.70866904,0.67747724,1.3985899,-192.46008,42.858566)">
+           style="stroke-width:0.768356">
           <path
-             style="fill:url(#linearGradient946);fill-opacity:1;stroke:#000000;stroke-width:2.01247;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             style="fill:#ffaaaa;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 165.60421,210.25518 -16.67346,-14.97786 19.49947,-6.49982 z"
+             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="path886" />
+             id="path1605"
+             sodipodi:nodetypes="ccccccc" />
           <path
-             style="fill:#ffcc00;stroke:#000000;stroke-width:2.01247;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="path903"
-             d="M 148.93075,195.27732 116.14903,97.497359 c 0.80441,-1.560848 1.19491,-3.590454 2.29607,-4.461834 4.06642,-3.217867 10.88862,-4.243374 10.88862,-4.243374 2.39236,-0.123233 5.12146,0.737585 7.16258,2.205385 l 31.93392,97.779964 z"
+             d="m 18.286926,1.8124245 0.989256,-0.6558316 c 0.804095,1.2322882 0.673903,1.9306982 2.412766,3.6971397"
-             id="path888"
+             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="ccssccc" />
+             sodipodi:nodetypes="ccc" />
+          <g
+             id="g901"
+             style="stroke-width:1.54629;stroke-miterlimit:4;stroke-dasharray:none"
+             transform="matrix(0.11091199,-0.05828884,0.05572328,0.11503563,-3.5922226,-2.4121403)">
+            <path
+               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.941328;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:0.941328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               d="m 148.93075,195.27732 -30.23831,-89.30193 20.34727,-6.499823 29.39051,89.301933 z"
+               id="path888"
+               sodipodi:nodetypes="ccccc" />
+            <path
+               style="fill:#e6e6e6;stroke:#000000;stroke-width:0.57087;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               d="m 118.69244,105.97539 20.34727,-6.499822 3.49123,9.469182 -20.63688,6.48588 z"
+               id="path896"
+               sodipodi:nodetypes="ccccc" />
+          </g>
           <path
-             style="fill:#e6e6e6;stroke:#000000;stroke-width:3.11417438;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 119.25764,105.69279 19.78207,-6.217223 2.35773,10.100553 -18.1832,5.73149 z"
+             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="path896"
+             id="path3258"
-             sodipodi:nodetypes="ccccc" />
+             sodipodi:nodetypes="cccc" />
         </g>
-        <path
-           style="fill:#ffaaaa;stroke:#000000;stroke-width:3.21677px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 62.421182,83.450948 53.247834,73.396095 c -3.269201,-0.03495 -6.108773,-0.739553 -11.152516,1.99147 -5.59384,4.292817 -8.281453,7.910846 -10.664708,11.458206 -2.148177,4.173122 -1.698608,7.124368 -1.216677,10.060391 l 9.74404,9.259068 z"
-           id="path1605"
-           sodipodi:nodetypes="ccccccc" />
       </g>
     </g>
   </g>

icons/evaluate.svg

@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    inkscape:export-ydpi="96"
    inkscape:export-xdpi="96"
-   inkscape:export-filename="C:\Users\pabr6\eclipse-workspace\evalWriter\icons\evaluate.png"
+   inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\evaluate.png"
    sodipodi:docname="evaluate.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
    id="svg8"
    version="1.1"
-   viewBox="0 0 8.4666665 8.4666669"
+   viewBox="0 0 12.7 12.7"
-   height="32"
+   height="48"
-   width="32">
+   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/">
   <defs
      id="defs2" />
   <sodipodi:namedview
      inkscape:window-maximized="1"
      inkscape:window-y="-8"
      inkscape:window-x="-8"
-     inkscape:window-height="1017"
+     inkscape:window-height="1009"
      inkscape:window-width="1920"
      inkscape:guide-bbox="true"
      showguides="true"
@@ -32,19 +32,34 @@
      inkscape:document-rotation="0"
      inkscape:current-layer="layer1"
      inkscape:document-units="mm"
-     inkscape:cy="15.649515"
+     inkscape:cy="40.32958"
-     inkscape:cx="15.699196"
+     inkscape:cx="42.267337"
-     inkscape:zoom="11.789096"
+     inkscape:zoom="8.2569668"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
      bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base">
+     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">
     <sodipodi:guide
        id="guide14"
        orientation="1,0"
-       position="0.92013351,8.1249031" />
+       position="-2.471617e-08,4.4381936" />
+    <sodipodi:guide
+       position="2.1052607,7.3945287"
+       orientation="-0.7110256,0.70316613"
+       id="guide2079" />
   </sodipodi:namedview>
   <metadata
      id="metadata5">
@@ -54,46 +69,92 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      id="layer1"
      inkscape:groupmode="layer"
-     inkscape:label="Calque 1">
+     inkscape:label="Calque 1"
+     transform="translate(-0.92013353,-0.34176359)">
     <g
-       transform="translate(1.0884882,-0.04488611)"
+       id="g919"
-       id="g850">
+       transform="matrix(2.0256057,0,0,2.085527,3.6658321,-4.3064178)"
+       style="stroke-width:0.772273">
       <rect
-         style="fill:#00ff00;fill-rule:evenodd;stroke-width:0.0649999;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.0573248"
+         ry="0.56339979"
-         id="rect10"
-         width="3.8382711"
-         height="3.7594025"
-         x="0.92013353"
-         y="0.34176376"
-         ry="0.7402463" />
-      <rect
-         ry="0.7402463"
          y="4.3255968"
          x="0.92013353"
          height="3.7594025"
          width="3.8382711"
          id="rect12"
-         style="fill:#ff0000;fill-rule:evenodd;stroke-width:0.0649999;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.0573248" />
+         style="fill:#ff0000;fill-rule:evenodd;stroke-width:0.0501977;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.0573248"
+         rx="0.5800662" />
       <path
-         style="fill:#ffffff;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="fill:none;stroke:#ffffff;stroke-width:0.436334;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 1.593457,2.0535396 C 1.4943041,2.7068656 2.197488,3.3900316 2.5136223,3.4113444 2.8387438,3.3861864 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.1987413,1.5678792 2.4575146,2.8390465 1.9733255,2.8095448 1.9097547,2.360559 1.593457,2.0535396 Z"
-         id="path16"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#ffffff;stroke-width:0.565;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 1.6159,5.0384659 3.9724208,7.4062084"
          id="path841" />
       <path
          id="path843"
          d="M 3.9724208,5.0384659 1.6159,7.4062084"
-         style="fill:none;stroke:#ffffff;stroke-width:0.565;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;stroke:#ffffff;stroke-width:0.436334;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g923"
+       transform="matrix(1.9487365,0,0,2.0063839,0.20283407,0.11078427)"
+       style="stroke-width:0.772273">
+      <rect
+         style="fill:#00ff00;fill-rule:evenodd;stroke-width:0.0501977;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.0573248"
+         id="rect10"
+         width="3.8382711"
+         height="3.7594025"
+         x="0.92013353"
+         y="0.34176376"
+         ry="0.56339979"
+         rx="0.5800662" />
+      <path
+         style="fill:#ffffff;stroke:none;stroke-width:0.20433px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 1.593457,2.0535396 C 1.4943041,2.7068656 2.197488,3.3900316 2.5136223,3.4113444 2.8387438,3.3861864 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.1987413,1.5678792 2.4575146,2.8390465 1.9733255,2.8095448 1.9097547,2.360559 1.593457,2.0535396 Z"
+         id="path16"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+    <g
+       id="g3916"
+       transform="matrix(0.76793268,0,0,0.76793268,-9.9063953,2.901519)">
+      <path
+         style="fill:#ffaaaa;stroke:none;stroke-width:0.264583px;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" />
+      <path
+         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.494;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <g
+         id="g901"
+         style="stroke-width:2.01247;stroke-miterlimit:4;stroke-dasharray:none"
+         transform="matrix(0.11091199,-0.05828884,0.05572328,0.11503563,-3.5922226,-2.4121403)">
+        <path
+           style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.22512;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.22512;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 148.93075,195.27732 -30.23831,-89.30193 20.34727,-6.499823 29.39051,89.301933 z"
+           id="path888"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#e6e6e6;stroke:#000000;stroke-width:0.742976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 118.69244,105.97539 20.34727,-6.499822 3.49123,9.469182 -20.63688,6.48588 z"
+           id="path896"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <path
+         style="fill:#00ff19;fill-opacity:1;stroke:none;stroke-width:0.264583px;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" />
     </g>
   </g>
 </svg>

icons/evalwriter.svg

@@ -1,37 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    inkscape:export-ydpi="128"
    inkscape:export-xdpi="128"
    inkscape:export-filename="C:\Users\pabr6\eclipse-workspace\evalWriter\icons\evalwriter.png"
    sodipodi:docname="evalwriter.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
    id="svg8"
    version="1.1"
    viewBox="0 0 12.7 12.7"
    height="48"
-   width="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/">
   <defs
      id="defs2">
-    <linearGradient
-       id="linearGradient952"
-       inkscape:collect="always">
-      <stop
-         id="stop948"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1" />
-      <stop
-         id="stop950"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
     <pattern
        id="EMFhbasepattern"
        patternUnits="userSpaceOnUse"
@@ -39,21 +26,12 @@
        height="6"
        x="0"
        y="0" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="199.1955"
-       x2="161.70084"
-       y1="203.60699"
-       x1="163.67088"
-       id="linearGradient946"
-       xlink:href="#linearGradient952"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      inkscape:window-maximized="1"
      inkscape:window-y="-8"
      inkscape:window-x="-8"
-     inkscape:window-height="1017"
+     inkscape:window-height="1009"
      inkscape:window-width="1920"
      units="px"
      inkscape:object-paths="true"
@@ -61,10 +39,10 @@
      inkscape:snap-global="true"
      showgrid="false"
      inkscape:document-rotation="0"
-     inkscape:current-layer="g982"
+     inkscape:current-layer="g3916"
      inkscape:document-units="mm"
-     inkscape:cy="6.1574106"
+     inkscape:cy="6.0861963"
-     inkscape:cx="6.3727047"
+     inkscape:cx="-4.7337082"
      inkscape:zoom="5.9150245"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -73,7 +51,8 @@
      pagecolor="#ffffff"
      id="base"
      showguides="true"
-     inkscape:guide-bbox="true">
+     inkscape:guide-bbox="true"
+     inkscape:pagecheckerboard="0">
     <sodipodi:guide
        position="4.7596113,6.9802172"
        orientation="0,-1"
@@ -135,7 +114,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -168,41 +146,50 @@
              y="83.64991"
              ry="2.5985754" />
           <path
-             style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:5.61828829;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+             style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:5.61829;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
              d="M 71.512572,88.41099 60.11298,113.78783 43.185151,105.76978 55.59032,107.11953 Z"
              id="path882"
              sodipodi:nodetypes="ccccc" />
         </g>
-        <path
-           transform="matrix(1.315503,-0.76811157,0.73918702,1.366979,-196.76404,56.095615)"
-           id="path903"
-           d="m 142.61305,103.6418 9.43978,-0.5287 8.16471,31.20047"
-           style="stroke-width:3.90457;stroke-miterlimit:4;stroke-dasharray:none;fill:none;stroke:#686868;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-           sodipodi:nodetypes="ccc" />
         <g
-           id="g901"
+           id="g3916"
-           style="stroke-width:2.01247;stroke-miterlimit:4;stroke-dasharray:none"
+           transform="matrix(12.151193,0,0,12.151193,-148.91629,70.970167)"
-           transform="matrix(1.3484552,-0.70866904,0.67747724,1.3985899,-192.46008,42.858566)">
+           style="stroke-width:0.768356">
           <path
-             style="fill:url(#linearGradient946);fill-opacity:1;stroke:#000000;stroke-width:2.01247;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             style="fill:#ffaaaa;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 165.60421,210.25518 -16.67346,-14.97786 19.49947,-6.49982 z"
+             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="path886" />
+             id="path1605"
+             sodipodi:nodetypes="ccccccc" />
           <path
-             style="fill:#ffcc00;stroke:#000000;stroke-width:2.01247;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="path903"
-             d="M 148.93075,195.27732 116.14903,97.497359 c 0.80441,-1.560848 1.19491,-3.590454 2.29607,-4.461834 4.06642,-3.217867 10.88862,-4.243374 10.88862,-4.243374 2.39236,-0.123233 5.12146,0.737585 7.16258,2.205385 l 31.93392,97.779964 z"
+             d="m 18.286926,1.8124245 0.989256,-0.6558316 c 0.804095,1.2322882 0.673903,1.9306982 2.412766,3.6971397"
-             id="path888"
+             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="ccssccc" />
+             sodipodi:nodetypes="ccc" />
+          <g
+             id="g901"
+             style="stroke-width:1.54629;stroke-miterlimit:4;stroke-dasharray:none"
+             transform="matrix(0.11091199,-0.05828884,0.05572328,0.11503563,-3.5922226,-2.4121403)">
+            <path
+               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.941328;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:0.941328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               d="m 148.93075,195.27732 -30.23831,-89.30193 20.34727,-6.499823 29.39051,89.301933 z"
+               id="path888"
+               sodipodi:nodetypes="ccccc" />
+            <path
+               style="fill:#e6e6e6;stroke:#000000;stroke-width:0.57087;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               d="m 118.69244,105.97539 20.34727,-6.499822 3.49123,9.469182 -20.63688,6.48588 z"
+               id="path896"
+               sodipodi:nodetypes="ccccc" />
+          </g>
           <path
-             style="fill:#e6e6e6;stroke:#000000;stroke-width:3.11417438;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 119.25764,105.69279 19.78207,-6.217223 2.35773,10.100553 -18.1832,5.73149 z"
+             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="path896"
+             id="path3258"
-             sodipodi:nodetypes="ccccc" />
+             sodipodi:nodetypes="cccc" />
         </g>
-        <path
-           style="fill:#ffaaaa;stroke:#000000;stroke-width:3.21677px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 62.421182,83.450948 53.247834,73.396095 c -3.269201,-0.03495 -6.108773,-0.739553 -11.152516,1.99147 -5.59384,4.292817 -8.281453,7.910846 -10.664708,11.458206 -2.148177,4.173122 -1.698608,7.124368 -1.216677,10.060391 l 9.74404,9.259068 z"
-           id="path1605"
-           sodipodi:nodetypes="ccccccc" />
       </g>
     </g>
   </g>

icons/fichier_analyse.svg

@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\fichierAnalyse.png"
+   sodipodi:docname="fichier_analyse.svg"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 12.7 12.7"
+   height="48"
+   width="48"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="k"
+       gradientTransform="matrix(7.99974,0,0,7.9977797,-861.96742,-7808.7674)"
+       gradientUnits="userSpaceOnUse"
+       x1="122.75008"
+       x2="111.74973"
+       xlink:href="#b"
+       y1="991.62115"
+       y2="977.11713" />
+    <linearGradient
+       id="b">
+      <stop
+         offset="0"
+         stop-color="#0369a3"
+         id="stop7" />
+      <stop
+         offset="1"
+         stop-color="#1c99e0"
+         id="stop9" />
+    </linearGradient>
+    <linearGradient
+       id="j"
+       gradientUnits="userSpaceOnUse"
+       x1="108.00134"
+       x2="20.001341"
+       y1="122"
+       y2="6"
+       gradientTransform="translate(12)">
+      <stop
+         offset="0"
+         stop-color="#e6e6e6"
+         id="stop35" />
+      <stop
+         offset="1"
+         stop-color="#fff"
+         id="stop37" />
+    </linearGradient>
+    <linearGradient
+       id="i"
+       gradientUnits="userSpaceOnUse"
+       x1="108.00134"
+       x2="20.001341"
+       xlink:href="#b"
+       y1="130"
+       y2="14"
+       gradientTransform="translate(12)" />
+    <linearGradient
+       id="h"
+       gradientTransform="matrix(4.4999,0,0,3.66665,-930.97741,2199.6564)"
+       gradientUnits="userSpaceOnUse"
+       x2="0"
+       y1="-581.63782"
+       y2="-578.63782">
+      <stop
+         offset="0"
+         stop-color="#63bbee"
+         id="stop29" />
+      <stop
+         offset="1"
+         stop-color="#aadcf7"
+         id="stop31" />
+    </linearGradient>
+    <linearGradient
+       id="g"
+       gradientTransform="matrix(-4.19983,0,0,3.9111,1552.9405,-4523.1636)"
+       gradientUnits="userSpaceOnUse"
+       x2="0"
+       xlink:href="#a"
+       y1="1173"
+       y2="1178" />
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#666"
+         id="stop2" />
+      <stop
+         offset="1"
+         stop-color="#333"
+         id="stop4" />
+    </linearGradient>
+    <linearGradient
+       id="f"
+       gradientTransform="matrix(4.19983,0,0,3.9111,-1380.9394,-4521.9436)"
+       gradientUnits="userSpaceOnUse"
+       x2="0"
+       xlink:href="#a"
+       y1="1173"
+       y2="1178" />
+    <linearGradient
+       id="e"
+       gradientTransform="matrix(1.19997,0,0,1.22222,-269.19161,858.5534)"
+       gradientUnits="userSpaceOnUse"
+       x2="0"
+       y1="-629.66907"
+       y2="-635.54944">
+      <stop
+         offset="0"
+         stop-color="#18a303"
+         id="stop22" />
+      <stop
+         offset="1"
+         stop-color="#106802"
+         id="stop24" />
+    </linearGradient>
+    <linearGradient
+       id="d"
+       gradientTransform="matrix(4.19983,0,0,3.9111,-1380.9394,-4517.0536)"
+       gradientUnits="userSpaceOnUse"
+       x2="0"
+       y1="1173"
+       y2="1178">
+      <stop
+         offset="0"
+         stop-color="#0369a3"
+         id="stop17" />
+      <stop
+         offset="1"
+         stop-color="#023f62"
+         id="stop19" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       gradientTransform="matrix(0,0.791084,-1.28,0,1511.6005,-282.0136)"
+       gradientUnits="userSpaceOnUse"
+       x1="445.69522"
+       x2="441.38797"
+       y1="1103.5776"
+       y2="1099.8198">
+      <stop
+         offset="0"
+         stop-color="#e9b913"
+         id="stop12" />
+      <stop
+         offset="1"
+         stop-color="#ff0"
+         id="stop14" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:window-height="1009"
+     inkscape:window-width="1920"
+     inkscape:guide-bbox="true"
+     showguides="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="mm"
+     inkscape:cy="19.744638"
+     inkscape:cx="25.753876"
+     inkscape:zoom="4.6594929"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:pagecheckerboard="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-global="false">
+    <sodipodi:guide
+       id="guide14"
+       orientation="1,0"
+       position="-2.471617e-08,4.4381936" />
+    <sodipodi:guide
+       position="6.6200247,5.8336321"
+       orientation="0.70860014,0.70561026"
+       id="guide2079" />
+    <sodipodi:guide
+       position="6.6200247,5.8336321"
+       orientation="-0.71816555,0.69587229"
+       id="guide5772" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Calque 1"
+     transform="translate(-0.92013353,-0.34176359)">
+    <g
+       id="g923"
+       transform="matrix(0.08485361,0,0,0.08631596,0.60989086,1.0161972)">
+      <path
+         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="path41"
+         style="fill:url(#k)" />
+      <path
+         d="M 18.001355,6 V 122 H 110.00137 V 50 L 66.001375,6 Z"
+         fill="url(#j)"
+         id="path43"
+         style="fill:url(#j)" />
+      <path
+         d="m 31.001355,55.996094 v 4 h 18 v -4 z m 21.99805,0.002 v 28 h 42 v -28 z M 56.001355,59 h 36 v 22 h -36 z m -25,4.996094 v 4 h 18 v -4 z m 0,8 v 4 h 18 v -4 z m 0,8 v 4 h 18 v -4 z m 0,8 v 4 h 64 v -4 z m 0,8 v 4 h 64 v -4 z m 0,7.999996 v 4 h 42 v -4 z"
+         fill="url(#i)"
+         id="path45"
+         style="fill:url(#i)" />
+      <path
+         d="m 56.001305,58.9987 h 35.99924 v 21.9999 h -35.99924 z"
+         fill="url(#h)"
+         id="path47"
+         style="fill:url(#h)" />
+      <path
+         d="m 82.400745,65.1097 c 2.39995,1.2223 6.5708,5.4785 9.59846,8.5556 v 3.6666 h -27.59877 c 4.80059,-6.111 12.00044,-9.7777 18.00031,-12.2222 z"
+         fill="url(#g)"
+         id="path49"
+         style="fill:url(#g)" />
+      <path
+         d="m 73.588425,72.2139 0.20971,-1.7259 3.15139,-1.3732 1.77234,-1.6867 3.11639,-1.287 -0.81326,2.0851 -1.21491,2.1676 -0.72316,2.3557 -0.50012,1.3573 z"
+         fill="#333333"
+         id="path51" />
+      <path
+         d="m 74.600905,70.6097 c -3.59197,-3.0353 -5.39988,-5.5 -7.79983,-9.1666 -0.70179,0.2159 -0.67498,0.1338 -1.19998,0 0,0 -3.21063,4.8582 -4.7999,7.3333 -1.58925,2.4752 -4.80059,6.1111 -4.80059,6.1111 v 2.4444 h 27.59878 c 0,0 -6.59344,-4.8509 -8.99848,-6.7221 z"
+         fill="url(#f)"
+         id="path53"
+         style="fill:url(#f)" />
+      <path
+         d="m 92.000545,74.8875 h -1.54688 l -6.85294,1.2222 c 0,0 -6.77196,-1.8333 -7.79068,-1.8333 -1.00092,0 -4.20908,0.6111 -4.80941,0.6111 -0.42074,0 -2.99959,-1.2222 -3.60943,-1.2222 -1.00619,0 -2.16569,1.2986 -5.16562,1.8333 0,0 -0.8619,-1.9478 -1.42439,-1.8333 -3.59992,1.4132 -4.80059,1.2222 -4.80059,1.2222 v 6.1111 h 35.9986 l 10e-4,-6.1111 h 1.4e-4 z"
+         fill="url(#e)"
+         id="path55"
+         style="fill:url(#e)" />
+      <path
+         d="m 56.001305,76.1097 -7e-4,4.8889 h 31.20004 l 1.19998,-1.2223 -1.19998,-1.2221 -2.39995,-1.2223 -5.99988,-1.2221 -5.99987,-0.6112 -5.39988,0.6112 h -7.19985 -4.19991 z"
+         fill="url(#d)"
+         id="path57"
+         style="fill:url(#d)" />
+      <path
+         d="m 58.401255,73.6653 1.70967,-2.7954 2.02641,-2.4427 1.54734,-2.8707 1.91642,-2.8912 -1.30074,3.6512 -0.95243,3.0079 -0.46065,1.8973 -0.85958,2.0216 c -0.34603,-0.2571 -0.78349,-0.2666 -1.17801,-0.397 l -1.12659,0.4498 z"
+         fill="#333333"
+         id="path59" />
+      <path
+         d="m 75.200895,73.6653 -1.74718,-2.6968 -3.09839,-3.4415 -2.56346,-3.4328 -0.99079,-1.4289 1.07384,3.7096 1.17772,2.2247 1.04471,3.3983 0.30366,1.6674 1.07862,0.3681 1.64879,-0.389 c 0.69217,-0.07 1.38438,0.013 2.07248,0.021 z"
+         fill="#808080"
+         id="path61" />
+      <path
+         d="m 62.803405,73.7194 1.29015,-3.3187 0.62925,-3.4258 0.91011,-2.115 0.56817,-2.1946 0.7887,2.2581 0.22406,2.1565 0.95403,1.9211 0.94577,2.2071 0.1768,1.5591 -1.58862,0.4542 -1.50905,-0.5992 -1.66818,1.1023 h -1.72119 v -0.01 z"
+         fill="#666666"
+         id="path63" />
+      <path
+         d="m 78.269745,74.2786 -2.10187,-1.5431 -1.34246,-1.0907 1.30382,2.0694 z"
+         fill="#808080"
+         id="path65" />
+      <path
+         d="m 80.030725,72.807 0.74175,-2.4329 0.91009,-2.115 0.56818,-2.1944 0.7887,2.2581 1.01154,1.9273 0.72905,1.9211 -0.10416,2.0544 1.00178,1.0243 -2.0623,-0.1136 -4.16225,-0.8773 0.57766,-1.4523 z"
+         fill="#666666"
+         id="path67" />
+      <path
+         d="m 91.513055,74.1618 -1.40969,-0.8635 -1.97342,-2.7541 -2.90095,-2.5543 -2.26576,-1.9252 0.43635,1.6088 2.0027,3.2177 0.21973,2.9019 1.20364,0.9416 2.69994,-0.5347 1.98746,-0.038 z"
+         fill="#808080"
+         id="path69" />
+      <path
+         d="m 57.201275,77.3319 -1.19997,3.6667 h 29.99936 v -1.2223 l -1.19997,-1.2221 -5.99988,-1.2223 -5.99987,-0.611 -5.99987,0.611 -6.4938,0.1823 z"
+         fill="#0369a3"
+         id="path71" />
+      <path
+         d="m 69.201025,79.7763 1.19998,-1.2221 h 4.79989 l 3.59992,1.2221 1.19998,1.2223 h -2.39995 z"
+         fill="#1c99e0"
+         opacity="0.5"
+         id="path73" />
+      <path
+         d="m 92.000605,65.00274 c -3.31371,0 -6,-2.686297 -6,-6.00001 h 6 z"
+         fill="url(#c)"
+         opacity="0.74"
+         id="path75"
+         style="fill:url(#c)" />
+    </g>
+    <g
+       id="g6608"
+       transform="matrix(1.393267,0,0,1.3867787,-4.1605106,-4.3727345)">
+      <path
+         id="path4945"
+         style="fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 6.9115255,4.1117374 A 2.5406649,2.4821629 0 0 0 4.3705953,6.5942731 2.5406649,2.4821629 0 0 0 6.9115255,9.0762921 2.5406649,2.4821629 0 0 0 8.4871398,8.5409244 L 9.0535135,9.109882 9.4219665,8.6845849 8.8902159,8.1507674 A 2.5406649,2.4821629 0 0 0 9.4519387,6.5942731 2.5406649,2.4821629 0 0 0 6.9115255,4.1117374 Z m 0,0.5539713 A 1.9739749,1.9285217 0 0 1 8.8850483,6.5942731 1.9739749,1.9285217 0 0 1 6.9115255,8.5223207 1.9739749,1.9285217 0 0 1 4.9374857,6.5942731 1.9739749,1.9285217 0 0 1 6.9115255,4.6657087 Z" />
+      <path
+         style="fill:#ff0000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 9.7071636,8.4854359 2.9328084,2.9440821 c 0.0419,0.512292 -0.280235,0.819082 -0.875635,0.903687 L 8.8320954,9.3885382 C 9.117696,9.015001 9.3363405,8.7445068 9.7071636,8.4854359 Z"
+         id="path5444"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+  </g>
+</svg>

icons/open.svg

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg2"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   sodipodi:docname="open.svg"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
+   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">
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     id="namedview4"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-to-guides="false"
+     inkscape:snap-grids="false"
+     inkscape:zoom="11.559578"
+     inkscape:cx="13.322286"
+     inkscape:cy="14.360386"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g8">
+    <sodipodi:guide
+       position="1.4674154,41.846322"
+       orientation="1,0"
+       id="guide903" />
+    <sodipodi:guide
+       position="1.4674154,41.846322"
+       orientation="0,-1"
+       id="guide905" />
+    <sodipodi:guide
+       position="6.5323654,41.846322"
+       orientation="1,0"
+       id="guide907" />
+    <sodipodi:guide
+       position="2.3667991,42.840378"
+       orientation="0,-1"
+       id="guide909" />
+    <sodipodi:guide
+       position="2.650815,28.402904"
+       orientation="0,-1"
+       id="guide911" />
+    <sodipodi:guide
+       position="17.040953,28.592248"
+       orientation="1,0"
+       id="guide913" />
+    <sodipodi:guide
+       position="6.4850294,40.378907"
+       orientation="0,-1"
+       id="guide915" />
+    <sodipodi:guide
+       position="2.3667991,42.840378"
+       orientation="1,0"
+       id="guide1088" />
+    <sodipodi:guide
+       position="17.372305,29.680975"
+       orientation="0,-1"
+       id="guide1166" />
+    <sodipodi:guide
+       position="15.810218,40.378907"
+       orientation="1,0"
+       id="guide1852" />
+    <sodipodi:guide
+       position="17.040953,39.100836"
+       orientation="0,-1"
+       id="guide1892" />
+    <sodipodi:guide
+       position="17.040953,28.402904"
+       orientation="-0.888472,0.45893083"
+       id="guide2160" />
+    <sodipodi:guide
+       position="17.040953,29.680975"
+       orientation="-0.888472,0.45893083"
+       id="guide2935" />
+    <sodipodi:guide
+       position="6.5323654,38.208448"
+       orientation="0,-1"
+       id="guide3053" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g8">
+    <g
+       id="g24085"
+       transform="matrix(2.1133279,0,0,2.3437786,-24.515042,0.07257398)"
+       style="stroke-width:0.449322">
+      <path
+         style="fill:#b4ddff;fill-opacity:1;stroke:none;stroke-width:0.449322px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 26.450745,17.520896 H 13.007326 c -0.442673,-0.0974 -0.801107,-0.388557 -0.899383,-1.278071 V 4.0774776 c 0.163756,-0.4673901 0.392288,-0.8700044 0.899383,-0.994056 l 3.124175,-0.047336 c 0.647631,0.1267634 0.910636,0.5355859 1.041392,1.0413916 v 1.4674154 h 9.277852 c 0.844034,0.067676 1.182373,0.5531005 1.230735,1.278071 v 9.4198614 c -0.181441,0.334866 -0.269517,0.527928 -0.387687,0.696876 -0.244203,0.349136 -0.478767,0.462978 -0.843048,0.581195 z"
+         id="path901"
+         sodipodi:nodetypes="cccccccccccsc" />
+      <path
+         style="fill:#2f9fff;fill-opacity:1;stroke:none;stroke-width:0.449322px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 13.007326,17.520896 C 12.453794,17.343119 11.933625,16.863313 12.107943,16.242825 L 16.512719,7.7153516 H 32.086256 L 27.68148,16.242825 c -0.467452,0.851822 -0.534325,1.106575 -1.230735,1.278071 z"
+         id="path2824"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.134797;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 18.87384,7.7153516 c 3.200315,-2.062357 6.695077,-3.1334078 7.576905,2.080592 l -2.872154,0.8453844 6.910102,5.601497 3.087492,-8.5274734 -2.646058,1.133638 C 25.891118,-0.91515901 19.52871,4.4623723 18.87384,7.7153516 Z"
+         id="path4019"
+         sodipodi:nodetypes="ccccccc" />
+    </g>
+  </g>
+</svg>

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";
 	
 	

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;

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 <fichier>.");
@@ -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 <fichier>.");
 	  			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 <fichier>.");
 	  			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 <fichier>.");
 	  			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 <fichier>.");
 	  			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 <fichier>.");
 	  			messageErreur.append("\nL'attribut \"historiquePresent\" n'a pas une valeur logique.");
 	  			messageErreur.append("\nVoir la documentation d'analyseWriter.");

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();
+		panel.setLayout(new GridLayout(0, 1, 0, 0));
-		gbl_panel.columnWidths = new int[]{104, 0};
+		
-		gbl_panel.rowHeights = new int[]{14, 0, 0, 0, 0, 0, 0, 0};
+		lblFileAnalyse = new JLabel("<HTML><B><U>Fichier de l'analyse</U></B> : </HTML>");
-		gbl_panel.columnWeights = new double[]{0.0, Double.MIN_VALUE};
+		lblFileAnalyse.setHorizontalAlignment(SwingConstants.LEFT);
-		gbl_panel.rowWeights = new double[]{0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Double.MIN_VALUE};
+		lblFileAnalyse.setFont(new Font("Tahoma", Font.PLAIN, 14));
-		panel.setLayout(gbl_panel);
+		panel.add(lblFileAnalyse);
+		lblPath.setHorizontalAlignment(SwingConstants.LEFT);
 		lblPath.setFont(new Font("Tahoma", Font.PLAIN, 14));
 		lblPath.setText("<HTML><B><U>Dossier de l'analyse</U></B> : " + commandes.path.substring(commandes.path.lastIndexOf("\\")+1,commandes.path.length()) + "</HTML>");
-		
+		panel.add(lblPath);
-		
-		
-		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);
 		
 		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();
+		panel.add(chckbxfichiersEtudaints);
-		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);
 		
 		chckbxnoFeedback = new JCheckBox("Pas de feedback");
 		chckbxnoFeedback.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		GridBagConstraints gbc_chckbxnoFeedback = new GridBagConstraints();
+		panel.add(chckbxnoFeedback);
-		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);
 		
 		chckbxZipfeedback = new JCheckBox("Zip les feedbacks");
 		chckbxZipfeedback.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		GridBagConstraints gbc_chckbxZipfeedback = new GridBagConstraints();
+		panel.add(chckbxZipfeedback);
-		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);
 		
 		chckbxNoNote = new JCheckBox("Pas de note dans les feedbacks");
 		chckbxNoNote.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		GridBagConstraints gbc_chckbxNoNote = new GridBagConstraints();
+		panel.add(chckbxNoNote);
-		gbc_chckbxNoNote.anchor = GridBagConstraints.WEST;
-		gbc_chckbxNoNote.gridx = 0;
-		gbc_chckbxNoNote.gridy = 6;
-		panel.add(chckbxNoNote, gbc_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();
+		JScrollPane scrollPane = new JScrollPane();
-		textPane.setFont(new Font("Tahoma", Font.PLAIN, 12));
+		panel_1.add(scrollPane);
-		textPane.setBounds(30, 28, 495, 412);
+		
-		panel_1.add(textPane);
+		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("<HTML><B><U>Dossier de l'analyse</U></B> : " + commandes.path.substring(commandes.path.lastIndexOf("\\")+1,commandes.path.length()) + "</HTML>");
-	
+		lblFileAnalyse.setText("<HTML><B><U>Fichier de l'analyse</U></B> : " + commandes.filename + "</HTML>");
+		
 	}
 	
 	
@@ -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
+								a.AddStreamToZip(feedbacks.feedback(ana, verif, true), meptl.retourneLeNomDuFeedback(a.getLectDossiers().getEC().getListeNomFichierFeedBack().get(i),ana, verif),commandes.analyse_size,commandes.analyse_nameZip);
-//								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);
 							} 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());
 				
 			}
 		}

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();
 		     }