MAJ V4.4.0 (mise en place de la méthode marquenode. Cette méthode permet

d'afficher dans le feedback des étudiants les nom de tous les nodes
évalué même s'il n'y a pas de point.
Cette méthode est accéssible sur le click droite du node page)

bin/.gitignore

@@ -2,3 +2,13 @@
 /resources/
 /MEPTL/
 /evaluer/
+/sautmultiple.png
+/sautmultiple.svg
+/sautmultiplemini.png
+/versfichierAnalyse.png
+/versfichierAnalyseModifmax.svg
+/list/
+/feedbackmini.png
+/marquenode.png
+/marquenode.svg
+/marquenodemini.png

bin/feedback.svg

@@ -1,22 +1,22 @@
 <?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"
    width="48"
    height="48"
    viewBox="0 0 12.7 12.7"
    version="1.1"
    id="svg8"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
    sodipodi:docname="feedback.svg"
-   inkscape:export-filename="C:\Users\pabr6\eclipse-workspace\evalWriter\icons\feedback.png"
+   inkscape:export-filename="feedback.png"
-   inkscape:export-xdpi="96"
+   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="96">
+   inkscape:export-ydpi="90"
+   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">
     <pattern
@@ -35,10 +35,10 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="7.5400948"
-     inkscape:cx="19.718926"
+     inkscape:cx="55.635905"
-     inkscape:cy="17.818307"
+     inkscape:cy="17.77166"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g867"
      inkscape:document-rotation="0"
      showgrid="false"
      inkscape:snap-global="false"
@@ -48,10 +48,13 @@
      fit-margin-bottom="0"
      units="px"
      inkscape:window-width="1920"
-     inkscape:window-height="1017"
+     inkscape:window-height="1009"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -60,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -71,18 +74,20 @@
      transform="translate(-62.773233,-87.475558)">
     <g
        id="g883"
-       transform="matrix(0.16442311,0,0,0.16442311,53.504569,74.385325)">
+       transform="matrix(0.16442311,0,0,0.16442311,53.60984,73.50807)">
       <g
-         transform="translate(-3.5201055,3.6458235)"
+         transform="matrix(1.2094444,0,0,1.2098415,-23.698851,-14.263268)"
-         id="g873">
+         id="g873"
+         style="stroke-width:0.82669">
         <path
            id="rect852"
-           style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:3.77953;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:4.75069861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 257.4668,318.72656 c -2.78101,0 -5.01953,2.23852 -5.01953,5.01953 v 76.50196 c 0,2.78101 2.23852,5.01953 5.01953,5.01953 h 109.44726 l 24.42188,27.43945 0.69726,-27.43945 h 20.45703 c 2.78102,0 5.01954,-2.23852 5.01954,-5.01953 v -76.50196 c 0,-2.78101 -2.23852,-5.01953 -5.01954,-5.01953 z"
+           d="m 257.4668,318.72656 c -2.78101,0 -5.01953,2.23852 -5.01953,5.01953 v 66.44796 c 0,2.78101 2.23852,5.01953 5.01953,5.01953 h 109.44726 l 24.42188,27.43945 -5.30503,-27.43945 h 46.57392 c 2.78102,0 5.01954,-2.23852 5.01954,-5.01953 v -66.44796 c 0,-2.78101 -2.23852,-5.01953 -5.01954,-5.01953 z"
-           transform="scale(0.26458333)" />
+           transform="scale(0.26458333)"
+           sodipodi:nodetypes="sssscccsssss" />
         <path
            sodipodi:type="star"
-           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:0.686837;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            id="path23"
            sodipodi:sides="5"
            sodipodi:cx="75.241814"
@@ -95,11 +100,12 @@
            inkscape:rounded="0"
            inkscape:randomized="0"
            d="m 78.927739,100.55295 -3.606466,-1.776805 -3.508249,1.963625 0.575382,-3.979017 -2.951626,-2.729749 3.962071,-0.682364 1.684044,-3.650701 1.873313,3.557291 3.992422,0.473492 -2.8043,2.880891 z"
-           inkscape:transform-center-x="0.049110126"
+           inkscape:transform-center-x="0.056965611"
-           inkscape:transform-center-y="-0.53122384" />
+           inkscape:transform-center-y="-0.66345805"
+           transform="matrix(1.159959,0,0,1.2489239,-11.637987,-24.792201)" />
         <path
-           inkscape:transform-center-y="-0.53122384"
+           inkscape:transform-center-y="-0.66345804"
-           inkscape:transform-center-x="0.049110126"
+           inkscape:transform-center-x="0.056965575"
            d="m 92.271069,100.3584 -3.606466,-1.776805 -3.508248,1.963625 0.575381,-3.979016 -2.951625,-2.72975 3.962071,-0.682363 1.684043,-3.650702 1.873314,3.557292 3.992421,0.473492 -2.804299,2.88089 z"
            inkscape:randomized="0"
            inkscape:rounded="0"
