MAJ V4.4.1 (icon csvstudent. prise en compte des text:line-break dans

les doublon)
This commit is contained in:
pablo rodriguez 2022-12-18 16:22:56 +01:00
parent cb54c67689
commit 321d957e10
61 changed files with 386 additions and 91 deletions

View File

@ -12,6 +12,6 @@
<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/Exportation documentation analyseWriter/plugins/documentation.analyseWriter_1.0.0.202212032022.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar" sourcepath="/cXML"/>
<classpathentry kind="output" path="bin"/>
</classpath>

Binary file not shown.

Binary file not shown.

68
bin/.gitignore vendored
View File

@ -3,70 +3,4 @@
/evaluer/
/fenetres/
/list/
/structurepage.svg
/stylepage.png
/stylepage.svg
/styleparagraphe.png
/styleparagraphe.svg
/supprime.svg
/supprimemini.png
/textclean.png
/textclean.svg
/textcleanmini.png
/titre.svg
/titremini.png
/totalpoint.png
/totalpoint.svg
/totalpointmini.png
/totalpointnode.png
/totalpointnode.svg
/totalpointnodemini.png
/touslesnodes.png
/touslesnodes.svg
/touslesnodesmini.png
/toutext.png
/toutext.svg
/toutextmini.png
/traduction.png
/traduction.svg
/traductionmini.png
/treeClose.png
/treeClose.svg
/treeLeaf.png
/treeLeaf.svg
/treeOpen.png
/treeOpen.svg
/triche.png
/triche.svg
/trichemini.png
/true.png
/true.svg
/truemini.png
/tutoriel.png
/tutoriel.svg
/tutorielmini.png
/undo.png
/upnode.png
/upnode.svg
/upnodemini.png
/verifhistorique.png
/verifhistoriquemax.png
/verifhistoriquemini.png
/verifhistoriquestudent.png
/verifhistoriquestudent.svg
/verifhistoriquestudentmini.png
/versevaluate.png
/versevaluate.svg
/versevaluatemini.png
/versfichierAnalyse.png
/versfichierAnalyseModifmax.svg
/voir.svg
/voirmini.png
/what.svg
/whatmini.png
/zip.png
/zip.svg
/zipmini.png
/zipstudent.png
/zipstudent.svg
/zipstudentmini.png
/resources/

BIN
bin/csvstudent.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

161
bin/csvstudent.svg Normal file
View File

