V4.0.4 Maj

This commit is contained in:
pablo rodriguez 2022-06-06 09:50:45 +02:00
parent 380b896f67
commit 3caa970934
66 changed files with 396 additions and 133 deletions

Binary file not shown.

21
bin/.gitignore vendored
View File

@ -13,3 +13,24 @@
/textclean.png /textclean.png
/textclean.svg /textclean.svg
/textcleanmini.png /textcleanmini.png
/auteurediteur.png
/auteurediteur.svg
/auteurediteurmini.png
/et.png
/et.svg
/etmini.png
/ouenviron.png
/ouenviron.svg
/ouenvironmini.png
/ouenvironsimilitude.png
/ouenvironsimilitude.svg
/ouenvironsimilitudemini.png
/oustrict.png
/oustrict.svg
/oustrictmini.png
/oustrictseps.png
/oustrictseps.svg
/oustrictsepsmini.png
/toutext.png
/toutext.svg
/toutextmini.png

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.

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.

View File

@ -42,7 +42,7 @@
inkscape:current-layer="g3916" inkscape:current-layer="g3916"
inkscape:document-units="mm" inkscape:document-units="mm"
inkscape:cy="6.0861963" inkscape:cy="6.0861963"
inkscape:cx="-15.553613" inkscape:cx="-15.638143"
inkscape:zoom="5.9150245" inkscape:zoom="5.9150245"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
@ -155,40 +155,46 @@
id="g3916" id="g3916"
transform="matrix(12.151193,0,0,12.151193,-148.91629,70.970167)" transform="matrix(12.151193,0,0,12.151193,-148.91629,70.970167)"
style="stroke-width:0.768356"> style="stroke-width:0.768356">
<path
style="fill:#ffaaaa;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 17.348583,0.95935787 -0.754518,-0.8270232 c -0.268896,-0.002875 -0.502454,-0.0608291 -0.917307,0.1638007 -0.4601,0.3530892 -0.68116,0.6506762 -0.877185,0.94245073 -0.17669,0.3432441 -0.139712,0.5859875 -0.100073,0.8274788 l 0.801458,0.761569 z"
id="path1605"
sodipodi:nodetypes="ccccccc" />
<path
id="path903"
d="m 18.286926,1.8124245 0.989256,-0.6558316 c 0.804095,1.2322882 0.673903,1.9306982 2.412766,3.6971397"
style="fill:none;stroke:#000000;stroke-width:0.379568;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="ccc" />
<g <g
id="g901" id="g900">
style="stroke-width:1.54629;stroke-miterlimit:4;stroke-dasharray:none" <g
transform="matrix(0.11091199,-0.05828884,0.05572328,0.11503563,-3.5922226,-2.4121403)"> id="g864">
<path
style="fill:#ffaaaa;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 17.348583,0.95935787 -0.754518,-0.8270232 c -0.268896,-0.002875 -0.502454,-0.0608291 -0.917307,0.1638007 -0.4601,0.3530892 -0.68116,0.6506762 -0.877185,0.94245073 -0.17669,0.3432441 -0.139712,0.5859875 -0.100073,0.8274788 l 0.801458,0.761569 z"
id="path1605"
sodipodi:nodetypes="ccccccc" />
<path
id="path903"
d="m 18.286926,1.8124245 0.989256,-0.6558316 c 0.804095,1.2322882 0.673903,1.9306982 2.412766,3.6971397"
style="fill:none;stroke:#000000;stroke-width:0.379568;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="ccc" />
<g
id="g901"
style="stroke-width:1.54629;stroke-miterlimit:4;stroke-dasharray:none"
transform="matrix(0.11091199,-0.05828884,0.05572328,0.11503563,-3.5922226,-2.4121403)">
<path
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.941328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 165.60421,210.25518 -16.67346,-14.97786 19.49947,-6.49982 z"
id="path886" />
<path
style="fill:#ffcc00;stroke:#000000;stroke-width:0.941328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 148.93075,195.27732 -30.23831,-89.30193 20.34727,-6.499823 29.39051,89.301933 z"
id="path888"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#e6e6e6;stroke:#000000;stroke-width:0.57087;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 118.69244,105.97539 20.34727,-6.499822 3.49123,9.469182 -20.63688,6.48588 z"
id="path896"
sodipodi:nodetypes="ccccc" />
</g>
</g>
<path <path
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.941328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 165.60421,210.25518 -16.67346,-14.97786 19.49947,-6.49982 z" d="m 26.491378,12.121819 -0.924862,-0.25883 c 0.276834,-0.388494 -0.747363,-1.194931 0.483177,-1.058882 z"
id="path886" /> id="path3258"
<path sodipodi:nodetypes="cccc" />
style="fill:#ffcc00;stroke:#000000;stroke-width:0.941328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 148.93075,195.27732 -30.23831,-89.30193 20.34727,-6.499823 29.39051,89.301933 z"
id="path888"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#e6e6e6;stroke:#000000;stroke-width:0.57087;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 118.69244,105.97539 20.34727,-6.499822 3.49123,9.469182 -20.63688,6.48588 z"
id="path896"
sodipodi:nodetypes="ccccc" />
</g> </g>
<path
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 26.491378,12.121819 -0.924862,-0.25883 c 0.276834,-0.388494 -0.747363,-1.194931 0.483177,-1.058882 z"
id="path3258"
sodipodi:nodetypes="cccc" />
</g> </g>
</g> </g>
</g> </g>

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
icons/auteurediteur.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