@@ -112,11 +118,12 @@
            sodipodi:cx="88.585144"
            sodipodi:sides="5"
            id="path25"
-           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:0.686837;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           sodipodi:type="star" />
+           sodipodi:type="star"
+           transform="matrix(1.159959,0,0,1.2489239,-11.388047,-24.549223)" />
         <path
            sodipodi:type="star"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:#ffcc00;fill-rule:evenodd;stroke:#000000;stroke-width:0.686837;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            id="path27"
            sodipodi:sides="5"
            sodipodi:cx="102.35942"
@@ -129,23 +136,24 @@
            inkscape:rounded="0"
            inkscape:randomized="0"
            d="m 106.04535,100.27158 -3.60647,-1.776799 -3.508248,1.963619 0.575381,-3.979011 -2.951626,-2.72975 3.962073,-0.682363 1.68404,-3.650702 1.87332,3.557292 3.99242,0.473492 -2.8043,2.88089 z"
-           inkscape:transform-center-x="0.049110126"
+           inkscape:transform-center-x="0.056965537"
-           inkscape:transform-center-y="-0.53122384" />
+           inkscape:transform-center-y="-0.66345804"
+           transform="matrix(1.159959,0,0,1.2489239,-11.637987,-24.440798)" />
       </g>
       <g
-         style="stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+         style="stroke-width:1.58355;stroke-miterlimit:4;stroke-dasharray:none"
-         transform="translate(-5.7830304,-1.2571805)"
+         transform="matrix(0.97698002,0,0,0.94363873,-3.4673138,7.6530387)"
          id="g867">
         <path
-           style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:#f4e3d7;stroke:#000000;stroke-width:1.58355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 98.766744,130.15106 c 0,0 0.327483,-2.88752 3.001446,-2.90217 1.27961,-0.0119 7.65141,-4.86002 10.10884,-11.85395 2.45744,-6.99393 6.63086,-4.79416 7.30121,-2.13652 0.67035,2.65764 -0.90141,7.56943 -1.67542,11.05778 l 11.50456,0.11169 c 5.16405,-0.1182 3.93304,6.29649 -0.1117,6.81338 3.6651,2.19244 2.12485,5.42471 -0.78186,5.69643 2.37601,1.42602 0.89301,5.6866 -1.67542,5.69643 2.52021,2.00519 1.50733,5.26044 -2.01051,5.36134 l -22.89741,0.22339 c -1.918509,-0.31149 -2.533497,-1.63682 -2.792368,-3.23914 z"
+           d="m 95.200985,138.16782 c 0,0 0.42399,-3.78914 3.88591,-3.80838 1.656695,-0.0155 9.906145,-6.37755 13.087725,-15.55531 3.18162,-9.17777 8.58485,-6.29113 9.45273,-2.80364 0.8679,3.48748 -1.16702,9.93296 -2.16911,14.51053 l 11.36921,0.14658 c 8.78985,0.54986 7.42987,7.79256 -0.14461,8.94083 8.71947,-0.17786 6.74408,7.58855 -0.75974,6.77015 6.34917,-1.18359 7.70214,6.99225 0.40251,7.00516 7.23718,2.6313 2.65285,8.07795 -1.90163,8.21036 l -29.644845,0.29314 c -2.48386,-0.40876 -3.28007,-2.14792 -3.61523,-4.25056 z"
            id="path858"
            sodipodi:nodetypes="cczzccccccccc" />
         <path
-           style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:#000080;stroke:#000000;stroke-width:1.58355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 97.896741,127.21752 h -5.854044 v 20.97699 h 5.64497 c 0,0 -0.479981,-0.8237 -0.627218,-1.81196 -0.147237,-0.98826 -0.146937,-16.19979 0.06969,-17.28337 0.216627,-1.08358 0.766602,-1.88166 0.766602,-1.88166 z"
+           d="M 93.200835,134.31829 H 71.198174 v 27.52699 h 21.73198 c 0,0 -0.621425,-1.08089 -0.812052,-2.37773 -0.190626,-1.29685 -0.190233,-21.25815 0.09018,-22.68007 0.28046,-1.42193 0.992505,-2.46919 0.992505,-2.46919 z"
            id="path863"
-           sodipodi:nodetypes="cccczzc" />
+           sodipodi:nodetypes="cccczzcc" />
       </g>
     </g>
   </g>

icons/feedback.svg

@@ -1,22 +1,22 @@
 <?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"
    width="48"
    height="48"
    viewBox="0 0 12.7 12.7"
    version="1.1"
    id="svg8"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
    sodipodi:docname="feedback.svg"