@ -0,0 +1,161 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="45"
height="45"
viewBox="0 0 11.90625 11.90625"
version="1.1"
id="svg5"
xml:space="preserve"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="csvstudent.svg"
inkscape:export-filename="nocsvstudentmini.png"
inkscape:export-xdpi="51.200001"
inkscape:export-ydpi="51.200001"
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"><sodipodi:namedview
id="namedview7"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="9.215562"
inkscape:cx="22.950309"
inkscape:cy="15.354462"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" /><defs
id="defs2"><inkscape:path-effect
effect="powerstroke"
id="path-effect966"
is_visible="true"
lpeversion="1"
offset_points="0,0.012910556"
not_jump="false"
sort_points="true"
interpolator_type="CubicBezierJohan"
interpolator_beta="0.2"
start_linecap_type="zerowidth"
linejoin_type="extrp_arc"
miter_limit="4"
scale_width="1"
end_linecap_type="zerowidth" /><inkscape:path-effect
effect="powerstroke"
id="path-effect960"
is_visible="true"
lpeversion="1"
offset_points="0,0.012910556"
not_jump="false"
sort_points="true"
interpolator_type="CubicBezierJohan"
interpolator_beta="0.2"
start_linecap_type="zerowidth"
linejoin_type="extrp_arc"
miter_limit="4"
scale_width="1"
end_linecap_type="zerowidth" /><inkscape:path-effect
effect="powerstroke"
id="path-effect252"
is_visible="true"
lpeversion="1"
offset_points="0.058411546,-0.012910556"
not_jump="false"
sort_points="true"
interpolator_type="CubicBezierJohan"
interpolator_beta="0.2"
start_linecap_type="zerowidth"
linejoin_type="extrp_arc"
miter_limit="4"
scale_width="1"
end_linecap_type="zerowidth" /></defs><g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"><path
style="fill:#000000;stroke-width:1"
d="m -171.58912,73.166449 c -1.19191,-0.59 -1.97712,-1.513364 -2.44802,-2.878762 -0.44754,-1.29767 -0.44754,-113.584819 0,-114.882489 0.47451,-1.375854 1.26826,-2.302994 2.4695,-2.884508 1.07926,-0.522457 1.65617,-0.528412 51.19532,-0.528412 49.539148,0 50.116058,0.006 51.195318,0.528412 1.20125,0.581514 1.99499,1.508654 2.4695,2.884508 0.44755,1.29767 0.44755,113.584819 0,114.882489 -0.47451,1.375852 -1.26825,2.302992 -2.4695,2.884506 -1.07926,0.522462 -1.65595,0.52841 -51.212708,0.528204 -49.73132,-2.07e-4 -50.12954,-0.0044 -51.19941,-0.533948 z m 37.87347,-8.328382 c 2.1486,-0.65188 2.0883,-0.520821 1.56832,-3.408717 -0.25207,-1.399976 -0.53354,-2.544122 -0.6255,-2.542547 -0.092,0.0016 -0.75167,0.18017 -1.46602,0.396875 -4.09236,1.241461 -6.77983,-0.553387 -6.76516,-4.518168 0.0152,-4.099954 2.58885,-5.928087 6.52608,-4.63559 0.95664,0.314045 1.76772,0.536935 1.8024,0.495316 0.0347,-0.04162 0.25968,-0.96864 0.49998,-2.060046 0.2403,-1.091406 0.50804,-2.25276 0.59497,-2.580788 0.13565,-0.511847 -0.0183,-0.674415 -1.08559,-1.146537 -3.54423,-1.567778 -8.75398,-0.636551 -11.43631,2.044215 -2.03909,2.037885 -3.03453,4.683705 -3.03453,8.06554 0,4.000685 1.27887,6.644984 4.31471,8.921429 1.70438,1.278038 6.43055,1.78094 9.10665,0.969018 z m 15.30921,-0.149095 c 3.56838,-1.335103 5.1938,-5.662036 3.44515,-9.171127 -0.77831,-1.561852 -1.61696,-2.267673 -4.29977,-3.618714 -2.10383,-1.059466 -2.54227,-1.61035 -1.74956,-2.198206 0.62525,-0.463672 2.37588,-0.257691 4.05263,0.47684 0.64095,0.280781 1.19555,0.4793 1.23243,0.441155 0.21214,-0.219363 1.40468,-4.805068 1.29553,-4.981686 -0.28812,-0.466182 -3.18841,-1.325358 -4.98729,-1.47742 -4.81546,-0.407056 -8.26389,2.446311 -8.20198,6.786626 0.0393,2.756403 1.2673,4.265636 5.05899,6.217708 2.14987,1.106816 2.52215,1.612421 1.75331,2.381258 -0.64125,0.641255 -3.03529,0.399426 -5.01406,-0.506487 -0.83105,-0.380468 -1.55492,-0.647842 -1.6086,-0.594164 -0.10999,0.10999 -0.87924,4.36295 -0.87979,4.864161 -2e-4,0.178165 0.35446,0.50742 0.78813,0.731681 2.43276,1.25803 6.67826,1.560028 9.11488,0.648375 z m 21.775443,-9.64149 c 1.636275,-5.529792 2.976522,-10.202995 2.978321,-10.384896 0.0024,-0.245536 -0.777872,-0.330729 -3.029238,-0.330729 h -3.032508 l -0.260834,0.992188 c -0.143454,0.545703 -0.767674,2.94478 -1.387134,5.331282 l -1.1263,4.339098 -1.33505,-5.26514 -1.33504,-5.265136 -3.39382,-0.0742 c -3.15043,-0.06888 -3.3835,-0.04042 -3.2499,0.396875 0.19816,0.648605 5.10232,18.086093 5.45646,19.401258 l 0.28595,1.06195 3.22702,-0.07419 3.227021,-0.07419 z M -73.276482,-2.1025153 V -41.128555 h -47.095838 -47.09583 V -2.1025153 36.923524 h 47.09583 47.095838 z m -81.545088,-1.1058785 v -5.8243999 l 8.7974,0.06971 8.79739,0.06971 0.0713,5.7546869 0.0713,5.7546881 h -8.8687 -8.8687 z m 0.54636,-16.5217252 0.0713,-5.754688 8.79739,-0.06971 8.7974,-0.06971 v 5.8244 5.8244 h -8.8687 -8.8687 z m 24.73506,16.5836925 v -5.8208332 h 8.86354 8.86354 v 5.8208332 5.8208331 h -8.86354 -8.86354 z m -0.91162,-17.4446945 v -5.820833 h 8.86354 8.86355 v 5.820833 5.820833 h -8.86355 -8.86354 z"
id="path431"
sodipodi:nodetypes="csssscsssscsscscsssssssssssssssssssssssssscscsscccssscccsccccccccccccccccccccccccccccccccccccccccccccc" /><g
id="g542"><path
style="fill:#008000;stroke-width:1"
d="m 0.99007909,0.05223377 c -0.11660045,0.057715 -0.19341358,0.14804643 -0.23948087,0.28161886 -0.0437832,0.12694638 -0.0437832,11.11158037 0,11.23852737 0.0464187,0.134594 0.1240695,0.225293 0.24158307,0.28218 0.10557921,0.05111 0.16201641,0.05169 5.00824761,0.05169 4.8462291,0 4.9026671,-5.88e-4 5.0082481,-0.05169 0.117513,-0.05689 0.195162,-0.147586 0.241581,-0.28218 0.04378,-0.126947 0.04378,-11.11158099 0,-11.23852737 C 11.203838,0.19925794 11.126189,0.10855914 11.008677,0.05167206 10.903096,5.5915658e-4 10.846681,-1.7643419e-5 5.9987278,5.658109e-8 1.1336975,2.0466581e-5 1.0947408,4.3042658e-4 0.99007909,0.05223106 Z M 10.607639,7.415517 V 11.23329 H 6.0004289 1.393218 V 7.415517 3.5977442 H 6.0004289 10.607639 Z M 2.7909113,5.6687499 v 0.5697795 l 0.8606164,-0.00683 0.8606164,-0.00683 0.00701,-0.56296 0.00701,-0.56296 H 3.6585726 2.7909806 Z M 5.1462824,5.6683976 V 6.237831 H 6.0004289 6.8545745 V 5.6684003 5.0989696 H 6.0004289 5.1462824 Z m 2.3354547,-0.00648 0.00701,0.56296 0.8606173,0.00683 0.8606164,0.00683 V 5.6687659 5.0989864 H 8.342389 7.4747969 Z M 2.767048,7.410616 V 7.9800467 H 3.6341351 4.5012232 V 7.410616 6.8411862 H 3.6341351 2.767048 Z m 9e-7,1.7600582 v 0.569431 H 3.634136 4.5012232 V 9.1706742 8.6012435 H 3.634136 2.7670489 Z"
id="path331"
sodipodi:nodetypes="csssscssssccccccccccccccccccccccccccccccccccccccccccccccccccccccc" /><text
xml:space="preserve"
style="font-size:3.52778px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;fill:#ffffff;stroke-width:0.264583"
x="1.8981769"
y="3.0433123"
id="text487"><tspan
sodipodi:role="line"
id="tspan485"
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:3.52778px;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ffffff;stroke-width:0.264583"
x="1.8981769"
y="3.0433123">CSV</tspan></text><rect
style="fill:#008000;fill-opacity:1;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect946"
width="1.7211634"
height="1.1259199"
x="5.1146417"
y="6.8344316" /><rect
style="fill:#008000;fill-opacity:1;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect1207"
width="1.7211634"
height="1.1259199"
x="5.1146417"
y="8.5570612" /><rect
style="fill:#008000;fill-opacity:1;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect1209"
width="1.7211634"
height="1.1259199"
x="7.4401917"
y="6.8344316" /><rect
style="fill:#008000;fill-opacity:1;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect1211"
width="1.7211634"
height="1.1259199"
x="7.4401917"
y="8.5283508" /></g><path
style="fill:#000000;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.4;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
d="m 1.5783228,0.97545751 c 0,0 -0.00953,0.00871 -0.00953,0.00871 C 3.3531744,2.9365984 8.7158494,8.7851819 10.500231,10.737613 8.7158494,8.7851819 3.3722345,2.9191788 1.5878529,0.96674772 c 0,0 -0.00953,0.00871 -0.00953,0.00871 z"
id="path958"
inkscape:path-effect="#path-effect960"
inkscape:original-d="M 1.5783228,0.97545751 10.500231,10.737613" /><path
style="fill:#000000;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.4;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
d="m 10.488196,0.97545751 c 0,0 -0.0095,-0.00871 -0.0095,-0.00871 C 8.6942844,2.9191788 3.3506698,8.7851819 1.5662882,10.737613 3.3506698,8.7851819 8.7133445,2.9365984 10.497726,0.9841673 c 0,0 -0.0095,-0.00871 -0.0095,-0.00871 z"
id="path962"
inkscape:path-effect="#path-effect966"
inkscape:original-d="M 10.488196,0.97545751 1.5662882,10.737613" /><path
style="fill:#ffccaa;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 6.3819491,5.8169641 1.727385,0.241655 1.646832,-0.393808 -0.02685,0.724965 0.2864059,0.393808 v 0.832366 l -0.3043069,0.268506 -0.510159,0.957669 -0.868168,0.599662 -1.00242,-0.116352 -0.653363,-0.698114 -0.393808,-0.769716 -0.250605,-0.143203 -0.205854,-0.52806 0.205854,-0.528061 0.161103,-0.214804 0.009,-0.626513 z"
id="path556" /><g
id="g570"
transform="matrix(0.00893625,0,0,0.00893625,2.8815422,4.5015059)"
style="fill:#000000;stroke-width:29.6078"><g
transform="matrix(0.08797553,0,0,-0.08797553,124.40311,399.9922)"
id="g568"
style="fill:#000080;stroke-width:33.6545"><path
d="M 3122.6,4604.2 C 2231.7,4380.5 1476.5,4187.4 1444,4174 c -68.8,-28.7 -114.7,-107.1 -114.7,-193.1 0,-42.1 19.1,-76.5 63.1,-120.4 l 61.2,-61.2 554.4,-63.1 c 305.9,-34.4 1152.8,-128.1 1883.1,-210.3 l 1328.7,-149.1 1508.4,380.5 c 827.8,208.4 1514.1,378.5 1523.7,378.5 9.6,0 17.2,-275.3 17.2,-636.6 V 2864.5 L 8078,2673.3 c -286.8,-284.9 -286.8,-237.1 -3.8,-804.9 191.2,-382.4 242.8,-470.3 290.6,-495.2 78.4,-40.1 158.7,-36.3 217.9,11.5 68.8,53.5 489.4,892.8 489.4,973.1 0,89.9 -40.1,147.2 -227.5,334.6 l -174,172.1 v 806.8 808.7 l -53.5,59.3 -53.5,61.2 L 6690,4807 c -1028.6,114.7 -1888.9,206.5 -1909.9,206.5 -21,-0.2 -766.6,-185.6 -1657.5,-409.3 z"
id="path558"
style="fill:#000080;stroke-width:33.6545" /><path
d="m 6340.2,3243 -1099.3,-275.3 -1344,149.1 -1344,149.1 v -569.7 -569.7 l -103.2,-99.4 C 2260.4,1839.7 2170.6,1596.9 2157.2,1218.4 2140,816.9 2229.9,493.8 2411.5,293.1 2484,212.7 2642.7,121 2711.5,121 c 17.2,0 32.5,-15.3 32.5,-32.5 0,-63.1 191.2,-510.5 298.2,-697.8 369,-651.9 892.8,-1091.7 1491.2,-1248.4 290.6,-76.5 642.4,-76.5 933,0 728.4,191.2 1345.9,803 1693.9,1676.7 51.7,133.7 95.7,256.1 95.7,273.3 0,15.3 15.3,28.7 34.4,28.7 66.9,0 225.6,91.8 298.3,172.1 181.6,200.7 271.5,523.8 256.2,925.3 -15.3,380.5 -110.9,629 -307.8,808.7 l -80.3,70.7 -9.6,709.3 -9.6,709.3 z M 3222,2375 c 229.4,-65 602.2,-135.7 908.1,-174 137.7,-15.3 435.9,-24.8 869.9,-24.8 694,0 869.9,13.4 1328.7,97.5 216,38.2 575.5,130 686.4,172.1 34.4,13.4 36.3,3.8 22.9,-273.4 l -13.4,-286.8 49.7,-59.3 c 32.5,-40.1 76.5,-65 130,-74.6 70.7,-15.3 86,-26.8 133.8,-114.7 149.1,-277.2 135.8,-812.5 -22.9,-1036.2 -40.1,-57.4 -45.9,-57.4 -154.9,-45.9 -107.1,9.6 -114.7,7.6 -170.2,-45.9 -30.6,-32.5 -65,-95.6 -78.4,-141.5 -239,-948.3 -887.1,-1692 -1604,-1844.9 -166.3,-34.4 -443.6,-34.4 -613.7,1.9 -671,141.5 -1267.5,774.3 -1540.9,1634.6 -38.2,120.4 -78.4,244.7 -89.9,275.3 -36.3,99.4 -187.4,156.8 -281,107.1 -51.6,-28.7 -124.3,66.9 -175.9,235.2 -63.1,196.9 -61.2,560.2 1.9,739.9 61.2,174 99.4,221.8 191.2,237.1 51.6,7.6 89.9,30.6 124.3,70.7 l 49.7,59.3 -11.5,288.7 c -13.4,277.2 -13.4,286.8 22.9,273.4 19.3,-7.7 126.3,-40.2 237.2,-70.8 z"
id="path560"
style="fill:#000080;stroke-width:33.6545" /><path
d="m 3841.4,1279.5 c -72.6,-72.7 -84.1,-147.2 -38.2,-239 44,-82.2 103.2,-97.5 391.9,-97.5 233.2,0 269.6,3.8 311.6,38.2 114.7,89.9 109,254.3 -11.5,326.9 -51.6,30.6 -97.5,36.3 -323.1,36.3 h -265.7 z"
id="path562"
style="fill:#000080;stroke-width:33.6545" /><path
d="m 5504.7,1308.2 c -68.8,-42.1 -110.9,-143.4 -91.7,-219.9 5.7,-26.8 38.2,-70.7 68.8,-97.5 53.5,-45.9 66.9,-47.8 321.2,-47.8 288.7,0 340.3,13.4 388.1,95.6 53.5,87.9 42.1,166.3 -32.5,240.9 l -65,65 h -263.8 c -227.6,0 -273.5,-5.7 -325.1,-36.3 z"
id="path564"
style="fill:#000080;stroke-width:33.6545" /><path
d="m 2352.1,-1601.6 c -326.9,-114.7 -663.4,-242.8 -749.4,-282.9 -265.7,-128.1 -478,-281 -713.1,-518.1 C 576,-2714.3 381,-3025.9 251,-3415.9 145.9,-3735.2 122.9,-3869 111.4,-4270.5 l -11.4,-367.1 68.8,-68.8 66.9,-66.9 H 5000 9764.3 l 66.9,66.9 68.8,68.8 -11.5,367.1 c -9.6,296.3 -19.1,405.3 -57.4,567.8 -128.1,535.3 -344.1,927.2 -728.4,1309.6 -233.2,233.3 -420.6,367.1 -709.3,506.6 -214.1,103.3 -1332.5,497.1 -1412.8,497.1 -36.3,0 -95.6,-42 -227.5,-166.3 -409.1,-384.3 -759,-585 -1229.3,-705.5 -183.5,-47.8 -244.7,-53.5 -504.7,-55.4 -424.4,0 -674.9,57.4 -1061.1,248.5 -242.8,120.5 -462.7,277.2 -711.2,512.4 -151,141.5 -187.4,166.3 -239,164.4 -34.3,-1.9 -328.8,-95.6 -655.7,-210.3 z"
id="path566"
style="fill:#000080;stroke-width:33.6545" /></g></g></g></svg>