152
icons/auteurediteur.svg Normal file
View File

@ -0,0 +1,152 @@
<?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\auteurediteurmini.png"
sodipodi:docname="auteurediteur.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" />
<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="g1977"
inkscape:document-units="mm"
inkscape:cy="22.5"
inkscape:cx="10.216837"
inkscape:zoom="8.711111"
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"
showguides="true"
inkscape:guide-bbox="true">
<sodipodi:guide
position="3.0170348,10.40961"
orientation="1,0"
id="guide1351" />
<sodipodi:guide
position="1.045272,5.5158378"
orientation="0,-1"
id="guide1429" />
<sodipodi:guide
position="5.8677764,6.6798905"
orientation="1,0"
id="guide1157" />
<sodipodi:guide
position="5.8440202,11.478639"
orientation="0,-1"
id="guide1159" />
<sodipodi:guide
position="5.7965078,7.4400882"
orientation="0,-1"
id="guide1161" />
</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
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">
<g
id="g1565">
<g
id="g1977"
transform="matrix(0.10467317,0,0,0.10467317,20.10388,131.46341)">
<path
id="path978"
style="opacity:1;fill:#000000;stroke-width:3.26929;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
d="M -3.2324219,-154.43359 A 191.42618,192.14446 0 0 0 -194.6582,37.710938 191.42618,192.14446 0 0 0 -3.2324219,229.85547 191.42618,192.14446 0 0 0 188.19336,37.710938 191.42618,192.14446 0 0 0 -3.2324219,-154.43359 Z m 0,34.47851 A 157.07681,157.66621 0 0 1 153.84375,37.710938 157.07681,157.66621 0 0 1 -3.2324219,195.37695 157.07681,157.66621 0 0 1 -160.30859,37.710938 157.07681,157.66621 0 0 1 -3.2324219,-119.95508 Z"
transform="matrix(2.1487621,0,0,2.1487621,-31.618865,101.14089)" />
<g
id="g900"
style="stroke-width:0.768356"
transform="matrix(39.472311,0,0,39.472311,-878.67365,-48.497069)">
<g
id="g864">
<path
style="fill:#ffaaaa;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 17.348583,0.95935787 -0.754518,-0.8270232 c -0.268896,-0.002875 -0.502454,-0.0608291 -0.917307,0.1638007 -0.4601,0.3530892 -0.68116,0.6506762 -0.877185,0.94245073 -0.17669,0.3432441 -0.139712,0.5859875 -0.100073,0.8274788 l 0.801458,0.761569 z"
id="path1605"
sodipodi:nodetypes="ccccccc" />
<path
id="path903"
d="m 18.286926,1.8124245 0.989256,-0.6558316 c 0.804095,1.2322882 0.673903,1.9306982 2.412766,3.6971397"
style="fill:none;stroke:#000000;stroke-width:0.379568;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="ccc" />
<g
id="g901"
style="stroke-width:1.54629;stroke-miterlimit:4;stroke-dasharray:none"
transform="matrix(0.11091199,-0.05828884,0.05572328,0.11503563,-3.5922226,-2.4121403)">
<path
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.941328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 165.60421,210.25518 -16.67346,-14.97786 19.49947,-6.49982 z"
id="path886" />
<path
style="fill:#ffcc00;stroke:#000000;stroke-width:0.941328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 148.93075,195.27732 -30.23831,-89.30193 20.34727,-6.499823 29.39051,89.301933 z"
id="path888"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#e6e6e6;stroke:#000000;stroke-width:0.57087;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 118.69244,105.97539 20.34727,-6.499822 3.49123,9.469182 -20.63688,6.48588 z"
id="path896"
sodipodi:nodetypes="ccccc" />
</g>
</g>
<path
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 26.491378,12.121819 -0.924862,-0.25883 c 0.276834,-0.388494 -0.747363,-1.194931 0.483177,-1.058882 z"
id="path3258"
sodipodi:nodetypes="cccc" />
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
icons/auteurediteurmini.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 835 B

View File