-   inkscape:export-filename="C:\Users\pabr6\eclipse-workspace\evalWriter\icons\feedback.png"
+   inkscape:export-filename="feedback.png"
-   inkscape:export-xdpi="96"
+   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="96">
+   inkscape:export-ydpi="90"
+   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">
     <pattern
@@ -35,10 +35,10 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="7.5400948"
-     inkscape:cx="19.718926"
+     inkscape:cx="55.635905"
-     inkscape:cy="17.818307"
+     inkscape:cy="17.77166"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g867"
      inkscape:document-rotation="0"
      showgrid="false"
      inkscape:snap-global="false"
@@ -48,10 +48,13 @@
      fit-margin-bottom="0"
      units="px"
      inkscape:window-width="1920"
-     inkscape:window-height="1017"
+     inkscape:window-height="1009"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -60,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -71,18 +74,20 @@
      transform="translate(-62.773233,-87.475558)">
     <g
        id="g883"
-       transform="matrix(0.16442311,0,0,0.16442311,53.504569,74.385325)">
+       transform="matrix(0.16442311,0,0,0.16442311,53.60984,73.50807)">
       <g
-         transform="translate(-3.5201055,3.6458235)"
+         transform="matrix(1.2094444,0,0,1.2098415,-23.698851,-14.263268)"
-         id="g873">
+         id="g873"
+         style="stroke-width:0.82669">
         <path
            id="rect852"
-           style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:3.77953;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:4.75069861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 257.4668,318.72656 c -2.78101,0 -5.01953,2.23852 -5.01953,5.01953 v 76.50196 c 0,2.78101 2.23852,5.01953 5.01953,5.01953 h 109.44726 l 24.42188,27.43945 0.69726,-27.43945 h 20.45703 c 2.78102,0 5.01954,-2.23852 5.01954,-5.01953 v -76.50196 c 0,-2.78101 -2.23852,-5.01953 -5.01954,-5.01953 z"
+           d="m 257.4668,318.72656 c -2.78101,0 -5.01953,2.23852 -5.01953,5.01953 v 66.44796 c 0,2.78101 2.23852,5.01953 5.01953,5.01953 h 109.44726 l 24.42188,27.43945 -5.30503,-27.43945 h 46.57392 c 2.78102,0 5.01954,-2.23852 5.01954,-5.01953 v -66.44796 c 0,-2.78101 -2.23852,-5.01953 -5.01954,-5.01953 z"
-           transform="scale(0.26458333)" />
+           transform="scale(0.26458333)"
+           sodipodi:nodetypes="sssscccsssss" />
         <path
            sodipodi:type="star"
-           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:0.686837;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            id="path23"
            sodipodi:sides="5"
            sodipodi:cx="75.241814"
@@ -95,11 +100,12 @@
            inkscape:rounded="0"
            inkscape:randomized="0"
            d="m 78.927739,100.55295 -3.606466,-1.776805 -3.508249,1.963625 0.575382,-3.979017 -2.951626,-2.729749 3.962071,-0.682364 1.684044,-3.650701 1.873313,3.557291 3.992422,0.473492 -2.8043,2.880891 z"
-           inkscape:transform-center-x="0.049110126"
+           inkscape:transform-center-x="0.056965611"
-           inkscape:transform-center-y="-0.53122384" />
+           inkscape:transform-center-y="-0.66345805"
+           transform="matrix(1.159959,0,0,1.2489239,-11.637987,-24.792201)" />
         <path
-           inkscape:transform-center-y="-0.53122384"
+           inkscape:transform-center-y="-0.66345804"
-           inkscape:transform-center-x="0.049110126"
+           inkscape:transform-center-x="0.056965575"
            d="m 92.271069,100.3584 -3.606466,-1.776805 -3.508248,1.963625 0.575381,-3.979016 -2.951625,-2.72975 3.962071,-0.682363 1.684043,-3.650702 1.873314,3.557292 3.992421,0.473492 -2.804299,2.88089 z"
            inkscape:randomized="0"
            inkscape:rounded="0"
@@ -112,11 +118,12 @@
            sodipodi:cx="88.585144"
            sodipodi:sides="5"
            id="path25"
-           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:0.686837;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           sodipodi:type="star" />
+           sodipodi:type="star"
+           transform="matrix(1.159959,0,0,1.2489239,-11.388047,-24.549223)" />
         <path
            sodipodi:type="star"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:#ffcc00;fill-rule:evenodd;stroke:#000000;stroke-width:0.686837;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            id="path27"
            sodipodi:sides="5"
            sodipodi:cx="102.35942"