After

Width:  |  Height:  |  Size: 14 KiB

BIN
bin/csvstudentmini.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
icons/csvstudent.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

161
icons/csvstudent.svg Normal file
View File

@ -0,0 +1,161 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="45"
height="45"
viewBox="0 0 11.90625 11.90625"
version="1.1"
id="svg5"
xml:space="preserve"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="csvstudent.svg"
inkscape:export-filename="nocsvstudentmini.png"
inkscape:export-xdpi="51.200001"
inkscape:export-ydpi="51.200001"
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"><sodipodi:namedview
id="namedview7"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="9.215562"
inkscape:cx="22.950309"
inkscape:cy="15.354462"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" /><defs
id="defs2"><inkscape:path-effect
effect="powerstroke"
id="path-effect966"
is_visible="true"
lpeversion="1"
offset_points="0,0.012910556"
not_jump="false"
sort_points="true"
interpolator_type="CubicBezierJohan"
interpolator_beta="0.2"
start_linecap_type="zerowidth"
linejoin_type="extrp_arc"
miter_limit="4"
scale_width="1"
end_linecap_type="zerowidth" /><inkscape:path-effect
effect="powerstroke"
id="path-effect960"
is_visible="true"
lpeversion="1"
offset_points="0,0.012910556"
not_jump="false"
sort_points="true"
interpolator_type="CubicBezierJohan"
interpolator_beta="0.2"
start_linecap_type="zerowidth"
linejoin_type="extrp_arc"
miter_limit="4"
scale_width="1"
end_linecap_type="zerowidth" /><inkscape:path-effect
effect="powerstroke"
id="path-effect252"
is_visible="true"
lpeversion="1"
offset_points="0.058411546,-0.012910556"
not_jump="false"
sort_points="true"
interpolator_type="CubicBezierJohan"
interpolator_beta="0.2"
start_linecap_type="zerowidth"
linejoin_type="extrp_arc"
miter_limit="4"
scale_width="1"
end_linecap_type="zerowidth" /></defs><g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"><path
style="fill:#000000;stroke-width:1"
d="m -171.58912,73.166449 c -1.19191,-0.59 -1.97712,-1.513364 -2.44802,-2.878762 -0.44754,-1.29767 -0.44754,-113.584819 0,-114.882489 0.47451,-1.375854 1.26826,-2.302994 2.4695,-2.884508 1.07926,-0.522457 1.65617,-0.528412 51.19532,-0.528412 49.539148,0 50.116058,0.006 51.195318,0.528412 1.20125,0.581514 1.99499,1.508654 2.4695,2.884508 0.44755,1.29767 0.44755,113.584819 0,114.882489 -0.47451,1.375852 -1.26825,2.302992 -2.4695,2.884506 -1.07926,0.522462 -1.65595,0.52841 -51.212708,0.528204 -49.73132,-2.07e-4 -50.12954,-0.0044 -51.19941,-0.533948 z m 37.87347,-8.328382 c 2.1486,-0.65188 2.0883,-0.520821 1.56832,-3.408717 -0.25207,-1.399976 -0.53354,-2.544122 -0.6255,-2.542547 -0.092,0.0016 -0.75167,0.18017 -1.46602,0.396875 -4.09236,1.241461 -6.77983,-0.553387 -6.76516,-4.518168 0.0152,-4.099954 2.58885,-5.928087 6.52608,-4.63559 0.95664,0.314045 1.76772,0.536935 1.8024,0.495316 0.0347,-0.04162 0.25968,-0.96864 0.49998,-2.060046 0.2403,-1.091406 0.50804,-2.25276 0.59497,-2.580788 0.13565,-0.511847 -0.0183,-0.674415 -1.08559,-1.146537 -3.54423,-1.567778 -8.75398,-0.636551 -11.43631,2.044215 -2.03909,2.037885 -3.03453,4.683705 -3.03453,8.06554 0,4.000685 1.27887,6.644984 4.31471,8.921429 1.70438,1.278038 6.43055,1.78094 9.10665,0.969018 z m 15.30921,-0.149095 c 3.56838,-1.335103 5.1938,-5.662036 3.44515,-9.171127 -0.77831,-1.561852 -1.61696,-2.267673 -4.29977,-3.618714 -2.10383,-1.059466 -2.54227,-1.61035 -1.74956,-2.198206 0.62525,-0.463672 2.37588,-0.257691 4.05263,0.47684 0.64095,0.280781 1.19555,0.4793 1.23243,0.441155 0.21214,-0.219363 1.40468,-4.805068 1.29553,-4.981686 -0.28812,-0.466182 -3.18841,-1.325358 -4.98729,-1.47742 -4.81546,-0.407056 -8.26389,2.446311 -8.20198,6.786626 0.0393,2.756403 1.2673,4.265636 5.05899,6.217708 2.14987,1.106816 2.52215,1.612421 1.75331,2.381258 -0.64125,0.641255 -3.03529,0.399426 -5.01406,-0.506487 -0.83105,-0.380468 -1.55492,-0.647842 -1.6086,-0.594164 -0.10999,0.10999 -0.87924,4.36295 -0.87979,4.864161 -2e-4,0.178165 0.35446,0.50742 0.78813,0.731681 2.43276,1.25803 6.67826,1.560028 9.11488,0.648375 z m 21.775443,-9.64149 c 1.636275,-5.529792 2.976522,-10.202995 2.978321,-10.384896 0.0024,-0.245536 -0.777872,-0.330729 -3.029238,-0.330729 h -3.032508 l -0.260834,0.992188 c -0.143454,0.545703 -0.767674,2.94478 -1.387134,5.331282 l -1.1263,4.339098 -1.33505,-5.26514 -1.33504,-5.265136 -3.39382,-0.0742 c -3.15043,-0.06888 -3.3835,-0.04042 -3.2499,0.396875 0.19816,0.648605 5.10232,18.086093 5.45646,19.401258 l 0.28595,1.06195 3.22702,-0.07419 3.227021,-0.07419 z M -73.276482,-2.1025153 V -41.128555 h -47.095838 -47.09583 V -2.1025153 36.923524 h 47.09583 47.095838 z m -81.545088,-1.1058785 v -5.8243999 l 8.7974,0.06971 8.79739,0.06971 0.0713,5.7546869 0.0713,5.7546881 h -8.8687 -8.8687 z m 0.54636,-16.5217252 0.0713,-5.754688 8.79739,-0.06971 8.7974,-0.06971 v 5.8244 5.8244 h -8.8687 -8.8687 z m 24.73506,16.5836925 v -5.8208332 h 8.86354 8.86354 v 5.8208332 5.8208331 h -8.86354 -8.86354 z m -0.91162,-17.4446945 v -5.820833 h 8.86354 8.86355 v 5.820833 5.820833 h -8.86355 -8.86354 z"
id="path431"
sodipodi:nodetypes="csssscsssscsscscsssssssssssssssssssssssssscscsscccssscccsccccccccccccccccccccccccccccccccccccccccccccc" /><g
id="g542"><path
style="fill:#008000;stroke-width:1"
d="m 0.99007909,0.05223377 c -0.11660045,0.057715 -0.19341358,0.14804643 -0.23948087,0.28161886 -0.0437832,0.12694638 -0.0437832,11.11158037 0,11.23852737 0.0464187,0.134594 0.1240695,0.225293 0.24158307,0.28218 0.10557921,0.05111 0.16201641,0.05169 5.00824761,0.05169 4.8462291,0 4.9026671,-5.88e-4 5.0082481,-0.05169 0.117513,-0.05689 0.195162,-0.147586 0.241581,-0.28218 0.04378,-0.126947 0.04378,-11.11158099 0,-11.23852737 C 11.203838,0.19925794 11.126189,0.10855914 11.008677,0.05167206 10.903096,5.5915658e-4 10.846681,-1.7643419e-5 5.9987278,5.658109e-8 1.1336975,2.0466581e-5 1.0947408,4.3042658e-4 0.99007909,0.05223106 Z M 10.607639,7.415517 V 11.23329 H 6.0004289 1.393218 V 7.415517 3.5977442 H 6.0004289 10.607639 Z M 2.7909113,5.6687499 v 0.5697795 l 0.8606164,-0.00683 0.8606164,-0.00683 0.00701,-0.56296 0.00701,-0.56296 H 3.6585726 2.7909806 Z M 5.1462824,5.6683976 V 6.237831 H 6.0004289 6.8545745 V 5.6684003 5.0989696 H 6.0004289 5.1462824 Z m 2.3354547,-0.00648 0.00701,0.56296 0.8606173,0.00683 0.8606164,0.00683 V 5.6687659 5.0989864 H 8.342389 7.4747969 Z M 2.767048,7.410616 V 7.9800467 H 3.6341351 4.5012232 V 7.410616 6.8411862 H 3.6341351 2.767048 Z m 9e-7,1.7600582 v 0.569431 H 3.634136 4.5012232 V 9.1706742 8.6012435 H 3.634136 2.7670489 Z"
id="path331"
sodipodi:nodetypes="csssscssssccccccccccccccccccccccccccccccccccccccccccccccccccccccc" /><text
xml:space="preserve"
style="font-size:3.52778px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;fill:#ffffff;stroke-width:0.264583"
x="1.8981769"
y="3.0433123"
id="text487"><tspan
sodipodi:role="line"
id="tspan485"
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:3.52778px;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#ffffff;stroke-width:0.264583"
x="1.8981769"
y="3.0433123">CSV</tspan></text><rect
style="fill:#008000;fill-opacity:1;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect946"
width="1.7211634"
height="1.1259199"
x="5.1146417"
y="6.8344316" /><rect
style="fill:#008000;fill-opacity:1;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect1207"
width="1.7211634"
height="1.1259199"
x="5.1146417"
y="8.5570612" /><rect
style="fill:#008000;fill-opacity:1;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect1209"
width="1.7211634"
height="1.1259199"
x="7.4401917"
y="6.8344316" /><rect
style="fill:#008000;fill-opacity:1;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect1211"
width="1.7211634"
height="1.1259199"
x="7.4401917"
y="8.5283508" /></g><path
style="fill:#000000;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.4;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
d="m 1.5783228,0.97545751 c 0,0 -0.00953,0.00871 -0.00953,0.00871 C 3.3531744,2.9365984 8.7158494,8.7851819 10.500231,10.737613 8.7158494,8.7851819 3.3722345,2.9191788 1.5878529,0.96674772 c 0,0 -0.00953,0.00871 -0.00953,0.00871 z"
id="path958"
inkscape:path-effect="#path-effect960"
inkscape:original-d="M 1.5783228,0.97545751 10.500231,10.737613" /><path
style="fill:#000000;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.4;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
d="m 10.488196,0.97545751 c 0,0 -0.0095,-0.00871 -0.0095,-0.00871 C 8.6942844,2.9191788 3.3506698,8.7851819 1.5662882,10.737613 3.3506698,8.7851819 8.7133445,2.9365984 10.497726,0.9841673 c 0,0 -0.0095,-0.00871 -0.0095,-0.00871 z"
id="path962"
inkscape:path-effect="#path-effect966"
inkscape:original-d="M 10.488196,0.97545751 1.5662882,10.737613" /><path
style="fill:#ffccaa;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 6.3819491,5.8169641 1.727385,0.241655 1.646832,-0.393808 -0.02685,0.724965 0.2864059,0.393808 v 0.832366 l -0.3043069,0.268506 -0.510159,0.957669 -0.868168,0.599662 -1.00242,-0.116352 -0.653363,-0.698114 -0.393808,-0.769716 -0.250605,-0.143203 -0.205854,-0.52806 0.205854,-0.528061 0.161103,-0.214804 0.009,-0.626513 z"
id="path556" /><g
id="g570"
transform="matrix(0.00893625,0,0,0.00893625,2.8815422,4.5015059)"
style="fill:#000000;stroke-width:29.6078"><g
transform="matrix(0.08797553,0,0,-0.08797553,124.40311,399.9922)"
id="g568"
style="fill:#000080;stroke-width:33.6545"><path
d="M 3122.6,4604.2 C 2231.7,4380.5 1476.5,4187.4 1444,4174 c -68.8,-28.7 -114.7,-107.1 -114.7,-193.1 0,-42.1 19.1,-76.5 63.1,-120.4 l 61.2,-61.2 554.4,-63.1 c 305.9,-34.4 1152.8,-128.1 1883.1,-210.3 l 1328.7,-149.1 1508.4,380.5 c 827.8,208.4 1514.1,378.5 1523.7,378.5 9.6,0 17.2,-275.3 17.2,-636.6 V 2864.5 L 8078,2673.3 c -286.8,-284.9 -286.8,-237.1 -3.8,-804.9 191.2,-382.4 242.8,-470.3 290.6,-495.2 78.4,-40.1 158.7,-36.3 217.9,11.5 68.8,53.5 489.4,892.8 489.4,973.1 0,89.9 -40.1,147.2 -227.5,334.6 l -174,172.1 v 806.8 808.7 l -53.5,59.3 -53.5,61.2 L 6690,4807 c -1028.6,114.7 -1888.9,206.5 -1909.9,206.5 -21,-0.2 -766.6,-185.6 -1657.5,-409.3 z"
id="path558"
style="fill:#000080;stroke-width:33.6545" /><path
d="m 6340.2,3243 -1099.3,-275.3 -1344,149.1 -1344,149.1 v -569.7 -569.7 l -103.2,-99.4 C 2260.4,1839.7 2170.6,1596.9 2157.2,1218.4 2140,816.9 2229.9,493.8 2411.5,293.1 2484,212.7 2642.7,121 2711.5,121 c 17.2,0 32.5,-15.3 32.5,-32.5 0,-63.1 191.2,-510.5 298.2,-697.8 369,-651.9 892.8,-1091.7 1491.2,-1248.4 290.6,-76.5 642.4,-76.5 933,0 728.4,191.2 1345.9,803 1693.9,1676.7 51.7,133.7 95.7,256.1 95.7,273.3 0,15.3 15.3,28.7 34.4,28.7 66.9,0 225.6,91.8 298.3,172.1 181.6,200.7 271.5,523.8 256.2,925.3 -15.3,380.5 -110.9,629 -307.8,808.7 l -80.3,70.7 -9.6,709.3 -9.6,709.3 z M 3222,2375 c 229.4,-65 602.2,-135.7 908.1,-174 137.7,-15.3 435.9,-24.8 869.9,-24.8 694,0 869.9,13.4 1328.7,97.5 216,38.2 575.5,130 686.4,172.1 34.4,13.4 36.3,3.8 22.9,-273.4 l -13.4,-286.8 49.7,-59.3 c 32.5,-40.1 76.5,-65 130,-74.6 70.7,-15.3 86,-26.8 133.8,-114.7 149.1,-277.2 135.8,-812.5 -22.9,-1036.2 -40.1,-57.4 -45.9,-57.4 -154.9,-45.9 -107.1,9.6 -114.7,7.6 -170.2,-45.9 -30.6,-32.5 -65,-95.6 -78.4,-141.5 -239,-948.3 -887.1,-1692 -1604,-1844.9 -166.3,-34.4 -443.6,-34.4 -613.7,1.9 -671,141.5 -1267.5,774.3 -1540.9,1634.6 -38.2,120.4 -78.4,244.7 -89.9,275.3 -36.3,99.4 -187.4,156.8 -281,107.1 -51.6,-28.7 -124.3,66.9 -175.9,235.2 -63.1,196.9 -61.2,560.2 1.9,739.9 61.2,174 99.4,221.8 191.2,237.1 51.6,7.6 89.9,30.6 124.3,70.7 l 49.7,59.3 -11.5,288.7 c -13.4,277.2 -13.4,286.8 22.9,273.4 19.3,-7.7 126.3,-40.2 237.2,-70.8 z"
id="path560"
style="fill:#000080;stroke-width:33.6545" /><path
d="m 3841.4,1279.5 c -72.6,-72.7 -84.1,-147.2 -38.2,-239 44,-82.2 103.2,-97.5 391.9,-97.5 233.2,0 269.6,3.8 311.6,38.2 114.7,89.9 109,254.3 -11.5,326.9 -51.6,30.6 -97.5,36.3 -323.1,36.3 h -265.7 z"
id="path562"
style="fill:#000080;stroke-width:33.6545" /><path
d="m 5504.7,1308.2 c -68.8,-42.1 -110.9,-143.4 -91.7,-219.9 5.7,-26.8 38.2,-70.7 68.8,-97.5 53.5,-45.9 66.9,-47.8 321.2,-47.8 288.7,0 340.3,13.4 388.1,95.6 53.5,87.9 42.1,166.3 -32.5,240.9 l -65,65 h -263.8 c -227.6,0 -273.5,-5.7 -325.1,-36.3 z"
id="path564"
style="fill:#000080;stroke-width:33.6545" /><path
d="m 2352.1,-1601.6 c -326.9,-114.7 -663.4,-242.8 -749.4,-282.9 -265.7,-128.1 -478,-281 -713.1,-518.1 C 576,-2714.3 381,-3025.9 251,-3415.9 145.9,-3735.2 122.9,-3869 111.4,-4270.5 l -11.4,-367.1 68.8,-68.8 66.9,-66.9 H 5000 9764.3 l 66.9,66.9 68.8,68.8 -11.5,367.1 c -9.6,296.3 -19.1,405.3 -57.4,567.8 -128.1,535.3 -344.1,927.2 -728.4,1309.6 -233.2,233.3 -420.6,367.1 -709.3,506.6 -214.1,103.3 -1332.5,497.1 -1412.8,497.1 -36.3,0 -95.6,-42 -227.5,-166.3 -409.1,-384.3 -759,-585 -1229.3,-705.5 -183.5,-47.8 -244.7,-53.5 -504.7,-55.4 -424.4,0 -674.9,57.4 -1061.1,248.5 -242.8,120.5 -462.7,277.2 -711.2,512.4 -151,141.5 -187.4,166.3 -239,164.4 -34.3,-1.9 -328.8,-95.6 -655.7,-210.3 z"
id="path566"
style="fill:#000080;stroke-width:33.6545" /></g></g></g></svg>