@ -42,7 +42,7 @@
inkscape:current-layer="g3916" inkscape:current-layer="g3916"
inkscape:document-units="mm" inkscape:document-units="mm"
inkscape:cy="6.0861963" inkscape:cy="6.0861963"
inkscape:cx="-15.553613" inkscape:cx="-15.638143"
inkscape:zoom="5.9150245" inkscape:zoom="5.9150245"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
@ -155,40 +155,46 @@
id="g3916" id="g3916"
transform="matrix(12.151193,0,0,12.151193,-148.91629,70.970167)" transform="matrix(12.151193,0,0,12.151193,-148.91629,70.970167)"
style="stroke-width:0.768356"> style="stroke-width:0.768356">
<path
style="fill:#ffaaaa;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 17.348583,0.95935787 -0.754518,-0.8270232 c -0.268896,-0.002875 -0.502454,-0.0608291 -0.917307,0.1638007 -0.4601,0.3530892 -0.68116,0.6506762 -0.877185,0.94245073 -0.17669,0.3432441 -0.139712,0.5859875 -0.100073,0.8274788 l 0.801458,0.761569 z"
id="path1605"
sodipodi:nodetypes="ccccccc" />
<path
id="path903"
d="m 18.286926,1.8124245 0.989256,-0.6558316 c 0.804095,1.2322882 0.673903,1.9306982 2.412766,3.6971397"
style="fill:none;stroke:#000000;stroke-width:0.379568;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="ccc" />
<g <g
id="g901" id="g900">
style="stroke-width:1.54629;stroke-miterlimit:4;stroke-dasharray:none" <g
transform="matrix(0.11091199,-0.05828884,0.05572328,0.11503563,-3.5922226,-2.4121403)"> id="g864">
<path
style="fill:#ffaaaa;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 17.348583,0.95935787 -0.754518,-0.8270232 c -0.268896,-0.002875 -0.502454,-0.0608291 -0.917307,0.1638007 -0.4601,0.3530892 -0.68116,0.6506762 -0.877185,0.94245073 -0.17669,0.3432441 -0.139712,0.5859875 -0.100073,0.8274788 l 0.801458,0.761569 z"
id="path1605"
sodipodi:nodetypes="ccccccc" />
<path
id="path903"
d="m 18.286926,1.8124245 0.989256,-0.6558316 c 0.804095,1.2322882 0.673903,1.9306982 2.412766,3.6971397"
style="fill:none;stroke:#000000;stroke-width:0.379568;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="ccc" />
<g
id="g901"
style="stroke-width:1.54629;stroke-miterlimit:4;stroke-dasharray:none"
transform="matrix(0.11091199,-0.05828884,0.05572328,0.11503563,-3.5922226,-2.4121403)">
<path
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.941328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 165.60421,210.25518 -16.67346,-14.97786 19.49947,-6.49982 z"
id="path886" />
<path
style="fill:#ffcc00;stroke:#000000;stroke-width:0.941328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 148.93075,195.27732 -30.23831,-89.30193 20.34727,-6.499823 29.39051,89.301933 z"
id="path888"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#e6e6e6;stroke:#000000;stroke-width:0.57087;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 118.69244,105.97539 20.34727,-6.499822 3.49123,9.469182 -20.63688,6.48588 z"
id="path896"
sodipodi:nodetypes="ccccc" />
</g>
</g>
<path <path
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.941328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 165.60421,210.25518 -16.67346,-14.97786 19.49947,-6.49982 z" d="m 26.491378,12.121819 -0.924862,-0.25883 c 0.276834,-0.388494 -0.747363,-1.194931 0.483177,-1.058882 z"
id="path886" /> id="path3258"
<path sodipodi:nodetypes="cccc" />
style="fill:#ffcc00;stroke:#000000;stroke-width:0.941328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 148.93075,195.27732 -30.23831,-89.30193 20.34727,-6.499823 29.39051,89.301933 z"
id="path888"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#e6e6e6;stroke:#000000;stroke-width:0.57087;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 118.69244,105.97539 20.34727,-6.499822 3.49123,9.469182 -20.63688,6.48588 z"
id="path896"
sodipodi:nodetypes="ccccc" />
</g> </g>
<path
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 26.491378,12.121819 -0.924862,-0.25883 c 0.276834,-0.388494 -0.747363,-1.194931 0.483177,-1.058882 z"
id="path3258"
sodipodi:nodetypes="cccc" />
</g> </g>
</g> </g>
</g> </g>

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

View File

@ -31,6 +31,10 @@ public class commandes {
public static JTree tree = new JTree(); public static JTree tree = new JTree();
public static node nodeCSV = null; public static node nodeCSV = null;
//**version
public static String version ="4.0.4"; // La version actuelle
public static String Annee ="2022";
//*************************************************** //***************************************************
//** Les commandes par défaut à travers la console ** //** Les commandes par défaut à travers la console **
//*************************************************** //***************************************************
@ -60,7 +64,6 @@ public class commandes {
public static String contenuFichierSVG =""; // Le nouveau logo public static String contenuFichierSVG =""; // Le nouveau logo
public static String path =""; public static String path ="";
public static String pathDestination =""; //Pour le mode console uniquement public static String pathDestination =""; //Pour le mode console uniquement
public static String version ="4.0.3"; // La version actuelle
public static String nomDeLaBranch = "Origin"; //Branche de développement public static String nomDeLaBranch = "Origin"; //Branche de développement
public static String Command =""; //récupère le texte de la commande dans la console public static String Command =""; //récupère le texte de la commande dans la console
@ -116,7 +119,6 @@ public class commandes {
public static String Titre = "analyseWriter"; public static String Titre = "analyseWriter";
public static String PathFilenameAnalysis=""; public static String PathFilenameAnalysis="";
public static boolean fichierAnalyseValide = false; //mise à jour de la valeur dans MEPTL.verificationFichierAnalyse public static boolean fichierAnalyseValide = false; //mise à jour de la valeur dans MEPTL.verificationFichierAnalyse
public static String Annee ="2022";
public static int analyse_Nbre_Fichier_Student = 0; public static int analyse_Nbre_Fichier_Student = 0;
public static int analyse_index_Fichier_Student = 0; public static int analyse_index_Fichier_Student = 0;
public static StringBuilder message = new StringBuilder(); public static StringBuilder message = new StringBuilder();

View File

@ -8,7 +8,12 @@ import javax.swing.SwingUtilities;
public class ProgressBar extends JFrame implements Runnable{ public class ProgressBar extends JFrame implements Runnable{
@Override /**
*
*/
private static final long serialVersionUID = 1L;
@Override
public void run() { public void run() {
ProgressBar myProgressBar = new ProgressBar(); ProgressBar myProgressBar = new ProgressBar();
int i = 0; int i = 0;

View File

@ -30,8 +30,11 @@ public class afficheText extends JEditorPane {
sb.append("<p class=\"p1\">Parent = " + nodeParent.getNomElt() + "</p><br>"); sb.append("<p class=\"p1\">Parent = " + nodeParent.getNomElt() + "</p><br>");
sb.append("<hr><br><h1>Nom du node : " + nod.getNomElt() + "</h1><br><hr>"); sb.append("<hr><br><h1>Nom du node : " + nod.getNomElt() + "</h1><br><hr>");
if(nod.getNomElt().equals("style:style")) {
sb.append("<h2>Nom du style : " + nod.getAttributs().get("style:name")+ "</h2><br>");
}
if(nod.getAttributs().get("evaluer")!=null) if(nod.getAttributs().get("evaluer").equalsIgnoreCase("true")) { if(nod.getAttributs().get("evaluer")!=null) if(nod.getAttributs().get("evaluer").equalsIgnoreCase("true")) {
sb.append("<img src="+afficheText.class.getResource("/resources/evalwriter.png").toString()+">"); sb.append("<p><img src="+afficheText.class.getResource("/resources/evalwriter.png").toString()+"> Ce node est évalué.</p>");
} }

View File

@ -79,8 +79,8 @@ public class attributs extends JFrame {
contentPane.add(panelBas, BorderLayout.SOUTH); contentPane.add(panelBas, BorderLayout.SOUTH);
panelBas.setLayout(new FlowLayout(FlowLayout.RIGHT, 5, 5)); panelBas.setLayout(new FlowLayout(FlowLayout.RIGHT, 5, 5));
JButton btnNewButton = new JButton("Valider"); JButton btnValide = new JButton("Valider");
panelBas.add(btnNewButton); panelBas.add(btnValide);
JPanel panelDroite = new JPanel(); JPanel panelDroite = new JPanel();
contentPane.add(panelDroite, BorderLayout.EAST); contentPane.add(panelDroite, BorderLayout.EAST);
@ -259,7 +259,7 @@ public class attributs extends JFrame {
panelCentre.add(Lespoints.get(i), "cell 3 " + i+1 +",alignx left,growy"); panelCentre.add(Lespoints.get(i), "cell 3 " + i+1 +",alignx left,growy");
} }
//Enabled false les valeurs ne peuvente être modifiée //Enabled false les valeurs ne peuvent pas être modifiées
for(int i = 0 ; i<Leslabels.size();i++) { for(int i = 0 ; i<Leslabels.size();i++) {
if(Leslabels.get(i).getText().equals("style:name")) {Lesvaleurs.get(i).setEnabled(false);} if(Leslabels.get(i).getText().equals("style:name")) {Lesvaleurs.get(i).setEnabled(false);}
if(Leslabels.get(i).getText().equals("style:display-name")) {Lesvaleurs.get(i).setEnabled(false);} if(Leslabels.get(i).getText().equals("style:display-name")) {Lesvaleurs.get(i).setEnabled(false);}
@ -270,12 +270,11 @@ public class attributs extends JFrame {
if(Leslabels.get(i).getText().equals("numeroabsolue")) {Lesvaleurs.get(i).setEnabled(false);} if(Leslabels.get(i).getText().equals("numeroabsolue")) {Lesvaleurs.get(i).setEnabled(false);}
if(Leslabels.get(i).getText().equals("numero")) {Lesvaleurs.get(i).setEnabled(false);} if(Leslabels.get(i).getText().equals("numero")) {Lesvaleurs.get(i).setEnabled(false);}
if(Leslabels.get(i).getText().equals("style:page_number")) {Lesvaleurs.get(i).setEnabled(false);} if(Leslabels.get(i).getText().equals("style:page_number")) {Lesvaleurs.get(i).setEnabled(false);}
if(Leslabels.get(i).getText().equals("draw:style-name")) {Lesvaleurs.get(i).setEnabled(false);}
} }
btnValide.addActionListener(new ActionListener() {
btnNewButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
for(int i = 0 ; i<Leslabels.size();i++) { for(int i = 0 ; i<Leslabels.size();i++) {
@ -284,16 +283,20 @@ public class attributs extends JFrame {
if(value.contains("")) value = value.substring(0,value.lastIndexOf("")); if(value.contains("")) value = value.substring(0,value.lastIndexOf(""));
if(value.contains("")) value = value.substring(0,value.lastIndexOf("")); if(value.contains("")) value = value.substring(0,value.lastIndexOf(""));
if(Lesevaluer.get(i).isSelected()) value = value + "";
String point = "0"; String point = "0";
int pointNumeric = 0; if(Lesevaluer.get(i).isSelected()) {
try { value = value + "";
pointNumeric = Integer.valueOf(Lespoints.get(i).getText()); int pointNumeric = 0;
point = String.valueOf(pointNumeric); try {
} catch (Exception e2) { pointNumeric = Integer.valueOf(Lespoints.get(i).getText());
JOptionPane.showMessageDialog(null, "La valeur pour l'attribut " + Leslabels.get(i) + " n'est pas un entier"); point = String.valueOf(pointNumeric);
} catch (Exception e2) {
JOptionPane.showMessageDialog(null, "La valeur pour l'attribut " + Leslabels.get(i) + " n'est pas un entier");
}
} }
value = value + point;
if(Lesevaluer.get(i).isSelected()) value = value + point;
nod.getAttributs().put(Leslabels.get(i).getText(), value); nod.getAttributs().put(Leslabels.get(i).getText(), value);

View File

@ -10,7 +10,7 @@ public class baliseStyle {
public static String balise() { public static String balise() {
return "<style type=\"text/css\">" return "<style type=\"text/css\">"
+ "h1 {margin-bottom: 0.25cm;font-size: 18pt;font-family:\"Arial\";text-align:center;font-weight: bold;}" + "h1 {margin-bottom: 0.25cm;font-size: 18pt;font-family:\"Arial\";text-align:center;font-weight: bold;}"
+ "h2 {color:red;margin-bottom: 0.25cm;font-size: 18pt;font-family:\"Arial\";text-align:center;font-weight: bold;}" + "h2 {margin-bottom: 0.25cm;font-size: 16pt;font-family:\"Arial\";text-align:center;font-weight: bold;}"
+ "h4 {text-align:left;font-family: \"Arial\"; font-size: 16pt; font-weight: bold; line-height: 110%;}" + "h4 {text-align:left;font-family: \"Arial\"; font-size: 16pt; font-weight: bold; line-height: 110%;}"
+ "hr { display: block; margin-top: 0.5em; margin-bottom: 8em; margin-left: 2em; margin-right: 2em; border-style: inset; border-width: 4px;}" + "hr { display: block; margin-top: 0.5em; margin-bottom: 8em; margin-left: 2em; margin-right: 2em; border-style: inset; border-width: 4px;}"
+ "spanpablo { float: right; width: 8em; font-size: 250%; font-family: algerian, courier; line-height: 80%; margin-right: 1%; color: red; text-align: center}" + "spanpablo { float: right; width: 8em; font-size: 250%; font-family: algerian, courier; line-height: 80%; margin-right: 1%; color: red; text-align: center}"

View File

@ -85,28 +85,14 @@ public class create extends JFrame {
* @throws UnsupportedLookAndFeelException * @throws UnsupportedLookAndFeelException
*/ */
private void initialize() throws UnsupportedLookAndFeelException { private void initialize() throws UnsupportedLookAndFeelException {
// UIManager.setLookAndFeel(new NimbusLookAndFeel());
/*Chargement des images*/
// ImageIcon img1 = new ImageIcon(getClass().getResource("/attribut.png") );
// ImageIcon img3 = new ImageIcon(getClass().getResource("/property.png") );
// ImageIcon img4 = new ImageIcon(getClass().getResource("/content.png") );
// ImageIcon img2 = new ImageIcon(getClass().getResource("/structurepage.png") );
//frame = new JFrame();
// System.out.println(this.getClass());
// this.setExtendedState(MAXIMIZED_BOTH);
setSize(1400,920); setSize(1400,920);
//setExtendedState(getExtendedState()|JFrame.MAXIMIZED_BOTH ); //setExtendedState(getExtendedState()|JFrame.MAXIMIZED_BOTH );
// setTitle("analyseWriter - Evaluer les fichiers des étudiants");
ImageIcon img = new ImageIcon(getClass().getResource("/evalwriter.png") ); ImageIcon img = new ImageIcon(getClass().getResource("/evalwriter.png") );
setIconImage(img.getImage()); setIconImage(img.getImage());
setLocationRelativeTo( null ); setLocationRelativeTo( null );
// frame.setBounds(0, 0, 860, 500);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
// Construction et injection de la barre de menu // Construction et injection de la barre de menu
@ -130,28 +116,24 @@ public class create extends JFrame {
// The content of the window // The content of the window
if(commandes.fichierAnalyseValide) tree = commandes.tree; if(commandes.fichierAnalyseValide) tree = commandes.tree;
// JTextArea J = new JTextArea();
// contentPane.add(J,BorderLayout.EAST);
JPanel panel = new JPanel();
getContentPane().add(panel, BorderLayout.CENTER);
panel.setLayout(null);
JScrollPane leftScrollPane = new JScrollPane( ); JScrollPane leftScrollPane = new JScrollPane( );
leftScrollPane.setPreferredSize( new Dimension( 200, 0 ) ); leftScrollPane.setPreferredSize( new Dimension( 200, 0 ) );
JScrollPane rightScrollPane = new JScrollPane( ); JScrollPane rightScrollPane = new JScrollPane( );
JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftScrollPane, rightScrollPane ); JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftScrollPane, rightScrollPane );
splitPane.setBounds(10, 10, 1364, 783); splitPane.setBounds(10, 10, 1364, 783);
panel.add(splitPane);
rightScrollPane.setViewportView(textNodeSelect); rightScrollPane.setViewportView(textNodeSelect);
textNodeSelect.setFont(new Font("Monospaced", Font.PLAIN, 15)); textNodeSelect.setFont(new Font("Monospaced", Font.PLAIN, 15));
leftScrollPane.setViewportView(tree); leftScrollPane.setViewportView(tree);
tree.setFont(new Font("Tahoma", Font.PLAIN, 14)); tree.setFont(new Font("Tahoma", Font.PLAIN, 14));
getContentPane().add(splitPane, BorderLayout.CENTER);
if(commandes.fichierAnalyseValide) constructionTree(); if(commandes.fichierAnalyseValide) constructionTree();
this.setExtendedState(MAXIMIZED_BOTH);
ListenerAction(); ListenerAction();
@ -280,6 +262,10 @@ public class create extends JFrame {
mnNiveauSup1.addSeparator(); mnNiveauSup1.addSeparator();
mnNiveauSup1.add(actEvalInitialCreator); mnNiveauSup1.add(actEvalInitialCreator);
} }
if(nod.getNomElt().equals("dc:creator")) {
mnNiveauSup1.addSeparator();
mnNiveauSup1.add(actevalNameCreator);
}
//**Menu setting //**Menu setting
@ -334,6 +320,9 @@ public class create extends JFrame {
mnuFile.setMnemonic( 'F' ); mnuFile.setMnemonic( 'F' );
/*JMenuItem mnuNewFile =*/ /*JMenuItem mnuNewFile =*/
mnuFile.add( actOpen );
mnuFile.add( actNewFichierAnalyse );
mnuFile.addSeparator();
mnuFile.add( actSave ); mnuFile.add( actSave );
mnuFile.add( actSaveAs ); mnuFile.add( actSaveAs );
mnuFile.addSeparator(); mnuFile.addSeparator();
@ -354,20 +343,34 @@ public class create extends JFrame {
menuBar.add(mnuEdit); menuBar.add(mnuEdit);
// menu Modifier // Définition du menu Node
JMenu mnuModif= new JMenu( "Modifier" ); JMenu mnNode = new JMenu("Modifier");
mnuModif.setMnemonic( 'M' ); mnNode.add( actNodeFichier );
mnNode.addSeparator();
menuBar.add(mnNode);
//Menu arbre
JMenu mnManageTree = new JMenu("Arbre");
mnManageTree.add(actUpNode);
mnManageTree.add(actDownNode);
mnManageTree.addSeparator();
mnManageTree.add(actExpandAll);
mnManageTree.add(actExpandNode);
mnManageTree.addSeparator();
mnManageTree.add(actCollapseAll);
mnManageTree.add(actCollapseNode);
mnNode.add(mnManageTree);
mnNode.addSeparator();
//Définition Evaluer
JMenu mnEvaluer = new JMenu("Evaluer");
mnEvaluer.add(actEvalueTrue);
mnEvaluer.add(actEvalueFalse);
mnNode.add(mnEvaluer);
mnuModif.add( actOpen ); // Définition du menu déroulant "Création évaluation" et de son contenu
mnuModif.add( actNodeFichier );
mnuModif.addSeparator();
mnuModif.add( actNewFichierAnalyse );
menuBar.add(mnuModif);
// Définition du menu déroulant "Edit" et de son contenu
JMenu mnuExercice = new JMenu( "Création évaluation" ); JMenu mnuExercice = new JMenu( "Création évaluation" );
mnuExercice.setMnemonic( 'N' ); mnuExercice.setMnemonic( 'N' );
mnuExercice.add(actEvaluer); mnuExercice.add(actEvaluer);
@ -532,7 +535,7 @@ public class create extends JFrame {
/** /**
* * Enregistrer
*/ */
private AbstractAction actSave = new AbstractAction() { private AbstractAction actSave = new AbstractAction() {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -585,7 +588,7 @@ public class create extends JFrame {
}; };
/** /**
* * Enregistrer sous ...
*/ */
private AbstractAction actSaveAs = new AbstractAction() { private AbstractAction actSaveAs = new AbstractAction() {
@ -678,10 +681,6 @@ public class create extends JFrame {
} }
}; };
/** /**
* *
@ -857,7 +856,7 @@ public class create extends JFrame {
}; };
/** /**
* Evalue la présence de ce node * Evalue la présence du node meta:initial-creator
*/ */
private AbstractAction actEvalInitialCreator = new AbstractAction() { private AbstractAction actEvalInitialCreator = new AbstractAction() {
@ -899,6 +898,49 @@ public class create extends JFrame {
} }
}; };
/**
* Evalue la présence du node dc:creator
*/
private AbstractAction actevalNameCreator = new AbstractAction() {
private static final long serialVersionUID = 1L;
{
putValue( Action.NAME, "Evaluer la présence du dernier éditeur" );
putValue( Action.SHORT_DESCRIPTION, "Evaluer la présence du dernier éditeur" );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/auteurediteurmini.png")) );
}
@Override public void actionPerformed( ActionEvent e ) {
DefaultMutableTreeNode selectNode = (DefaultMutableTreeNode) tree.getSelectionPath().getLastPathComponent();
node nod = (node) selectNode.getUserObject();
int point = 0;
if(nod.getAttributs().get("evalNameCreator")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalNameCreator"));
}
String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
if(!a.isEmpty()) {
try {
point = Integer.valueOf(a);
if(point<=0) {
nod.getAttributs().put("evalNameCreator", String.valueOf(0));
textNodeSelect.setText(balisestyles());
textNodeSelect.setText("<h2>Erreur la valeur doit être un nombre entier POSITIF supérieur à zéro.<br>Cependant,la valeur a été modifiée.<br>evalNameCreator=0.</h2>");
}else {
nod.getAttributs().put("evalNameCreator", String.valueOf(point));
}
} catch (Exception e2) {
textNodeSelect.setText(balisestyles());
textNodeSelect.setText("<h2>Erreur la valeur doit être un nombre entier.<br>L'attribut n'a pas été modifiée.</h2>");
}
}
textNodeSelect.refreshAffichage(nod);
}
};
/** /**
* Evalue la présence de ce node * Evalue la présence de ce node

View File

@ -34,7 +34,6 @@ import cXML.node;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JProgressBar;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import java.awt.event.InputEvent; import java.awt.event.InputEvent;
import javax.swing.JMenuBar; import javax.swing.JMenuBar;
@ -42,7 +41,6 @@ import javax.swing.JMenu;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import java.awt.Color; import java.awt.Color;
import java.awt.Desktop; import java.awt.Desktop;
import java.awt.EventQueue;
import javax.swing.JEditorPane; import javax.swing.JEditorPane;
@ -890,7 +888,8 @@ public class evaluate extends JFrame {
/** /**
* *
*/ */
private AbstractAction actSavePreference = new AbstractAction() { @SuppressWarnings("unused")
private AbstractAction actSavePreference = new AbstractAction() {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

View File

@ -25,7 +25,6 @@ public class listeAttributsAnalyseWriter {
if(attribut.equals("styletitre")) return true; if(attribut.equals("styletitre")) return true;
if(attribut.equals("evalNameCreator")) return true; if(attribut.equals("evalNameCreator")) return true;
if(attribut.equals("evalNameInitialCreator")) return true; if(attribut.equals("evalNameInitialCreator")) return true;
if(attribut.equals("evalNameInitialCreator")) return true;
if(attribut.equals("recherche_anchor-page-number")) return true; if(attribut.equals("recherche_anchor-page-number")) return true;
return false; return false;

View File

@ -1,7 +1,6 @@
package app; package app;
import java.awt.Desktop; import java.awt.Desktop;
import java.awt.EventQueue;
import java.awt.Font; import java.awt.Font;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
@ -138,7 +137,7 @@ public class mainApp extends JFrame implements ActionListener{
if(e.getSource()==actCharge) { if(e.getSource()==actCharge) {
if(!commandes.console) System.out.println( "Début chargement du fichier d'analyse." ); if(!commandes.console) System.out.println( "Début chargement du fichier d'analyse." );
evaluate f = new evaluate(); new evaluate();
frmEvalwriter.dispose(); frmEvalwriter.dispose();
} }

View File

@ -18,6 +18,7 @@ import javax.swing.JButton;
import javax.swing.JComboBox; import javax.swing.JComboBox;
import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultComboBoxModel;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.text.DecimalFormat;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import java.awt.Toolkit; import java.awt.Toolkit;
@ -62,6 +63,7 @@ public class proprieteFichierAnalyse extends JFrame {
private JButton btnAideInitial_Creator; private JButton btnAideInitial_Creator;
private JButton btnAidecontrole_Initial_Creator; private JButton btnAidecontrole_Initial_Creator;
private JButton btnVoirBaremeABC; private JButton btnVoirBaremeABC;
private JButton btnVoirBaremeNumeric;
/** /**
@ -327,13 +329,36 @@ public class proprieteFichierAnalyse extends JFrame {
double intervalle2 = Math.pow(0.4, 1/progression) ; double intervalle2 = Math.pow(0.4, 1/progression) ;
double intervalle3 = Math.pow(0.6, 1/progression) ; double intervalle3 = Math.pow(0.6, 1/progression) ;
double intervalle4 = Math.pow(0.8, 1/progression) ; double intervalle4 = Math.pow(0.8, 1/progression) ;
String message = "0% → E → " + Math.round(intervalle1*100) + "% → D → " + Math.round(intervalle2*100) + "% → C → " + String message = "<html>[0% → E → " + Math.round(intervalle1*100) + "%[<br>"
Math.round(intervalle3*100) + "% → B → " + Math.round(intervalle4*100) + "% → A → 100%"; +"["+ Math.round(intervalle1*100) + "→ D → " + Math.round(intervalle2*100) + "%[<br>"
+"["+ Math.round(intervalle2*100) + "→ C → " + Math.round(intervalle3*100) + "%[<br>"
+"["+ Math.round(intervalle3*100) + "→ B → " + Math.round(intervalle4*100) + "%[<br>"
+"["+ Math.round(intervalle4*100) +"→ A → 100%[</html>";
JOptionPane.showMessageDialog(null, message); JOptionPane.showMessageDialog(null, message);
} }
}); });
btnVoirBaremeABC.setIcon(new ImageIcon(proprieteFichierAnalyse.class.getResource("/resources/voirmini.png"))); btnVoirBaremeABC.setIcon(new ImageIcon(proprieteFichierAnalyse.class.getResource("/resources/voirmini.png")));
contentPane.add(btnVoirBaremeABC, "cell 2 4"); contentPane.add(btnVoirBaremeABC, "cell 2 4");
btnVoirBaremeNumeric = new JButton("");
btnVoirBaremeNumeric.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
double progression = Double.valueOf(textFieldProgression.getText());
double noteFrom = Double.valueOf(textFieldNoteFrom.getText());
double intervalle1 = Math.pow(0.25, progression)*noteFrom ;
double intervalle2 = Math.pow(0.5, progression)*noteFrom ;
double intervalle3 = Math.pow(0.75, progression)*noteFrom ;
double intervalle4 = Math.pow(1, progression)*noteFrom ;
DecimalFormat f = new DecimalFormat("#00.00");
String message = "<html>25% correct → "+ f.format(intervalle1) + " / "+ textFieldNoteFrom.getText()+ "<br>"
+ "50% correct → "+ f.format(intervalle2) + " / "+ textFieldNoteFrom.getText()+ "<br>"
+ "75% correct → "+ f.format(intervalle3) + " / "+ textFieldNoteFrom.getText()+ "<br>"
+ "100% correct → "+ f.format(intervalle4) + " / "+ textFieldNoteFrom.getText()+ "<br></html>";
JOptionPane.showMessageDialog(null, message);
}
});
btnVoirBaremeNumeric.setIcon(new ImageIcon(proprieteFichierAnalyse.class.getResource("/resources/voirmini.png")));
contentPane.add(btnVoirBaremeNumeric, "cell 2 5");
btnNewButton.addActionListener(new ActionListener() { btnNewButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
commandes.sujet.getAttributs().put("titre", textFieldTitre.getText() ); commandes.sujet.getAttributs().put("titre", textFieldTitre.getText() );

View File

@ -3,6 +3,7 @@ package app;
import javax.swing.JEditorPane; import javax.swing.JEditorPane;
public class savePreferences { public class savePreferences {
@SuppressWarnings("unused")
private JEditorPane txt; private JEditorPane txt;
savePreferences(JEditorPane txt){ savePreferences(JEditorPane txt){

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 835 B