@@ -129,23 +136,24 @@
            inkscape:rounded="0"
            inkscape:randomized="0"
            d="m 106.04535,100.27158 -3.60647,-1.776799 -3.508248,1.963619 0.575381,-3.979011 -2.951626,-2.72975 3.962073,-0.682363 1.68404,-3.650702 1.87332,3.557292 3.99242,0.473492 -2.8043,2.88089 z"
-           inkscape:transform-center-x="0.049110126"
+           inkscape:transform-center-x="0.056965537"
-           inkscape:transform-center-y="-0.53122384" />
+           inkscape:transform-center-y="-0.66345804"
+           transform="matrix(1.159959,0,0,1.2489239,-11.637987,-24.440798)" />
       </g>
       <g
-         style="stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+         style="stroke-width:1.58355;stroke-miterlimit:4;stroke-dasharray:none"
-         transform="translate(-5.7830304,-1.2571805)"
+         transform="matrix(0.97698002,0,0,0.94363873,-3.4673138,7.6530387)"
          id="g867">
         <path
-           style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:#f4e3d7;stroke:#000000;stroke-width:1.58355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 98.766744,130.15106 c 0,0 0.327483,-2.88752 3.001446,-2.90217 1.27961,-0.0119 7.65141,-4.86002 10.10884,-11.85395 2.45744,-6.99393 6.63086,-4.79416 7.30121,-2.13652 0.67035,2.65764 -0.90141,7.56943 -1.67542,11.05778 l 11.50456,0.11169 c 5.16405,-0.1182 3.93304,6.29649 -0.1117,6.81338 3.6651,2.19244 2.12485,5.42471 -0.78186,5.69643 2.37601,1.42602 0.89301,5.6866 -1.67542,5.69643 2.52021,2.00519 1.50733,5.26044 -2.01051,5.36134 l -22.89741,0.22339 c -1.918509,-0.31149 -2.533497,-1.63682 -2.792368,-3.23914 z"
+           d="m 95.200985,138.16782 c 0,0 0.42399,-3.78914 3.88591,-3.80838 1.656695,-0.0155 9.906145,-6.37755 13.087725,-15.55531 3.18162,-9.17777 8.58485,-6.29113 9.45273,-2.80364 0.8679,3.48748 -1.16702,9.93296 -2.16911,14.51053 l 11.36921,0.14658 c 8.78985,0.54986 7.42987,7.79256 -0.14461,8.94083 8.71947,-0.17786 6.74408,7.58855 -0.75974,6.77015 6.34917,-1.18359 7.70214,6.99225 0.40251,7.00516 7.23718,2.6313 2.65285,8.07795 -1.90163,8.21036 l -29.644845,0.29314 c -2.48386,-0.40876 -3.28007,-2.14792 -3.61523,-4.25056 z"
            id="path858"
            sodipodi:nodetypes="cczzccccccccc" />
         <path
-           style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:#000080;stroke:#000000;stroke-width:1.58355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 97.896741,127.21752 h -5.854044 v 20.97699 h 5.64497 c 0,0 -0.479981,-0.8237 -0.627218,-1.81196 -0.147237,-0.98826 -0.146937,-16.19979 0.06969,-17.28337 0.216627,-1.08358 0.766602,-1.88166 0.766602,-1.88166 z"
+           d="M 93.200835,134.31829 H 71.198174 v 27.52699 h 21.73198 c 0,0 -0.621425,-1.08089 -0.812052,-2.37773 -0.190626,-1.29685 -0.190233,-21.25815 0.09018,-22.68007 0.28046,-1.42193 0.992505,-2.46919 0.992505,-2.46919 z"
            id="path863"
-           sodipodi:nodetypes="cccczzc" />
+           sodipodi:nodetypes="cccczzcc" />
       </g>
     </g>
   </g>

icons/marquenode.svg