After

Width:  |  Height:  |  Size: 14 KiB

BIN
icons/csvstudentmini.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
icons/nocsvstudent.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
icons/nocsvstudentmini.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -83,6 +83,7 @@ public class rechercherUnNodeStudent {
//*************************************************************************************
if(nodSujet.getNomElt().contains("text:")) {
nodStudent = findNodeByContenuTextuel(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a);
if(nameNode.equals("text:line-break")) return nodStudent;
if(nodStudent!=null) return nodStudent;
}
@ -92,7 +93,8 @@ public class rechercherUnNodeStudent {
//*****************************************************************
//** Recherche le node text:p par les différents contenu du node **
//*****************************************************************
if(nameNode.equals("text:p")||nameNode.equals("text:span")||nameNode.equals("text:list")) {
if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")||nameNode.equals("text:list")
||nameNode.equals("text:span")||nameNode.equals("text:line-break")) {
nodStudent = findLeNodeTextpParDesNodesEnfantsSpecifique(nameNode, nodSujet,nod0Student, nod1Student, nod2Student, a );
}
@ -241,7 +243,7 @@ public class rechercherUnNodeStudent {
if(nodSujet.retourneLesContenusEnfants("").length()<1) return null;
String valueAttribut = evaluation.withoutCodeAndPointPourRechercheContenuExact(nodSujet.retourneLesContenusEnfants(""));
Pattern p = Pattern.compile("^text:p|^text:h|^text:span|^text:list"); //le node qui peuvent rechercher par le contenu textuel
Pattern p = Pattern.compile("^text:p|^text:h|^text:span|^text:list|^text:line-break"); //le node qui peuvent rechercher par le contenu textuel
Matcher m = p.matcher(nameNode);
if(m.find()) {
@ -287,14 +289,14 @@ public class rechercherUnNodeStudent {
//méthode texte rigoureusement exact
if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeDoublonStudent(nod2Student.getNodes(), valueAttribut, nameNode, nodSujet);
if(nod2Student!=null) if(nodStudent==null) {
ArrayList<node> tousLesfreres = nod2Student.retourneTousLesFreres(); //Retourne tous les frère d'une même page
for(int i = 0 ; i < tousLesfreres.size();i++) {
if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeDoublonStudent(tousLesfreres.get(i).getNodes(), valueAttribut, nameNode, nodSujet);
}
}
if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeDoublonStudent(nod1Student.getNodes(), valueAttribut, nameNode, nodSujet);
if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeDoublonStudent(nod0Student.getNodes(), valueAttribut, nameNode, nodSujet);
// if(nod2Student!=null) if(nodStudent==null) {
// ArrayList<node> tousLesfreres = nod2Student.retourneTousLesFreres(); //Retourne tous les frère d'une même page
// for(int i = 0 ; i < tousLesfreres.size();i++) {
// if(nod2Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeDoublonStudent(tousLesfreres.get(i).getNodes(), valueAttribut, nameNode, nodSujet);
// }
// }
// if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeDoublonStudent(nod1Student.getNodes(), valueAttribut, nameNode, nodSujet);
// if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneLeNodeDoublonStudent(nod0Student.getNodes(), valueAttribut, nameNode, nodSujet);
}

View File

@ -51,8 +51,9 @@ public class actDownNode extends AbstractAction{
treeModel.insertNodeInto(selectNode, selectParentNode, selectedNodeIndex+1);
String nameNode = nod.getNomElt();
if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")) {
actNewFichierAnalyse.placeIsDoublon(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")||nameNode.equals("text:list")
||nameNode.equals("text:span")||nameNode.equals("text:line-break")) {
actNewFichierAnalyse.placeIsDoublonInStructure(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
}
DefaultMutableTreeNode root = (DefaultMutableTreeNode) treeModel.getRoot();

View File

@ -97,7 +97,7 @@ public class actNewFichierAnalyse extends AbstractAction{
//Pour les sujets, il faut rechercher les nodes en doublons (par exemple : text:p, text:h, text:list-item)
//L'information sera portée par l'attribut isDoublon="1" ou isDoublon="2", etc..
// Cela permet de recherche par le numéro du child.
placeIsDoublon(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
placeIsDoublonInStructure(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
commandes.sujet.getAttributs().put("analysis_filename","sujet.xml");
@ -141,12 +141,12 @@ public class actNewFichierAnalyse extends AbstractAction{
}
public static void placeIsDoublon(node nod) {
public static void placeIsDoublonInStructure(node nod) {
if(nod.getNomElt().equals("structurepage")) {
Enumeration<node> pages = Collections.enumeration(nod.getNodes());
while(pages.hasMoreElements()) {
node nodLaPage = pages.nextElement();
Pattern p = Pattern.compile("^text:p|^text:h|^text:list|^text:list-item"); //le node qui peuvent rechercher par le contenu textuel
Pattern p = Pattern.compile("^text:p$|^text:h$|^text:list$|^text:list-item$|^text:line-break$|^text:span$"); //le node qui peuvent rechercher par le contenu textuel
ArrayList<String> listTextesInPage = new ArrayList<String>();
for(int i = 0 ; i < nodLaPage.getNodes().size();i++) {
Matcher m = p.matcher(nodLaPage.getNodes().get(i).getNomElt());
@ -158,11 +158,39 @@ public class actNewFichierAnalyse extends AbstractAction{
nodLaPage.getNodes().get(i).getAttributs().remove("isDoublon");
listTextesInPage.add(content);
}
if(nodLaPage.getNodes().get(i).getNodes().size()>0) {
placeIsDoublon(nodLaPage.getNodes().get(i));
}
}
}
}
}
}
/**
*
* @param nod
*/
private static void placeIsDoublon(node nod) {
Pattern p = Pattern.compile("^text:p$|^text:h$|^text:list$|^text:list-item$|^text:line-break$|^text:span$"); //le node qui peuvent rechercher par le contenu textuel
ArrayList<String> listTextesInPage = new ArrayList<String>();
for(int i = 0 ; i < nod.getNodes().size();i++) {
Matcher m = p.matcher(nod.getNodes().get(i).getNomElt());
if(m.find()) {
String content = nod.getNodes().get(i).retourneLesContenusEnfants("");
if(listTextesInPage.contains(content)) {
nod.getNodes().get(i).getAttributs().put("isDoublon", "true");
}else {
nod.getNodes().get(i).getAttributs().remove("isDoublon");
listTextesInPage.add(content);
}
if(nod.getNodes().get(i).getNodes().size()>0) {
placeIsDoublon(nod.getNodes().get(i));
}
}
}
}
}

View File

@ -101,8 +101,9 @@ public class actPaste extends AbstractAction{
nodChild = MiseAJoutInfoChild(nodChild);
}
String nameNode = nodePaste.getNomElt();
if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")) {
actNewFichierAnalyse.placeIsDoublon(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")||nameNode.equals("text:list")
||nameNode.equals("text:span")||nameNode.equals("text:line-break")) {
actNewFichierAnalyse.placeIsDoublonInStructure(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
}
}
return nodePaste;

View File

@ -57,8 +57,9 @@ public class actUpNode extends AbstractAction{
treeModel.insertNodeInto(selectNode, selectParentNode, selectedNodeIndex-1);
String nameNode = nod.getNomElt();
if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")) {
actNewFichierAnalyse.placeIsDoublon(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")||nameNode.equals("text:list")
||nameNode.equals("text:span")||nameNode.equals("text:line-break")) {
actNewFichierAnalyse.placeIsDoublonInStructure(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
}
DefaultMutableTreeNode root = (DefaultMutableTreeNode) treeModel.getRoot();

View File

@ -74,6 +74,7 @@ public class evaluate extends JFrame {
private JLabel lblnozip;
private JLabel lblVerifHistorique;
private JLabel lblnologo;
private JLabel lblCsvNote;
private JCheckBox chckbxfichiersEtudiants;
private JCheckBox chckbxZipfeedback;
private JCheckBox chckbxnoFeedback;
@ -274,18 +275,23 @@ public class evaluate extends JFrame {
panelWest.add(lblFichierCSV, "cell 1 9,grow");
chckCSVNotes = new JCheckBox("Créer un fichier CSV des notes");
lblCsvNote = new JLabel("");
lblCsvNote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nocsvstudent.png")));
panelWest.add(lblCsvNote, "cell 0 10");
chckCSVNotes.setToolTipText("Cochez si vous voulez importer les notes dans un fichier CSV.");
panelWest.add(chckCSVNotes, "flowx,cell 1 10,grow");
chckCSVNotes.setSelected(commandes.ecritNoteCSV);
chckCSVNotes.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
if(chckCSVNotes.isSelected()) {
lblCsvNote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/csvstudent.png")));
commandes.ecritNoteCSV=true;
}else {
lblCsvNote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nocsvstudent.png")));
commandes.ecritNoteCSV=false;
}
}
});
chckCSVNotes.setToolTipText("Cochez si vous voulez importer les notes dans un fichier CSV.");
panelWest.add(chckCSVNotes, "flowx,cell 1 10,grow");
chckCSVNotes.setSelected(commandes.ecritNoteCSV);
lblFichierSVG = new JLabel("<HTML><B><U>Fichier SVG</U></B> :</HTML>");
lblFichierSVG.setFont(new Font("Tahoma", Font.BOLD, 14));

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB