MAJ V4.1.1 vérification des valeurs saisies, aide à la saisie.

2022-06-13 17:43:41 +02:00 · 2022-06-13 17:43:41 +02:00 · 2fcef893ce
parent cd762f54c2
commit 2fcef893ce
117 changed files with 1122 additions and 140 deletions
--- a/.classpath
+++ b/.classpath
@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="icons"/>
+	<classpathentry kind="src" path="icons">
+		<attributes>
+			<attribute name="ignore_optional_problems" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
@ -10,6 +14,6 @@
 	<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/zip4j-1.2.7.jar"/>
 	<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/miglayout15-swing.jar"/>
 	<classpathentry kind="lib" path="jgoodies-forms-1.8.0.jar" sourcepath="jgoodies-forms-1.8.0-sources.jar"/>
-	<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar" sourcepath="/cXML"/>
+	<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/aW.xml
+++ b/aW.xml
@ -3,7 +3,7 @@
  <dontWrapJar>false</dontWrapJar>
  <headerType>gui</headerType>
  <jar>C:\Users\pabr6\git\analyseWriter\MEPTL\analyseWriter.jar</jar>
-  <outfile>C:\Users\pabr6\OneDrive\Documents\Troisième exercices avec analyseWriter\analyseWriter\analyseWriter.exe</outfile>
+  <outfile>C:\Users\pabr6\OneDrive\Desktop\analyseWriter.exe</outfile>
  <errTitle>Erreur</errTitle>
  <cmdLine></cmdLine>
  <chdir></chdir>
--- a/analyseWriter.jar
+++ b/analyseWriter.jar
--- a/bin/.gitignore
+++ b/bin/.gitignore
@ -1,2 +1,3 @@
-/app/
 /MEPTL/
+/app/
+/calcul/
--- a/bin/MEPTL/rechercherUnNodeStudent.class
+++ b/bin/MEPTL/rechercherUnNodeStudent.class
--- a/bin/app/afficheText.class
+++ b/bin/app/afficheText.class
--- a/bin/app/attributs$1.class
+++ b/bin/app/attributs$1.class
--- a/bin/app/attributs$10.class
+++ b/bin/app/attributs$10.class
--- a/bin/app/attributs$11.class
+++ b/bin/app/attributs$11.class
--- a/bin/app/attributs$2.class
+++ b/bin/app/attributs$2.class
--- a/bin/app/attributs$3.class
+++ b/bin/app/attributs$3.class
--- a/bin/app/attributs$4.class
+++ b/bin/app/attributs$4.class
--- a/bin/app/attributs$5.class
+++ b/bin/app/attributs$5.class
--- a/bin/app/attributs$6.class
+++ b/bin/app/attributs$6.class
--- a/bin/app/attributs$7.class
+++ b/bin/app/attributs$7.class
--- a/bin/app/attributs$8.class
+++ b/bin/app/attributs$8.class
--- a/bin/app/attributs$9.class
+++ b/bin/app/attributs$9.class
--- a/bin/app/attributs$MyMouseListener.class
+++ b/bin/app/attributs$MyMouseListener.class
--- a/bin/app/attributs.class
+++ b/bin/app/attributs.class
--- a/bin/app/create$1.class
+++ b/bin/app/create$1.class
--- a/bin/app/create$10.class
+++ b/bin/app/create$10.class
--- a/bin/app/create$11.class
+++ b/bin/app/create$11.class
--- a/bin/app/create$12.class
+++ b/bin/app/create$12.class
--- a/bin/app/create$13.class
+++ b/bin/app/create$13.class
--- a/bin/app/create$14.class
+++ b/bin/app/create$14.class
--- a/bin/app/create$15.class
+++ b/bin/app/create$15.class
--- a/bin/app/create$16.class
+++ b/bin/app/create$16.class
--- a/bin/app/create$17.class
+++ b/bin/app/create$17.class
--- a/bin/app/create$18.class
+++ b/bin/app/create$18.class
--- a/bin/app/create$19.class
+++ b/bin/app/create$19.class
--- a/bin/app/create$2.class
+++ b/bin/app/create$2.class
--- a/bin/app/create$20.class
+++ b/bin/app/create$20.class
--- a/bin/app/create$21.class
+++ b/bin/app/create$21.class
--- a/bin/app/create$22.class
+++ b/bin/app/create$22.class
--- a/bin/app/create$23.class
+++ b/bin/app/create$23.class
--- a/bin/app/create$24.class
+++ b/bin/app/create$24.class
--- a/bin/app/create$25.class
+++ b/bin/app/create$25.class
--- a/bin/app/create$26.class
+++ b/bin/app/create$26.class
--- a/bin/app/create$27.class
+++ b/bin/app/create$27.class
--- a/bin/app/create$28.class
+++ b/bin/app/create$28.class
--- a/bin/app/create$29.class
+++ b/bin/app/create$29.class
--- a/bin/app/create$3.class
+++ b/bin/app/create$3.class
--- a/bin/app/create$30.class
+++ b/bin/app/create$30.class
--- a/bin/app/create$31.class
+++ b/bin/app/create$31.class
--- a/bin/app/create$32.class
+++ b/bin/app/create$32.class
--- a/bin/app/create$33.class
+++ b/bin/app/create$33.class
--- a/bin/app/create$34.class
+++ b/bin/app/create$34.class
--- a/bin/app/create$35.class
+++ b/bin/app/create$35.class
--- a/bin/app/create$36.class
+++ b/bin/app/create$36.class
--- a/bin/app/create$37.class
+++ b/bin/app/create$37.class
--- a/bin/app/create$38.class
+++ b/bin/app/create$38.class
--- a/bin/app/create$39.class
+++ b/bin/app/create$39.class
--- a/bin/app/create$4.class
+++ b/bin/app/create$4.class
--- a/bin/app/create$40.class
+++ b/bin/app/create$40.class
--- a/bin/app/create$41.class
+++ b/bin/app/create$41.class
--- a/bin/app/create$42.class
+++ b/bin/app/create$42.class
--- a/bin/app/create$43.class
+++ b/bin/app/create$43.class
--- a/bin/app/create$44.class
+++ b/bin/app/create$44.class
--- a/bin/app/create$45.class
+++ b/bin/app/create$45.class
--- a/bin/app/create$46.class
+++ b/bin/app/create$46.class
--- a/bin/app/create$47.class
+++ b/bin/app/create$47.class
--- a/bin/app/create$48.class
+++ b/bin/app/create$48.class
--- a/bin/app/create$49.class
+++ b/bin/app/create$49.class
--- a/bin/app/create$5.class
+++ b/bin/app/create$5.class
--- a/bin/app/create$50.class
+++ b/bin/app/create$50.class
--- a/bin/app/create$51.class
+++ b/bin/app/create$51.class
--- a/bin/app/create$52.class
+++ b/bin/app/create$52.class
--- a/bin/app/create$53.class
+++ b/bin/app/create$53.class
--- a/bin/app/create$54.class
+++ b/bin/app/create$54.class
--- a/bin/app/create$55.class
+++ b/bin/app/create$55.class
--- a/bin/app/create$56.class
+++ b/bin/app/create$56.class
--- a/bin/app/create$57.class
+++ b/bin/app/create$57.class
--- a/bin/app/create$58.class
+++ b/bin/app/create$58.class
--- a/bin/app/create$59.class
+++ b/bin/app/create$59.class
--- a/bin/app/create$6.class
+++ b/bin/app/create$6.class
--- a/bin/app/create$7.class
+++ b/bin/app/create$7.class
--- a/bin/app/create$8.class
+++ b/bin/app/create$8.class
--- a/bin/app/create$9.class
+++ b/bin/app/create$9.class
--- a/bin/app/create.class
+++ b/bin/app/create.class
--- a/bin/app/mainApp$1.class
+++ b/bin/app/mainApp$1.class
--- a/bin/app/mainApp$2.class
+++ b/bin/app/mainApp$2.class
--- a/bin/app/mainApp.class
+++ b/bin/app/mainApp.class
--- a/bin/app/proprieteFichierAnalyse$1.class
+++ b/bin/app/proprieteFichierAnalyse$1.class
--- a/bin/app/proprieteFichierAnalyse$2.class
+++ b/bin/app/proprieteFichierAnalyse$2.class
--- a/bin/app/proprieteFichierAnalyse$3.class
+++ b/bin/app/proprieteFichierAnalyse$3.class
--- a/bin/app/proprieteFichierAnalyse$4.class
+++ b/bin/app/proprieteFichierAnalyse$4.class
--- a/bin/app/proprieteFichierAnalyse.class
+++ b/bin/app/proprieteFichierAnalyse.class
--- a/bin/calcul/listeAttributsAnalyseWriter.class
+++ b/bin/calcul/listeAttributsAnalyseWriter.class
--- a/bin/calcul/listeNodeAnalyseWriter.class
+++ b/bin/calcul/listeNodeAnalyseWriter.class
--- a/bin/resources/atraversanalysestyle.png
+++ b/bin/resources/atraversanalysestyle.png
--- a/bin/resources/atraversanalysestylemini.png
+++ b/bin/resources/atraversanalysestylemini.png
--- a/bin/resources/treeClose.png
+++ b/bin/resources/treeClose.png
--- a/bin/resources/treeLeaf.png
+++ b/bin/resources/treeLeaf.png
--- a/icons/atraversanalysestyle.png
+++ b/icons/atraversanalysestyle.png
--- a/icons/atraversanalysestyle.svg
+++ b/icons/atraversanalysestyle.svg
@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   inkscape:export-ydpi="51.200001"
+   inkscape:export-xdpi="51.200001"
+   inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\atraversanalysestylemini.png"
+   sodipodi:docname="atraversanalysestyle.svg"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 11.90625 11.90625"
+   height="45"
+   width="45"
+   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">
+    <marker
+       style="overflow:visible"
+       id="Arrow2Mstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mstart"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.6) translate(0,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         style="stroke:context-stroke;fill-rule:evenodd;fill:context-stroke;stroke-width:0.62500000;stroke-linejoin:round"
+         id="path1092" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-global="false"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:window-height="1009"
+     inkscape:window-width="1920"
+     inkscape:object-nodes="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-page="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="g1030"
+     inkscape:document-units="mm"
+     inkscape:cy="21.493944"
+     inkscape:cx="23.049426"
+     inkscape:zoom="7.0717595"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:pagecheckerboard="0"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true" />
+  <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
+     inkscape:label="Calque 2"
+     id="layer2"
+     inkscape:groupmode="layer">
+    <g
+       transform="matrix(0.12313291,0,0,0.12313291,3.8933229,-12.453772)"
+       id="g862"
+       style="fill:#0000ff">
+      <g
+         id="g1030">
+        <path
+           style="fill:#ffff00;stroke:#000000;stroke-width:2.31646px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m -8.81245,105.86292 h 51.052112 l 20.534924,32.54802 -44.777547,54.34903 -46.774001,-54.34903 z"
+           id="path3908"
+           sodipodi:nodetypes="cccccc" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:78.097px;line-height:1.25;font-family:Algerian;-inkscape-font-specification:Algerian;text-align:center;text-anchor:middle;fill:#008080;stroke-width:1.95244"
+           x="17.992798"
+           y="162.66893"
+           id="text2541"
+           transform="scale(0.98648788,1.0136972)"><tspan
+             sodipodi:role="line"
+             id="tspan2539"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Algerian;-inkscape-font-specification:Algerian;fill:#008080;stroke-width:1.95244"
+             x="17.992798"
+             y="162.66893">S</tspan></text>
+        <path
+           style="fill:#ff0000;stroke:#ff0000;stroke-width:5.40067;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Mstart)"
+           d="M 55.58641,110.56027 19.731976,143.07235"
+           id="path1066"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#ff0000;stroke-width:5.40067;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M -27.364949,185.6115 -5.487668,165.25348"
+           id="path1473"
+           sodipodi:nodetypes="cc" />
+      </g>
+    </g>
+  </g>
+</svg>
--- a/icons/atraversanalysestylemini.png
+++ b/icons/atraversanalysestylemini.png
--- a/icons/treeClose.png
+++ b/icons/treeClose.png
--- a/icons/treeClose.svg
+++ b/icons/treeClose.svg
@ -0,0 +1,268 @@
+<?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\treeClose.png"
+   sodipodi:docname="treeClose.svg"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 5.2167803 3.444775"
+   height="13.019622"
+   width="19.716965"
+   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,-863.30581,-7811.3988)"
+       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(10.661607,-2.6314354)">
+      <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="-0.1344148"
+     inkscape:cx="-9.4090359"
+     inkscape:zoom="14.879314"
+     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="true">
+    <sodipodi:guide
+       id="guide14"
+       orientation="1,0"
+       position="-0.21004355,-3.5079848" />
+    <sodipodi:guide
+       position="0.53679872,3.9358516"
+       orientation="0.70710678,-0.70710678"
+       id="guide3385" />
+    <sodipodi:guide
+       position="2.0977673,1.0715979"
+       orientation="0,-1"
+       id="guide3467" />
+    <sodipodi:guide
+       position="0.64349047,2.6022048"
+       orientation="-0.70710678,-0.70710678"
+       id="guide3469" />
+    <sodipodi:guide
+       position="2.0824775,2.3198312"
+       orientation="0,-1"
+       id="guide1111" />
+    <sodipodi:guide
+       position="3.4010321,3.262275"
+       orientation="1,0"
+       id="guide1113" />
+  </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(-1.1301771,-2.0290664)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.365;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 3.2126546,3.1540102 1.312669,3.7782346 3.2279444,4.4022435"
+       id="path3504"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.365;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4.5312092,3.1540102 6.1644654,3.7782346 4.5312092,4.4022435"
+       id="path996"
+       sodipodi:nodetypes="ccc" />
+    <ellipse
+       style="opacity:1;fill:#000000;stroke-width:0.079375;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
+       id="path964"
+       cx="2.5694814"
+       cy="3.7884479"
+       rx="0.5"
+       ry="0.49999997" />
+    <ellipse
+       style="opacity:1;fill:#000000;stroke-width:0.079375;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
+       id="ellipse1280"
+       cx="3.6719627"
+       cy="3.7884479"
+       rx="0.5"
+       ry="0.49999997" />
+    <ellipse
+       style="opacity:1;fill:#000000;stroke-width:0.079375;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
+       id="ellipse1282"
+       cx="4.7744441"
+       cy="3.7884479"
+       rx="0.5"
+       ry="0.49999997" />
+  </g>
+</svg>
--- a/icons/treeLeaf.png
+++ b/icons/treeLeaf.png
--- a/icons/treeLeaf.svg
+++ b/icons/treeLeaf.svg
@ -0,0 +1,258 @@
+<?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\treeLeaf.png"
+   sodipodi:docname="treeLeaf.svg"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 5.2167803 3.444775"
+   height="13.019622"
+   width="19.716965"
+   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,-863.30581,-7811.3988)"
+       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(10.661607,-2.6314354)">
+      <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="-0.1344148"
+     inkscape:cx="-9.4090359"
+     inkscape:zoom="14.879314"
+     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="true">
+    <sodipodi:guide
+       id="guide14"
+       orientation="1,0"
+       position="-0.21004355,-3.5079848" />
+    <sodipodi:guide
+       position="0.53679872,3.9358516"
+       orientation="0.70710678,-0.70710678"
+       id="guide3385" />
+    <sodipodi:guide
+       position="2.0977673,1.0715979"
+       orientation="0,-1"
+       id="guide3467" />
+    <sodipodi:guide
+       position="0.64349047,2.6022048"
+       orientation="-0.70710678,-0.70710678"
+       id="guide3469" />
+    <sodipodi:guide
+       position="2.0824775,2.3198312"
+       orientation="0,-1"
+       id="guide1111" />
+    <sodipodi:guide
+       position="3.4010321,3.262275"
+       orientation="1,0"
+       id="guide1113" />
+  </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(-1.1301771,-2.0290664)">
+    <ellipse
+       style="opacity:1;fill:#000000;stroke-width:0.079375;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
+       id="path964"
+       cx="2.5694814"
+       cy="3.7884479"
+       rx="0.5"
+       ry="0.49999997" />
+    <ellipse
+       style="opacity:1;fill:#000000;stroke-width:0.079375;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
+       id="ellipse1280"
+       cx="3.6719627"
+       cy="3.7884479"
+       rx="0.5"
+       ry="0.49999997" />
+    <ellipse
+       style="opacity:1;fill:#000000;stroke-width:0.079375;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
+       id="ellipse1282"
+       cx="4.7744441"
+       cy="3.7884479"
+       rx="0.5"
+       ry="0.49999997" />
+  </g>
+</svg>
--- a/Show More
+++ b/Show More