@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg2"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   sodipodi:docname="marquenode.svg"
+   inkscape:export-filename="marquenodemini.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xml:space="preserve"
+   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"><defs
+     id="defs6"><linearGradient
+       inkscape:collect="always"
+       id="linearGradient1224"><stop
+         style="stop-color:#00e4ee;stop-opacity:1;"
+         offset="0"
+         id="stop1220" /><stop
+         style="stop-color:#f5ffee;stop-opacity:0.94554448;"
+         offset="1"
+         id="stop1222" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       id="linearGradient987"><stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop983" /><stop
+         style="stop-color:#fff600;stop-opacity:1;"
+         offset="1"
+         id="stop985" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient987"
+       id="linearGradient989"
+       x1="10.929111"
+       y1="3.3201933"
+       x2="11.315194"
+       y2="20.162182"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1224"
+       id="linearGradient1226"
+       x1="13.331294"
+       y1="10.162387"
+       x2="12.878121"
+       y2="21.833803"
+       gradientUnits="userSpaceOnUse" /></defs><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:zoom="11.414708"
+     inkscape:cx="11.520224"
+     inkscape:cy="14.455035"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g5436"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1"><sodipodi:guide
+       position="3.2214765,22.260403"
+       orientation="0,-1"
+       id="guide856"
+       inkscape:locked="false" /><sodipodi:guide
+       position="1.9006711,20.456376"
+       orientation="1,0"
+       id="guide858"
+       inkscape:locked="false" /><sodipodi:guide
+       position="22.195973,20.456376"
+       orientation="1,0"
+       id="guide860"
+       inkscape:locked="false" /><sodipodi:guide
+       position="1.9006711,20.456376"
+       orientation="0,-1"
+       id="guide862"
+       inkscape:locked="false" /><sodipodi:guide
+       position="22.195973,3.3181208"
+       orientation="0,-1"
+       id="guide1026"
+       inkscape:locked="false" /><sodipodi:guide
+       position="22.195973,1.8684564"
+       orientation="0,-1"
+       id="guide1028"
+       inkscape:locked="false" /><sodipodi:guide
+       position="1.9006711,4.5422819"
+       orientation="0,-1"
+       id="guide1030"
+       inkscape:locked="false" /><sodipodi:guide
+       position="5.7342282,9.1167785"
+       orientation="0,-1"
+       id="guide1032"
+       inkscape:locked="false" /><sodipodi:guide
+       position="5.7342282,9.1167785"
+       orientation="1,0"
+       id="guide1034"
+       inkscape:locked="false" /><sodipodi:guide
+       position="17.84698,9.1167785"
+       orientation="1,0"
+       id="guide1036"
+       inkscape:locked="false" /><sodipodi:guide
+       position="7.8281879,7.9892617"
+       orientation="0,-1"
+       id="guide1038"
+       inkscape:locked="false" /><sodipodi:guide
+       position="8.1237963,13.205882"
+       orientation="1,0"
+       id="guide1040"
+       inkscape:locked="false" /><sodipodi:guide
+       position="11.01745,7.9892617"
+       orientation="1,0"
+       id="guide1042"
+       inkscape:locked="false" /><sodipodi:guide
+       position="4.7355705,11.146309"
+       orientation="1,0"
+       id="guide1044"
+       inkscape:locked="false" /><sodipodi:guide
+       position="4.7355705,11.146309"
+       orientation="0,-1"
+       id="guide1046"
+       inkscape:locked="false" /><sodipodi:guide
+       position="18.910067,11.146309"
+       orientation="1,0"
+       id="guide1048"
+       inkscape:locked="false" /><sodipodi:guide
+       position="4.7355705,19.683221"
+       orientation="0,-1"
+       id="guide1050"
+       inkscape:locked="false" /><sodipodi:guide
+       position="20.585235,1.868456"
+       orientation="1,0"
+       id="guide1247"
+       inkscape:locked="false" /></sodipodi:namedview><g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g8"><g
+       id="g5436"><path
+         style="fill:url(#linearGradient1226);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 8.8143349,24 5.4753919,19.97423 9.1110521,10.074721 13.053334,7.0523047 18.835348,12.790515 18.484923,20.762686 15.186308,24 Z"
+         id="path1169"
+         sodipodi:nodetypes="cccccccc" /><path
+         style="fill:url(#linearGradient989);fill-opacity:1;stroke-width:1"
+         d="m 14.700987,24.38374 c 0.0042,-0.0041 0.06704,-0.05113 0.139517,-0.104582 0.639777,-0.471804 1.284686,-1.198464 1.773597,-1.998423 0.748372,-1.224491 1.183935,-2.60676 1.282087,-4.068736 0.0368,-0.548054 0.0044,-1.312445 -0.08018,-1.893961 -0.324454,-2.229871 -1.480917,-4.406749 -3.411415,-6.4215012 -0.417518,-0.4357416 -1.162966,-1.1379697 -1.174029,-1.1059623 -0.0029,0.00815 0.006,0.1038482 0.01972,0.2126523 0.04696,0.3739838 0.07156,0.7258457 0.08101,1.1591602 0.04311,1.973284 -0.445728,4.064106 -1.406588,6.016104 -0.150953,0.306664 -0.346554,0.663421 -0.488819,0.891561 -0.09055,0.14521 -0.09192,0.146531 -0.09623,0.09303 -0.04968,-0.616286 -0.239328,-1.309437 -0.517476,-1.891381 -0.292984,-0.612983 -0.596852,-1.046472 -1.0695034,-1.52572 -0.1503894,-0.152488 -0.2800445,-0.273167 -0.2881217,-0.268176 -0.00806,0.005 -0.023563,0.04951 -0.034421,0.09894 -0.034462,0.156853 -0.1820059,0.653818 -0.2775782,0.93491 -0.1917621,0.563995 -0.3846052,1.018067 -0.7737527,1.821886 -0.6735086,1.391196 -0.8199437,1.754017 -0.9793805,2.426598 -0.1189292,0.501678 -0.1643219,0.915064 -0.1643219,1.496272 0,0.498127 0.010184,0.585608 0.1108631,0.953466 0.1842306,0.673066 0.6314332,1.461069 1.2144019,2.139866 0.1786958,0.20807 0.5854436,0.615069 0.7635652,0.764038 0.082854,0.0693 0.148088,0.128557 0.1449562,0.131689 C 9.460618,24.25377 9.0100742,24.082887 8.7391295,23.968737 8.4350484,23.840632 7.8345418,23.540566 7.5607158,23.379903 6.3151057,22.64906 5.3685503,21.728563 4.7366616,20.633595 4.2421522,19.776683 3.9496917,18.823015 3.8545375,17.757129 3.8271993,17.45092 3.8232202,16.694175 3.8473465,16.395567 3.9596478,15.007456 4.3253439,13.760899 5.0709961,12.224469 5.4382455,11.46775 5.8302551,10.765585 6.7575587,9.2035144 8.0668798,6.9979265 8.6198051,5.9711078 9.1904829,4.6854183 9.7666585,3.38734 10.227244,2.0106542 10.514701,0.7273408 c 0.03535,-0.15776776 0.06718,-0.29612196 0.07075,-0.30745377 0.01114,-0.035361 1.352116,1.23683267 2.407726,2.28424927 1.897225,1.8825012 3.234614,3.3833026 4.348499,4.8798332 2.057008,2.7636395 3.084477,5.2440405 3.335354,8.0518325 0.0676,0.756473 0.07211,1.724946 0.01043,2.240376 -0.150834,1.260837 -0.54895,2.36509 -1.224304,3.395844 -0.248489,0.379255 -0.527335,0.724072 -0.870193,1.07607 -0.573902,0.589202 -1.170501,1.029455 -1.884106,1.390346 -0.585096,0.295904 -1.163881,0.494313 -1.759865,0.603283 -0.09808,0.01793 -0.195741,0.03639 -0.217044,0.041 -0.0213,0.0047 -0.03526,0.005 -0.031,0.001 z"
+         id="path357" /></g></g></svg>

src/MEPTL/HTML.java

@@ -385,6 +385,9 @@ public static String TablePointsSyntheseStyle2(String titre,double prop, String
 			if(nodeAna.getNomElt().equals("saut")) {
 				code = code + HTML.SautLigne();
 			}
+			if(nodeAna.getAttributs().get("marquenode")!=null) if(!nodeAna.getAttributs().get("marquenode").isEmpty()){
+				code = code + HTML.SautLigne()+ HTML.SautP8(nodeAna.getAttributs().get("marquenode") + HTML.SautLigne());
+			}
 			if(nodeAna.getAttributs().get("titre")!=null) if(!nodeAna.getAttributs().get("titre").isEmpty()){
 				if(nodeAna.getAttributs().get("proportioncorrect")!=null)if(!nodeAna.getAttributs().get("proportioncorrect").equals("NaN"))if(nodeAna.getAttributs().get("id")!=null) code = code + HTML.SautLigne()+ HTML.H1(nodeAna.getAttributs().get("titre"),nodeAna.getAttributs().get("id")) + HTML.SautLigne(); ;
 				if(nodeAna.getAttributs().get("proportioncorrect")==null)if(nodeAna.getAttributs().get("id")!=null) code = code + HTML.SautLigne()+ HTML.H1(nodeAna.getAttributs().get("titre"),nodeAna.getAttributs().get("id")) + HTML.SautLigne(); ;

src/MEPTL/feedbacks.java

@@ -520,7 +520,6 @@ public class feedbacks {
 //							 System.out.print("\t** Erreur menu, node : " + N.getNomElt());
 						 }
 					 }else {
-
 							 if(N.getAttributs().get("titre")!=null) {
 								 fichier.append(HTML.TablePointsSyntheseStyle(N.getAttributs().get("titre"),-1.0,"","", "",N.getAttributs().get("id")));
 							 }

src/MEPTL/meptl.java

@@ -1855,6 +1855,14 @@ public class meptl {
 	 * @return
 	 */
 	public static node addNodeSautTitre(node nodSujet, node nodanalyse, node nodmenu, Run a) {
+		if(nodSujet.getAttributs().get("marquenode")!=null) {
+			node N = new node();
+			N.setNomElt("saut");
+			N.getAttributs().put("marquenode", nodSujet.getAttributs().get("marquenode"));
+			N.setParent(nodanalyse);
+			N.setClose(true);
+			nodanalyse.getNodes().add(N);
+		}
 		if(nodSujet.getAttributs().get("titre")!=null) {
 			node N = new node();
 			N.setNomElt("saut");
@@ -1911,7 +1919,6 @@ public class meptl {
 				}
 			}
 		}
-			
 		return nodanalyse;	
 	}
 	

src/MEPTL/rechercherUnNodeStudent.java

@@ -250,7 +250,7 @@ public class rechercherUnNodeStudent {
 			}
 		}
 		if(nodStudent!=null) return nodStudent;
-		System.out.println("n'a pas trouvé par la méthode contenu rigoureusement exact");
+//		System.out.println("n'a pas trouvé par la méthode contenu rigoureusement exact");
 		if(nodSujet.getAttributs().get("recherche_contenu_exact")!=null) {
 			if(nodSujet.getAttributs().get("recherche_contenu_exact").equals("true")) {
 				if(!nodSujet.retourneLesContenusEnfants("").isEmpty()) {
@@ -262,7 +262,9 @@ public class rechercherUnNodeStudent {
 			}
 		}
 		if(nodStudent!=null) return nodStudent;
-		System.out.println("n'a pas trouvé par la méthode contenu exact sans casse et trim()");
+//		System.out.println("** n'a pas trouvé par la méthode contenu exact sans casse et trim() **");
+//		System.out.println(nodSujet.retourneLesContenusEnfants(""));
+//		System.out.println();
 		nodStudent = findNodeParContenuPlusProcheVoisinSim(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a, 0.75);
 		return nodStudent;
 	}

src/fenetres/afficheText.java

@@ -60,6 +60,7 @@ public class afficheText extends JEditorPane {
 			String imagePiedPageActive= "<img src="+afficheText.class.getResource("/resources/piedpageouimini.png").toString()+">";
 			String imageOU= "<img src="+afficheText.class.getResource("/resources/oumini.png").toString()+">";
 			String imageEvalPlacement= "<img src="+afficheText.class.getResource("/resources/ordreparagraphemini.png").toString()+">";
+			String imageMarqueNode= "<img src="+afficheText.class.getResource("/resources/marquenodemini.png").toString()+">";
 			
 			
 			StringBuilder sb = new StringBuilder();
@@ -137,6 +138,11 @@ public class afficheText extends JEditorPane {
 								sb.append("<li class=\"p4\">"+imageAllContent + " <b>" + Lesattributsdunode.get(i) + "=\"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</b></li>");
 							}
 						}
+						if(Lesattributsdunode.get(i).equals("marquenode")) {
+							if(nod.getAttributs().get(Lesattributsdunode.get(i)).length()>0) {
+								sb.append("<li class=\"p4\">"+imageMarqueNode + " <b>" + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</b></li>");
+							}
+						}
 						if(Lesattributsdunode.get(i).equals("titre")||Lesattributsdunode.get(i).equals("titre1")||Lesattributsdunode.get(i).equals("titre2")||Lesattributsdunode.get(i).equals("titre3")) {
 							if(nod.getAttributs().get(Lesattributsdunode.get(i)).length()>0) {
 								sb.append("<li class=\"p4\">"+imageTitre + " <b>" + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</b></li>");
@@ -208,6 +214,7 @@ public class afficheText extends JEditorPane {
 						if(Lesattributsdunode.get(i).equals("evalPlacement") && !nod.getAttributs().get(Lesattributsdunode.get(i)).equals("0")) {
 							sb.append("<li class=\"p4\">"+imageEvalPlacement+ " <b>" + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</b></li>");
 						}
+
 						
 //						sb.append("<li class=\"p4\"><b>" + Lesattributsdunode.get(i) + "=\"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</b></li>");
 					}

src/fenetres/createPopupMenu.java

@@ -64,6 +64,8 @@ import fenetres.create_act.actTitre3;
 import fenetres.create_act.actTitrePrincipal;
 import fenetres.create_act.actUpNode;
 import fenetres.create_act.actevalNameCreator;
+import fenetres.create_act.actmarquenodefalse;
+import fenetres.create_act.actmarquenodetrue;
 import fenetres.create_act.actsautfalse;
 import fenetres.create_act.actsautmultiplefalse;
 import fenetres.create_act.actsautmultipletrue;
@@ -465,6 +467,7 @@ if(nod!=null) {
 	 */
 	private JMenu mnPourFeedback(node nod) {
 		JMenu mnPourFeedback = new JMenu("Pour représentation feedback");
+		mnPourFeedback.setIcon(new ImageIcon(create.class.getResource("/resources/feedbackmini.png")));
 		mnPourFeedback.add(mnSaut());
 		mnPourFeedback.addSeparator();
 		mnPourFeedback.add(mnTitre());
@@ -473,6 +476,8 @@ if(nod!=null) {
 		if(listeDesNodesPourEvaluerPage.isPage(nod)) {
 			mnPourFeedback.addSeparator();
 			mnPourFeedback.add(mnSautMultiple());
+			mnPourFeedback.addSeparator();
+			mnPourFeedback.add(mnMarqueNode());
 		}
 		return mnPourFeedback;
 	}
@@ -536,6 +541,21 @@ if(nod!=null) {
 		return mnNiveau1;
 	}
 	
+	/**
+	 * Menu pour marquer les nodes évaluer dans le feedback des étudiants.</br>
+	 * Permet d'identifier les nodes évaluer pendant le création du fichier d'analyse.</br>
+	 * @return
+	 */
+	private JMenu mnMarqueNode() {
+		JMenu mnMarqueNode = new JMenu("Marque le node évalué dans le feedback");
+		mnMarqueNode.setIcon( new ImageIcon(create.class.getResource("/resources/marquenodemini.png")));
+		mnMarqueNode.add(new actmarquenodetrue());
+		mnMarqueNode.addSeparator();
+		mnMarqueNode.add(new actmarquenodefalse());
+		return mnMarqueNode;
+	}
+	
+	
 	/**
 	 * Menu regroupant les menus permettant de recherche un node par son contenu textuel.</br>
 	 * Ce menu apparaît uniquement pour les node de la liste recherche par contenu.</br>

src/fenetres/create_act/actmarquenodefalse.java

@@ -0,0 +1,29 @@
+package fenetres.create_act;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+
+import cXML.node;
+
+public class actmarquenodefalse extends AbstractAction{
+	{
+        putValue( Action.NAME, "false" );
+        putValue( Action.SHORT_DESCRIPTION, "false" ); 
+    }
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		node nod = (node) fenetres.create.getSelectNode().getUserObject();
+		for(int i = 0 ; i < nod.getNodes().size();i++) {
+			nod.getNodes().get(i).getAttributs().remove("marquenode");
+		}
+		fenetres.create.getTextNodeSelect().refreshAffichage(nod);
+	}
+
+}

src/fenetres/create_act/actmarquenodetrue.java

@@ -0,0 +1,30 @@
+package fenetres.create_act;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+
+import cXML.node;
+
+public class actmarquenodetrue extends AbstractAction{
+	{
+        putValue( Action.NAME, "true" );
+        putValue( Action.SHORT_DESCRIPTION, "true" ); 
+    }
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		node nod = (node) fenetres.create.getSelectNode().getUserObject();
+		for(int i = 0 ; i < nod.getNodes().size();i++) {
+			nod.getNodes().get(i).getAttributs().put("saut", "true");
+			nod.getNodes().get(i).getAttributs().put("marquenode", "** node ** " + nod.getNodes().get(i).getNomElt() );
+		}
+		fenetres.create.getTextNodeSelect().refreshAffichage(nod);
+	}
+
+}

src/fenetres/create_act/actsautmultiplefalse.java

@@ -22,6 +22,7 @@ public class actsautmultiplefalse extends AbstractAction{
 		node nod = (node) fenetres.create.getSelectNode().getUserObject();
 		for(int i = 0 ; i < nod.getNodes().size();i++) {
 			nod.getNodes().get(i).getAttributs().put("saut", "false");
+			nod.getNodes().get(i).getAttributs().remove("titre3");
 		}
 		fenetres.create.getTextNodeSelect().refreshAffichage(nod);
 	}

src/fenetres/create_act/actsautmultipletrue.java

@@ -22,6 +22,7 @@ public class actsautmultipletrue extends AbstractAction{
 		node nod = (node) fenetres.create.getSelectNode().getUserObject();
 		for(int i = 0 ; i < nod.getNodes().size();i++) {
 			nod.getNodes().get(i).getAttributs().put("saut", "true");
+			nod.getNodes().get(i).getAttributs().put("titre3", "** node **");
 		}
 		fenetres.create.getTextNodeSelect().refreshAffichage(nod);
 	}

src/list/listeAttributsAnalyseWriter.java

@@ -20,6 +20,7 @@ public class listeAttributsAnalyseWriter {
 		if(attribut.equals("titre1")) return true;
 		if(attribut.equals("titre2")) return true;
 		if(attribut.equals("titre3")) return true;
+		if(attribut.equals("marquenode")) return true;
 		if(attribut.equals("poids")) return true;
 		if(attribut.equals("analyseStyle")) return true;
 		if(attribut.equals("allContent")) return true;