diff --git a/.classpath b/.classpath index 2d33683..3023f90 100644 --- a/.classpath +++ b/.classpath @@ -4,7 +4,7 @@ - + diff --git a/analyseWriter.jar b/analyseWriter.jar index bc6775d..04d75ac 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index f13ae4e..75cdbd6 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1 +1,2 @@ /app/ +/resources/ diff --git a/bin/MEPTL/commandes.class b/bin/MEPTL/commandes.class index 93ca450..3690fe4 100644 Binary files a/bin/MEPTL/commandes.class and b/bin/MEPTL/commandes.class differ diff --git a/bin/Verifhistorique.svg b/bin/Verifhistorique.svg new file mode 100644 index 0000000..25a4859 --- /dev/null +++ b/bin/Verifhistorique.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/app/evaluate$1.class b/bin/app/evaluate$1.class index 16a00d3..653ed81 100644 Binary files a/bin/app/evaluate$1.class and b/bin/app/evaluate$1.class differ diff --git a/bin/app/evaluate$2.class b/bin/app/evaluate$2.class index 940c81b..a30a931 100644 Binary files a/bin/app/evaluate$2.class and b/bin/app/evaluate$2.class differ diff --git a/bin/app/evaluate.class b/bin/app/evaluate.class index b898509..5948b0b 100644 Binary files a/bin/app/evaluate.class and b/bin/app/evaluate.class differ diff --git a/bin/app/mainApp.class b/bin/app/mainApp.class index 7b430ec..3ce0eb4 100644 Binary files a/bin/app/mainApp.class and b/bin/app/mainApp.class differ diff --git a/bin/apropos.png b/bin/apropos.png index fbba6ba..c16ba74 100644 Binary files a/bin/apropos.png and b/bin/apropos.png differ diff --git a/bin/aproposmax.png b/bin/aproposmax.png new file mode 100644 index 0000000..2d84146 Binary files /dev/null and b/bin/aproposmax.png differ diff --git a/bin/aproposmini.png b/bin/aproposmini.png new file mode 100644 index 0000000..2cfc4b9 Binary files /dev/null and b/bin/aproposmini.png differ diff --git a/bin/documentation.png b/bin/documentation.png new file mode 100644 index 0000000..9b7ccd1 Binary files /dev/null and b/bin/documentation.png differ diff --git a/bin/documentation.svg b/bin/documentation.svg new file mode 100644 index 0000000..0c4799b --- /dev/null +++ b/bin/documentation.svg @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + DOC + + + diff --git a/bin/documentationmax.png b/bin/documentationmax.png new file mode 100644 index 0000000..1f80535 Binary files /dev/null and b/bin/documentationmax.png differ diff --git a/bin/documentationmini.png b/bin/documentationmini.png new file mode 100644 index 0000000..234b511 Binary files /dev/null and b/bin/documentationmini.png differ diff --git a/bin/evaluate.png b/bin/evaluate.png index 47a4da8..28b48eb 100644 Binary files a/bin/evaluate.png and b/bin/evaluate.png differ diff --git a/bin/evaluate.svg b/bin/evaluate.svg index bcf31b7..b096f00 100644 --- a/bin/evaluate.svg +++ b/bin/evaluate.svg @@ -1,8 +1,8 @@ - - - - - - - + id="g854"> + + + + + + + + + - - + transform="matrix(-0.52356925,0,0,0.52358764,31.628394,3.8839196)" + style="stroke-width:1.4667"> + id="g1077" + transform="matrix(-1.2677802,0,0,1.2677545,48.317494,-3.2564478)" + style="stroke-width:1.15692"> + style="fill:#ffaaaa;stroke:none;stroke-width:0.3061px;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" /> + 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.571516;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + sodipodi:nodetypes="ccc" /> + + + + + + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.3061px;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" /> - diff --git a/bin/evaluatemax.png b/bin/evaluatemax.png new file mode 100644 index 0000000..05a734f Binary files /dev/null and b/bin/evaluatemax.png differ diff --git a/bin/evaluatemini.png b/bin/evaluatemini.png new file mode 100644 index 0000000..2bbf8f5 Binary files /dev/null and b/bin/evaluatemini.png differ diff --git a/bin/exit.png b/bin/exit.png index 9eb7a87..4859421 100644 Binary files a/bin/exit.png and b/bin/exit.png differ diff --git a/bin/exit.svg b/bin/exit.svg index 024f1b8..b253fcd 100644 --- a/bin/exit.svg +++ b/bin/exit.svg @@ -9,15 +9,29 @@ viewBox="0 0 48 48" sodipodi:docname="exit.svg" inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" - inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\exit.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" + inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\exitmini.png" + inkscape:export-xdpi="48" + inkscape:export-ydpi="48" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> + id="defs6"> + + + + + + + + + + + XML - - + id="g1631" + transform="translate(-16.228845,-0.44297095)"> + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + XML + + + + + + diff --git a/bin/fichier_csv_student_xml.svg b/bin/fichier_csv_student_xml.svg new file mode 100644 index 0000000..1d830cf --- /dev/null +++ b/bin/fichier_csv_student_xml.svg @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + CSV + + + + + + XML + + + + diff --git a/bin/nodeFichier.png b/bin/nodeFichier.png new file mode 100644 index 0000000..d6349c6 Binary files /dev/null and b/bin/nodeFichier.png differ diff --git a/bin/nodeFichier_FichierAnalyse.svg b/bin/nodeFichier_FichierAnalyse.svg new file mode 100644 index 0000000..e730049 --- /dev/null +++ b/bin/nodeFichier_FichierAnalyse.svg @@ -0,0 +1,398 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + XML + + + + + + + + + + + + + ? + + diff --git a/bin/nodeFichiermax.png b/bin/nodeFichiermax.png new file mode 100644 index 0000000..9cf2dfa Binary files /dev/null and b/bin/nodeFichiermax.png differ diff --git a/bin/nodeFichiermini.png b/bin/nodeFichiermini.png new file mode 100644 index 0000000..8fc7e8d Binary files /dev/null and b/bin/nodeFichiermini.png differ diff --git a/bin/open.png b/bin/open.png index 7715f9e..1adbbf5 100644 Binary files a/bin/open.png and b/bin/open.png differ diff --git a/bin/open.svg b/bin/open.svg index 69a5a63..f1831b1 100644 --- a/bin/open.svg +++ b/bin/open.svg @@ -9,12 +9,29 @@ viewBox="0 0 48 48" sodipodi:docname="open.svg" inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" + inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\openmax.png" + inkscape:export-xdpi="184" + inkscape:export-ydpi="184" 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"> + id="defs6"> + + + + - - - - - + + + + diff --git a/bin/openmax.png b/bin/openmax.png new file mode 100644 index 0000000..1bf8391 Binary files /dev/null and b/bin/openmax.png differ diff --git a/bin/openmini.png b/bin/openmini.png new file mode 100644 index 0000000..1a3f148 Binary files /dev/null and b/bin/openmini.png differ diff --git a/bin/resources/apropos.png b/bin/resources/apropos.png index fbba6ba..c16ba74 100644 Binary files a/bin/resources/apropos.png and b/bin/resources/apropos.png differ diff --git a/bin/resources/documentation.pdf b/bin/resources/documentation.pdf index 6ab34c2..f8133b4 100644 Binary files a/bin/resources/documentation.pdf and b/bin/resources/documentation.pdf differ diff --git a/bin/resources/evaluate.png b/bin/resources/evaluate.png index 47a4da8..28b48eb 100644 Binary files a/bin/resources/evaluate.png and b/bin/resources/evaluate.png differ diff --git a/bin/resources/exit.png b/bin/resources/exit.png index 9eb7a87..4859421 100644 Binary files a/bin/resources/exit.png and b/bin/resources/exit.png differ diff --git a/bin/resources/fichierAnalyse.png b/bin/resources/fichierAnalyse.png index 6af63ab..d637a68 100644 Binary files a/bin/resources/fichierAnalyse.png and b/bin/resources/fichierAnalyse.png differ diff --git a/bin/resources/fichierAnalyseInfo.png b/bin/resources/fichierAnalyseInfo.png index e65ccfb..0b167f1 100644 Binary files a/bin/resources/fichierAnalyseInfo.png and b/bin/resources/fichierAnalyseInfo.png differ diff --git a/bin/resources/fichierAnalyseInfo2.png b/bin/resources/fichierAnalyseInfo2.png index 5931716..ae1fc60 100644 Binary files a/bin/resources/fichierAnalyseInfo2.png and b/bin/resources/fichierAnalyseInfo2.png differ diff --git a/bin/resources/fichierCSV.png b/bin/resources/fichierCSV.png index de88a0a..5b8413b 100644 Binary files a/bin/resources/fichierCSV.png and b/bin/resources/fichierCSV.png differ diff --git a/bin/resources/fichierCSVInfo.png b/bin/resources/fichierCSVInfo.png index c5de141..6a2ac6f 100644 Binary files a/bin/resources/fichierCSVInfo.png and b/bin/resources/fichierCSVInfo.png differ diff --git a/bin/resources/fichierCSVInfoXML.png b/bin/resources/fichierCSVInfoXML.png index 566c86d..e0c1870 100644 Binary files a/bin/resources/fichierCSVInfoXML.png and b/bin/resources/fichierCSVInfoXML.png differ diff --git a/bin/resources/fichierODF.png b/bin/resources/fichierODF.png index d6b8dc5..0c7e2c3 100644 Binary files a/bin/resources/fichierODF.png and b/bin/resources/fichierODF.png differ diff --git a/bin/resources/fichierSVG.png b/bin/resources/fichierSVG.png index 4ef12e6..5f6a211 100644 Binary files a/bin/resources/fichierSVG.png and b/bin/resources/fichierSVG.png differ diff --git a/bin/resources/open.png b/bin/resources/open.png index 7715f9e..1adbbf5 100644 Binary files a/bin/resources/open.png and b/bin/resources/open.png differ diff --git a/bin/resources/treeOpen.png b/bin/resources/treeOpen.png index 26a67af..64fdfe1 100644 Binary files a/bin/resources/treeOpen.png and b/bin/resources/treeOpen.png differ diff --git a/bin/treeOpen.png b/bin/treeOpen.png index 26a67af..64fdfe1 100644 Binary files a/bin/treeOpen.png and b/bin/treeOpen.png differ diff --git a/bin/treeOpen.svg b/bin/treeOpen.svg index cf93e6a..4d8481b 100644 --- a/bin/treeOpen.svg +++ b/bin/treeOpen.svg @@ -7,9 +7,9 @@ inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" id="svg8" version="1.1" - viewBox="0 0 5.436443 3.415486" - height="12.908923" - width="20.547186" + 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" @@ -172,8 +172,8 @@ inkscape:document-rotation="0" inkscape:current-layer="layer1" inkscape:document-units="mm" - inkscape:cy="-0.067207399" - inkscape:cx="-0.87369619" + inkscape:cy="-0.1344148" + inkscape:cx="-5.040555" inkscape:zoom="14.879314" inkscape:pageshadow="2" inkscape:pageopacity="0.0" @@ -195,17 +195,17 @@ + position="-0.21004355,-3.5079848" /> @@ -224,26 +224,35 @@ id="layer1" inkscape:groupmode="layer" inkscape:label="Calque 1" - transform="translate(-1.1803834,-2.0081471)"> - XML + transform="translate(-1.1301771,-2.0290664)"> + + + diff --git a/bin/verifhistorique.png b/bin/verifhistorique.png new file mode 100644 index 0000000..7ad3dcd Binary files /dev/null and b/bin/verifhistorique.png differ diff --git a/bin/verifhistoriquemax.png b/bin/verifhistoriquemax.png new file mode 100644 index 0000000..b90023b Binary files /dev/null and b/bin/verifhistoriquemax.png differ diff --git a/bin/verifhistoriquemini.png b/bin/verifhistoriquemini.png new file mode 100644 index 0000000..7131d5f Binary files /dev/null and b/bin/verifhistoriquemini.png differ diff --git a/documentation analyseWriter.pdf b/documentation analyseWriter.pdf index abba187..f8133b4 100644 Binary files a/documentation analyseWriter.pdf and b/documentation analyseWriter.pdf differ diff --git a/icons/Verifhistorique.svg b/icons/Verifhistorique.svg new file mode 100644 index 0000000..25a4859 --- /dev/null +++ b/icons/Verifhistorique.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/apropos.png b/icons/apropos.png index fbba6ba..c16ba74 100644 Binary files a/icons/apropos.png and b/icons/apropos.png differ diff --git a/icons/aproposmax.png b/icons/aproposmax.png new file mode 100644 index 0000000..2d84146 Binary files /dev/null and b/icons/aproposmax.png differ diff --git a/icons/aproposmini.png b/icons/aproposmini.png new file mode 100644 index 0000000..2cfc4b9 Binary files /dev/null and b/icons/aproposmini.png differ diff --git a/icons/collapseAll.svg b/icons/collapseAll.svg new file mode 100644 index 0000000..f0c4be7 --- /dev/null +++ b/icons/collapseAll.svg @@ -0,0 +1,313 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/icons/collapseNode.svg b/icons/collapseNode.svg new file mode 100644 index 0000000..2f97eea --- /dev/null +++ b/icons/collapseNode.svg @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/icons/collapseallmini.png b/icons/collapseallmini.png new file mode 100644 index 0000000..4a63c4c Binary files /dev/null and b/icons/collapseallmini.png differ diff --git a/icons/collapsenodemini.png b/icons/collapsenodemini.png new file mode 100644 index 0000000..46aad05 Binary files /dev/null and b/icons/collapsenodemini.png differ diff --git a/icons/documentation.svg b/icons/documentation.svg index b5314b5..0c4799b 100644 --- a/icons/documentation.svg +++ b/icons/documentation.svg @@ -1,8 +1,8 @@ - - - - - - - + id="g854"> + + + + + + + + + - - + transform="matrix(-0.52356925,0,0,0.52358764,31.628394,3.8839196)" + style="stroke-width:1.4667"> + id="g1077" + transform="matrix(-1.2677802,0,0,1.2677545,48.317494,-3.2564478)" + style="stroke-width:1.15692"> + style="fill:#ffaaaa;stroke:none;stroke-width:0.3061px;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" /> + 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.571516;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + sodipodi:nodetypes="ccc" /> + + + + + + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.3061px;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" /> - diff --git a/icons/evaluatemax.png b/icons/evaluatemax.png new file mode 100644 index 0000000..05a734f Binary files /dev/null and b/icons/evaluatemax.png differ diff --git a/icons/evaluatemini.png b/icons/evaluatemini.png new file mode 100644 index 0000000..2bbf8f5 Binary files /dev/null and b/icons/evaluatemini.png differ diff --git a/icons/evaluerFalse.svg b/icons/evaluerFalse.svg new file mode 100644 index 0000000..1ea9823 --- /dev/null +++ b/icons/evaluerFalse.svg @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/icons/evaluerTrue.svg b/icons/evaluerTrue.svg new file mode 100644 index 0000000..d14bad3 --- /dev/null +++ b/icons/evaluerTrue.svg @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/icons/evaluerfalsemini.png b/icons/evaluerfalsemini.png new file mode 100644 index 0000000..37cf791 Binary files /dev/null and b/icons/evaluerfalsemini.png differ diff --git a/icons/evaluertruemini.png b/icons/evaluertruemini.png new file mode 100644 index 0000000..9f6ec6e Binary files /dev/null and b/icons/evaluertruemini.png differ diff --git a/icons/exit.png b/icons/exit.png index 9eb7a87..4859421 100644 Binary files a/icons/exit.png and b/icons/exit.png differ diff --git a/icons/exit.svg b/icons/exit.svg index 024f1b8..b253fcd 100644 --- a/icons/exit.svg +++ b/icons/exit.svg @@ -9,15 +9,29 @@ viewBox="0 0 48 48" sodipodi:docname="exit.svg" inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" - inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\exit.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" + inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\exitmini.png" + inkscape:export-xdpi="48" + inkscape:export-ydpi="48" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> + id="defs6"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/icons/expandNode.svg b/icons/expandNode.svg new file mode 100644 index 0000000..f70feb1 --- /dev/null +++ b/icons/expandNode.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/icons/expandall.png b/icons/expandall.png new file mode 100644 index 0000000..d33e110 Binary files /dev/null and b/icons/expandall.png differ diff --git a/icons/expandallmini.png b/icons/expandallmini.png new file mode 100644 index 0000000..1cad595 Binary files /dev/null and b/icons/expandallmini.png differ diff --git a/icons/expandnode.png b/icons/expandnode.png new file mode 100644 index 0000000..419ed8c Binary files /dev/null and b/icons/expandnode.png differ diff --git a/icons/expandnodemini.png b/icons/expandnodemini.png new file mode 100644 index 0000000..419ed8c Binary files /dev/null and b/icons/expandnodemini.png differ diff --git a/icons/fichierAnalyse.png b/icons/fichierAnalyse.png index 6af63ab..d637a68 100644 Binary files a/icons/fichierAnalyse.png and b/icons/fichierAnalyse.png differ diff --git a/icons/fichierAnalyseInfo.png b/icons/fichierAnalyseInfo.png index e65ccfb..0b167f1 100644 Binary files a/icons/fichierAnalyseInfo.png and b/icons/fichierAnalyseInfo.png differ diff --git a/icons/fichierAnalyseInfo2.png b/icons/fichierAnalyseInfo2.png index 5931716..ae1fc60 100644 Binary files a/icons/fichierAnalyseInfo2.png and b/icons/fichierAnalyseInfo2.png differ diff --git a/icons/fichierAnalyseInfo2max.png b/icons/fichierAnalyseInfo2max.png new file mode 100644 index 0000000..978777b Binary files /dev/null and b/icons/fichierAnalyseInfo2max.png differ diff --git a/icons/fichierAnalyseInfo2mini.png b/icons/fichierAnalyseInfo2mini.png new file mode 100644 index 0000000..c2ecfc5 Binary files /dev/null and b/icons/fichierAnalyseInfo2mini.png differ diff --git a/icons/fichierAnalyseInfomax.png b/icons/fichierAnalyseInfomax.png new file mode 100644 index 0000000..e67816b Binary files /dev/null and b/icons/fichierAnalyseInfomax.png differ diff --git a/icons/fichierAnalyseInfomini.png b/icons/fichierAnalyseInfomini.png new file mode 100644 index 0000000..aae3c55 Binary files /dev/null and b/icons/fichierAnalyseInfomini.png differ diff --git a/icons/fichierAnalyseModifmax.png b/icons/fichierAnalyseModifmax.png new file mode 100644 index 0000000..38753a5 Binary files /dev/null and b/icons/fichierAnalyseModifmax.png differ diff --git a/icons/fichierAnalyseModifmini.png b/icons/fichierAnalyseModifmini.png new file mode 100644 index 0000000..5cbdd94 Binary files /dev/null and b/icons/fichierAnalyseModifmini.png differ diff --git a/icons/fichierAnalysemax.png b/icons/fichierAnalysemax.png new file mode 100644 index 0000000..d163e7c Binary files /dev/null and b/icons/fichierAnalysemax.png differ diff --git a/icons/fichierAnalysemini.png b/icons/fichierAnalysemini.png new file mode 100644 index 0000000..86f62c3 Binary files /dev/null and b/icons/fichierAnalysemini.png differ diff --git a/icons/fichierCSV.png b/icons/fichierCSV.png index de88a0a..5b8413b 100644 Binary files a/icons/fichierCSV.png and b/icons/fichierCSV.png differ diff --git a/icons/fichierCSVInfo.png b/icons/fichierCSVInfo.png index c5de141..6a2ac6f 100644 Binary files a/icons/fichierCSVInfo.png and b/icons/fichierCSVInfo.png differ diff --git a/icons/fichierCSVInfoXML.png b/icons/fichierCSVInfoXML.png index 566c86d..e0c1870 100644 Binary files a/icons/fichierCSVInfoXML.png and b/icons/fichierCSVInfoXML.png differ diff --git a/icons/fichierCSVInfoXMLmax.png b/icons/fichierCSVInfoXMLmax.png new file mode 100644 index 0000000..719a68f Binary files /dev/null and b/icons/fichierCSVInfoXMLmax.png differ diff --git a/icons/fichierCSVInfoXMLmini.png b/icons/fichierCSVInfoXMLmini.png new file mode 100644 index 0000000..022af23 Binary files /dev/null and b/icons/fichierCSVInfoXMLmini.png differ diff --git a/icons/fichierCSVInfomax.png b/icons/fichierCSVInfomax.png new file mode 100644 index 0000000..379f8a7 Binary files /dev/null and b/icons/fichierCSVInfomax.png differ diff --git a/icons/fichierCSVInfomini.png b/icons/fichierCSVInfomini.png new file mode 100644 index 0000000..80642fe Binary files /dev/null and b/icons/fichierCSVInfomini.png differ diff --git a/icons/fichierCSVmax.png b/icons/fichierCSVmax.png new file mode 100644 index 0000000..3137959 Binary files /dev/null and b/icons/fichierCSVmax.png differ diff --git a/icons/fichierCSVmini.png b/icons/fichierCSVmini.png new file mode 100644 index 0000000..3407e22 Binary files /dev/null and b/icons/fichierCSVmini.png differ diff --git a/icons/fichierODF.png b/icons/fichierODF.png index d6b8dc5..0c7e2c3 100644 Binary files a/icons/fichierODF.png and b/icons/fichierODF.png differ diff --git a/icons/fichierODFmax.png b/icons/fichierODFmax.png new file mode 100644 index 0000000..1a63b8d Binary files /dev/null and b/icons/fichierODFmax.png differ diff --git a/icons/fichierODFmini.png b/icons/fichierODFmini.png new file mode 100644 index 0000000..4c33188 Binary files /dev/null and b/icons/fichierODFmini.png differ diff --git a/icons/fichierSVG.png b/icons/fichierSVG.png index 4ef12e6..5f6a211 100644 Binary files a/icons/fichierSVG.png and b/icons/fichierSVG.png differ diff --git a/icons/fichierSVGmax.png b/icons/fichierSVGmax.png new file mode 100644 index 0000000..34deed9 Binary files /dev/null and b/icons/fichierSVGmax.png differ diff --git a/icons/fichierSVGmini.png b/icons/fichierSVGmini.png new file mode 100644 index 0000000..d665f24 Binary files /dev/null and b/icons/fichierSVGmini.png differ diff --git a/icons/fichier_analyseXML info1.svg b/icons/fichier_analyseXML info1.svg index ce6dc4b..f0bd100 100644 --- a/icons/fichier_analyseXML info1.svg +++ b/icons/fichier_analyseXML info1.svg @@ -1,8 +1,8 @@ + + + + + + XML - - + id="g1631" + transform="translate(-16.228845,-0.44297095)"> + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + XML + + + + + + diff --git a/icons/nodeFichier.png b/icons/nodeFichier.png new file mode 100644 index 0000000..d6349c6 Binary files /dev/null and b/icons/nodeFichier.png differ diff --git a/icons/nodeFichier_FichierAnalyse.svg b/icons/nodeFichier_FichierAnalyse.svg new file mode 100644 index 0000000..e730049 --- /dev/null +++ b/icons/nodeFichier_FichierAnalyse.svg @@ -0,0 +1,398 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + XML + + + + + + + + + + + + + ? + + diff --git a/icons/nodeFichiermax.png b/icons/nodeFichiermax.png new file mode 100644 index 0000000..9cf2dfa Binary files /dev/null and b/icons/nodeFichiermax.png differ diff --git a/icons/nodeFichiermini.png b/icons/nodeFichiermini.png new file mode 100644 index 0000000..8fc7e8d Binary files /dev/null and b/icons/nodeFichiermini.png differ diff --git a/icons/open.png b/icons/open.png index 7715f9e..1adbbf5 100644 Binary files a/icons/open.png and b/icons/open.png differ diff --git a/icons/open.svg b/icons/open.svg index 69a5a63..f1831b1 100644 --- a/icons/open.svg +++ b/icons/open.svg @@ -9,12 +9,29 @@ viewBox="0 0 48 48" sodipodi:docname="open.svg" inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" + inkscape:export-filename="C:\Users\pabr6\git\analyseWriter\MEPTL\icons\openmax.png" + inkscape:export-xdpi="184" + inkscape:export-ydpi="184" 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"> + id="defs6"> + + + + - - - - - + + + + diff --git a/icons/openmax.png b/icons/openmax.png new file mode 100644 index 0000000..1bf8391 Binary files /dev/null and b/icons/openmax.png differ diff --git a/icons/openmini.png b/icons/openmini.png new file mode 100644 index 0000000..1a3f148 Binary files /dev/null and b/icons/openmini.png differ diff --git a/icons/supprime.svg b/icons/supprime.svg new file mode 100644 index 0000000..10a2d84 --- /dev/null +++ b/icons/supprime.svg @@ -0,0 +1,335 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + XML + + + + + + + + + + + + + ? + + diff --git a/icons/supprimemini.png b/icons/supprimemini.png new file mode 100644 index 0000000..fff48b1 Binary files /dev/null and b/icons/supprimemini.png differ diff --git a/icons/treeOpen.png b/icons/treeOpen.png index 26a67af..64fdfe1 100644 Binary files a/icons/treeOpen.png and b/icons/treeOpen.png differ diff --git a/icons/treeOpen.svg b/icons/treeOpen.svg index cf93e6a..4d8481b 100644 --- a/icons/treeOpen.svg +++ b/icons/treeOpen.svg @@ -7,9 +7,9 @@ inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" id="svg8" version="1.1" - viewBox="0 0 5.436443 3.415486" - height="12.908923" - width="20.547186" + 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" @@ -172,8 +172,8 @@ inkscape:document-rotation="0" inkscape:current-layer="layer1" inkscape:document-units="mm" - inkscape:cy="-0.067207399" - inkscape:cx="-0.87369619" + inkscape:cy="-0.1344148" + inkscape:cx="-5.040555" inkscape:zoom="14.879314" inkscape:pageshadow="2" inkscape:pageopacity="0.0" @@ -195,17 +195,17 @@ + position="-0.21004355,-3.5079848" /> @@ -224,26 +224,35 @@ id="layer1" inkscape:groupmode="layer" inkscape:label="Calque 1" - transform="translate(-1.1803834,-2.0081471)"> - XML + transform="translate(-1.1301771,-2.0290664)"> + + + diff --git a/icons/verifhistorique.png b/icons/verifhistorique.png new file mode 100644 index 0000000..7ad3dcd Binary files /dev/null and b/icons/verifhistorique.png differ diff --git a/icons/verifhistoriquemax.png b/icons/verifhistoriquemax.png new file mode 100644 index 0000000..b90023b Binary files /dev/null and b/icons/verifhistoriquemax.png differ diff --git a/icons/verifhistoriquemini.png b/icons/verifhistoriquemini.png new file mode 100644 index 0000000..7131d5f Binary files /dev/null and b/icons/verifhistoriquemini.png differ diff --git a/src/MEPTL/commandes.java b/src/MEPTL/commandes.java index ab7eb3b..b0e4a0e 100644 --- a/src/MEPTL/commandes.java +++ b/src/MEPTL/commandes.java @@ -60,7 +60,7 @@ public class commandes { public static String contenuFichierSVG =""; // Le nouveau logo public static String path =""; public static String pathDestination =""; //Pour le mode console uniquement - public static String version ="4.0.0"; // La version actuelle + public static String version ="4.0.2"; // La version actuelle public static String nomDeLaBranch = "Origin"; //Branche de développement public static String Command =""; //récupère le texte de la commande dans la console @@ -671,7 +671,11 @@ public class commandes { System.out.println("\t\t│ (\")__(\") ... Bye Bye analyseWriter. │"); System.out.println("\t\t└────────────────────────────────────────────────────┘"); System.out.println(); - System.exit(0); + commandes.message.append("\n (')_(')"); + commandes.message.append("\n ( `.° ) Bravo, vous avez travaillé très dur!"); + commandes.message.append("\n (\")__(\") ... Bye Bye analyseWriter."); + commandes.message.append("\n"); + if(commandes.console) System.exit(0); } /** diff --git a/src/app/create.java b/src/app/create.java index 9b7848c..179474c 100644 --- a/src/app/create.java +++ b/src/app/create.java @@ -2,6 +2,7 @@ package app; import java.awt.BorderLayout; import java.awt.Color; +import java.awt.Desktop; import java.awt.Dimension; import java.awt.Font; import java.awt.SystemColor; @@ -29,6 +30,7 @@ import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JPopupMenu; import javax.swing.JScrollPane; import javax.swing.JSeparator; import javax.swing.JSplitPane; @@ -41,15 +43,18 @@ import javax.swing.SwingConstants; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreeNode; +import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; - import MEPTL.commandes; import cXML.Run; +import cXML.node; + import java.awt.event.InputEvent; + public class create extends JFrame { private static final long serialVersionUID = 1L; @@ -137,7 +142,7 @@ public class create extends JFrame { setSize(1400,920); //setExtendedState(getExtendedState()|JFrame.MAXIMIZED_BOTH ); - setTitle(commandes.Titre); +// setTitle("analyseWriter - Evaluer les fichiers des étudiants"); ImageIcon img = new ImageIcon(getClass().getResource("/evalwriter.png") ); setIconImage(img.getImage()); @@ -147,6 +152,10 @@ public class create extends JFrame { // Construction et injection de la barre de menu setJMenuBar( this.createMenuBar() ); + tree.setVisibleRowCount(30); + + // Ajoute le menu contextuel de la tree + tree.setComponentPopupMenu(createPopupMenuTree()); // Construction et injection de la barre d'outils JPanel contentPane = (JPanel) getContentPane(); @@ -425,10 +434,7 @@ public class create extends JFrame { leftScrollPane.setViewportView(tree); tree.setFont(new Font("Tahoma", Font.PLAIN, 14)); - tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode("Arborescence du fichier") { - private static final long serialVersionUID = 1L; } )); - - + if(commandes.fichierAnalyseValide) { constructionTree(); } @@ -445,87 +451,121 @@ public class create extends JFrame { tree.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { -// @SuppressWarnings("unused") -// TreeSelectionModel smd = tree.getSelectionModel(); - DefaultMutableTreeNode selectNode = (DefaultMutableTreeNode) tree.getSelectionPath().getLastPathComponent(); -// JTextPane textPane = new JTextPane (); -// textPane.setText(""+utils.attributEtContenuNode(selectNode)+""); -// textNodeSelect.setText(textPane.getText()); - textNodeSelect.setContentType("text/html"); - - - cXML.node nod = (cXML.node) selectNode.getUserObject(); - - String nodeParent = ""; - if(nod.getParent()!=null) { - nodeParent = nod.getParent().toString(); + if(tree.getSelectionPath()!=null) { + refeshNodeSelected(); } - - StringBuilder sb = new StringBuilder(); - - - sb.append(balisestyles()); - - - sb.append("

Node parent = " + nodeParent + "


"); - sb.append("

Path = " + nod.getParent() + "


"); - sb.append("
"); - - sb.append("

Nom du node : " + nod.getNomElt() + "


"); - sb.append("
"); - - Enumeration key = nod.getAttributs().keys(); - if(nod.getAttributs().size()>0) sb.append("

Attribut(s)

"); - sb.append("
    "); - while(key.hasMoreElements()) { - String k = key.nextElement(); - boolean ecrit =false; - if(nod.getAttributs().get("evaluer")!=null) { - if(nod.getAttributs().get("evaluer").equals("true")) { - - switch(k) { - case ("evalContenu"): - sb.append("
  • " + k + "=\"" + nod.getAttributs().get(k)+"\"
    • "); - ecrit=true; - break; - case("evaluer"): - sb.append("
  • " + k + "=\"" + nod.getAttributs().get(k)+"\"
    • "); - ecrit=true; - break; - } - - if(nod.getAttributs().get(k).contains("‽") && !ecrit) { - sb.append("
  • " + k + "=\"" + nod.getAttributs().get(k)+"\"
    • "); - ecrit=true; - }else { - sb.append("
  • " + k + "=\"" + nod.getAttributs().get(k)+"\"
    • "); - ecrit=true; - } - - }else { - sb.append("
  • " + k + "=\"" + nod.getAttributs().get(k)+"\"
    • "); - if(nod.getAttributs().get(k).contains("‽")) sb.append("
  • " + k + "=\"" + nod.getAttributs().get(k)+"\"
    • "); - } - }else { - sb.append("
  • " + k + "=\"" + nod.getAttributs().get(k)+"\"
    • "); - } - - - } - sb.append("
"); - - if(!nod.retourneLesContenusEnfants("").trim().isEmpty()) { - sb.append("

Contenu


" + nod.retourneLesContenusEnfants("") ); - } - - textNodeSelect.setText(""+sb.toString()+""); - } }); } + + public void refeshNodeSelected() { + DefaultMutableTreeNode selectNode = (DefaultMutableTreeNode) tree.getSelectionPath().getLastPathComponent(); + + if(tree.getSelectionPath()!=null) { + + textNodeSelect.setContentType("text/html"); + + + node nod = (node) selectNode.getUserObject(); + node nodeParent = nod.getParent(); + + + StringBuilder sb = new StringBuilder(); + + + sb.append(balisestyles()); + + + sb.append("

Parent = " + nodeParent.getNomElt() + "


"); + + sb.append("
"); + + sb.append("

Nom du node : " + nod.getNomElt() + "


"); + sb.append("
"); + + Enumeration key = nod.getAttributs().keys(); + if(nod.getAttributs().size()>0) sb.append("

Attribut(s)

"); + sb.append("
    "); + while(key.hasMoreElements()) { + String k = key.nextElement(); + boolean ecrit =false; + if(nod.getAttributs().get("evaluer")!=null) { + if(nod.getAttributs().get("evaluer").equals("true")) { + + switch(k) { + case ("evalContenu"): + sb.append("
  • " + k + "=\"" + nod.getAttributs().get(k)+"\"
    • "); + ecrit=true; + break; + case("evaluer"): + sb.append("
  • " + k + "=\"" + nod.getAttributs().get(k)+"\"
    • "); + ecrit=true; + break; + } + + if(nod.getAttributs().get(k).contains("‽") && !ecrit) { + sb.append("
  • " + k + "=\"" + nod.getAttributs().get(k)+"\"
    • "); + ecrit=true; + }else { + sb.append("
  • " + k + "=\"" + nod.getAttributs().get(k)+"\"
    • "); + ecrit=true; + } + + }else { + sb.append("
  • " + k + "=\"" + nod.getAttributs().get(k)+"\"
    • "); + if(nod.getAttributs().get(k).contains("‽")) sb.append("
  • " + k + "=\"" + nod.getAttributs().get(k)+"\"
    • "); + } + }else { + sb.append("
  • " + k + "=\"" + nod.getAttributs().get(k)+"\"
    • "); + } + + + } + sb.append("
"); + + if(!nod.retourneLesContenusEnfants("").trim().isEmpty()) { + sb.append("

Contenu


" + nod.retourneLesContenusEnfants("") ); + } + + textNodeSelect.setText(""+sb.toString()+""); + + } + } + + + /** + * Création du menu contextuel du tree + * @return + */ + private JPopupMenu createPopupMenuTree() { + + JMenu mnManageTree = new JMenu("Arbre"); + mnManageTree.add(actExpandAll); + mnManageTree.add(actExpandNode); + mnManageTree.addSeparator(); + mnManageTree.add(actCollapseAll); + mnManageTree.add(actCollapseNode); + + JPopupMenu mnPopupTree = new JPopupMenu(); + mnPopupTree.add(actEvalueTrue); + mnPopupTree.add(actEvalueFalse); + mnPopupTree.addSeparator(); + mnPopupTree.add(actNodeFichier); + mnPopupTree.addSeparator(); + mnPopupTree.add(mnManageTree); + mnPopupTree.addSeparator(); + mnPopupTree.add(actDelete); + + + return mnPopupTree; + } + + + + /* Methode de construction de la barre de menu */ private JMenuBar createMenuBar() { @@ -537,12 +577,9 @@ public class create extends JFrame { mnuFile.setMnemonic( 'F' ); /*JMenuItem mnuNewFile =*/ - mnuFile.add( actOpen ); mnuFile.add( actSave ); mnuFile.add( actSaveAs ); mnuFile.addSeparator(); - mnuFile.add( actAbout ); - mnuFile.addSeparator(); mnuFile.add( actExit ); menuBar.add(mnuFile); @@ -560,6 +597,17 @@ public class create extends JFrame { menuBar.add(mnuEdit); + // menu Modifier + JMenu mnuModif= new JMenu( "Modifier" ); + mnuModif.setMnemonic( 'M' ); + + mnuModif.add( actOpen ); + mnuModif.add( actNodeFichier ); + + menuBar.add(mnuModif); + + + // Définition du menu déroulant "Edit" et de son contenu JMenu mnuExercice = new JMenu( "Création évaluation" ); mnuExercice.setMnemonic( 'N' ); @@ -573,6 +621,7 @@ public class create extends JFrame { mnuHelp.setMnemonic( 'H' ); mnuHelp.add( actAPropos); + mnuHelp.add( actDocumentation); menuBar.add( mnuHelp ); @@ -585,11 +634,14 @@ public class create extends JFrame { JButton buttonLoadFile = toolBar.add( actOpen ); buttonLoadFile.setIcon(new ImageIcon(create.class.getResource("/resources/fichierAnalyse.png"))); + buttonLoadFile.setHideActionText(true); buttonLoadFile.setHideActionText( true ); - toolBar.add( actSave ).setHideActionText( true ); + JButton btnNodeFichier = toolBar.add( actNodeFichier ); + btnNodeFichier.setIcon(new ImageIcon(create.class.getResource("/resources/nodeFichier.png"))); + btnNodeFichier.setHideActionText(true); + toolBar.add(btnNodeFichier); - toolBar.add( actSaveAs ).setHideActionText( true ); toolBar.addSeparator(); @@ -598,13 +650,19 @@ public class create extends JFrame { btnAbout.setHideActionText( true ); toolBar.add(btnAbout); + JButton btnDocumentation = toolBar.add(actDocumentation); + btnDocumentation.setIcon(new ImageIcon(create.class.getResource("/resources/documentation.png"))); + btnDocumentation.setHideActionText(true); + toolBar.add(btnDocumentation); + toolBar.addSeparator(); toolBar.add( actExit ).setHideActionText( true ); toolBar.addSeparator(); toolBar.add( actConfiguration ); - toolBar.add( actEvaluer ); + JButton button = toolBar.add( actEvaluer ); + button.setIcon(new ImageIcon(create.class.getResource("/resources/evaluate.png"))); // if(commandes.fichierAnalyseValide) { // toolBar.add( actConfiguration ).setEnabled(true); @@ -631,15 +689,15 @@ public class create extends JFrame { /** - * Ouvre et affiche un node dans le composant JTree + * Ouvre et affiche le fichier d'analyse */ private AbstractAction actOpen = new AbstractAction() { private static final long serialVersionUID = 1L; { - putValue( Action.NAME, "Ouvrir un fichier d'analyse (CTRL+O)" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/fichierAnalyse.png")) ); + putValue( Action.NAME, "Ouvrir un fichier d'analyse" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/fichierAnalysemini.png")) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_O ); putValue( Action.SHORT_DESCRIPTION, "Ouvrir un nouveau fichier d'analyse (CTRL+O)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK) ); @@ -656,6 +714,32 @@ public class create extends JFrame { } }; + /** + * + */ + private AbstractAction actNodeFichier = new AbstractAction() { + + private static final long serialVersionUID = 1L; + + { + putValue( Action.NAME, "Modifier les paramètres de l'évaluation" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/nodeFichiermini.png")) ); + putValue( Action.LARGE_ICON_KEY, new ImageIcon(create.class.getResource("/resources/nodeFichier.png")) ); + putValue( Action.SHORT_DESCRIPTION, "Modifier les paramètres de l'évaluation" ); + + } + + @Override public void actionPerformed( ActionEvent e ) { + new filechooserXML(); + if(commandes.fichierAnalyseValide) { + constructionTree(); + textNodeSelect.setText("Le chargement de la nouvelle structure est réussi."); + MAJToolBar(); + } + System.out.println( "Open" ); + } + }; + /** * Affiche la fenêtre d'information sur analyseWriter @@ -665,8 +749,8 @@ public class create extends JFrame { private static final long serialVersionUID = 1L; { - putValue( Action.NAME, "Informations (CTRL+I)" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/apropos.png")) ); + putValue( Action.NAME, "Informations" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/aproposmini.png")) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_I ); putValue( Action.SHORT_DESCRIPTION, "Informations (CTRL+I)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_I, InputEvent.CTRL_DOWN_MASK) ); @@ -691,7 +775,7 @@ public class create extends JFrame { putValue( Action.NAME, "Enregister" ); putValue( Action.SMALL_ICON, new ImageIcon( getClass().getResource("/save.png")) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_S ); - putValue( Action.SHORT_DESCRIPTION, "Enregistrer le fichier (CTRL+S)" ); + putValue( Action.SHORT_DESCRIPTION, "Enregistrer (CTRL+S)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_DOWN_MASK ) ); } @@ -741,7 +825,7 @@ public class create extends JFrame { putValue( Action.NAME, "Enregistrer sous..." ); putValue( Action.SMALL_ICON, new ImageIcon(getClass().getResource("/save_as.png") )); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_A ); - putValue( Action.SHORT_DESCRIPTION, "Enregistrer sous un nom différent" ); + putValue( Action.SHORT_DESCRIPTION, "Enregistrer sous..." ); } @Override public void actionPerformed( ActionEvent e ) { @@ -795,8 +879,9 @@ public class create extends JFrame { private static final long serialVersionUID = 1L; { - putValue( Action.NAME, "Quitter (CRTL+Q)" ); - putValue( Action.SMALL_ICON, new ImageIcon( getClass().getResource("/exit.png") ) ); + putValue( Action.NAME, "Quitter" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/exitmini.png")) ); + putValue( Action.LARGE_ICON_KEY, new ImageIcon(create.class.getResource("/resources/exit.png")) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_Q ); putValue( Action.SHORT_DESCRIPTION, "Quitter (CRTL+Q)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_Q, KeyEvent.CTRL_DOWN_MASK ) ); @@ -814,6 +899,11 @@ public class create extends JFrame { } }; + + + + + /** * @@ -916,15 +1006,15 @@ public class create extends JFrame { }; /** - * + * Affiche la fenêtre informaton sur la version */ private AbstractAction actAPropos = new AbstractAction() { private static final long serialVersionUID = 1L; { - putValue( Action.NAME, "Informations (CTRL+I)" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/apropos.png")) ); + putValue( Action.NAME, "Informations" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/aproposmini.png")) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_M ); putValue( Action.SHORT_DESCRIPTION, "Informations (CTRL+I)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_I, InputEvent.CTRL_DOWN_MASK) ); @@ -935,6 +1025,237 @@ public class create extends JFrame { System.out.println( "A propos" ); } }; + + /** + * Supprime un node + */ + private AbstractAction actDelete = new AbstractAction() { + + private static final long serialVersionUID = 1L; + + { + putValue( Action.NAME, "Supprime" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/supprimemini.png")) ); + putValue( Action.SHORT_DESCRIPTION, "Supprime" ); + } + + @Override public void actionPerformed( ActionEvent e ) { + DefaultMutableTreeNode selectNode = (DefaultMutableTreeNode) tree.getSelectionPath().getLastPathComponent(); + textNodeSelect.setContentType("text/html"); + + if(tree.getSelectionPath()!=null) { + int a = JOptionPane.showConfirmDialog(null,"Voulez-vous supprimer le node " + selectNode.toString() + "?", "Sélectionner un choix", JOptionPane.YES_NO_OPTION); + + if(a == JOptionPane.YES_NO_OPTION) { + node nod = (node) selectNode.getUserObject(); + nod.getParent().supprimeNodeEnfant(nod); + constructionTree(); + } + } + + + } + }; + + /** + * Evalue le node est tous ces enfants + */ + private AbstractAction actEvalueTrue = new AbstractAction() { + + private static final long serialVersionUID = 1L; + + { + putValue( Action.NAME, "Evaluer true" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/evaluertruemini.png")) ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer true" ); + } + + @Override public void actionPerformed( ActionEvent e ) { +// TreePath p = tree.getSelectionPath(); +// int level = p.getPathCount(); + + DefaultMutableTreeNode selectNode = (DefaultMutableTreeNode) tree.getSelectionPath().getLastPathComponent(); + textNodeSelect.setContentType("text/html"); + + node nod = (node) selectNode.getUserObject(); + nod.evaluerTrue(); + refeshNodeSelected(); + +// tree.setModel(commandes.tree.getModel()) ; +// constructionTree(); + +// try { +// expandOrCollapsePath(tree,p,level,1,true); +// }catch(Exception e1) { +// e1.printStackTrace(); +// //do nothing +// } + + + + +// System.out.println(p.toString()); +// System.out.println(tree.getExpandsSelectedPaths()); +// tree.setSelectionPath(p); +// tree.expandPath(p); + } + }; + + + +// public static void expandOrCollapsePath (JTree tree,TreePath treePath,int level,int currentLevel,boolean expand) { +// System.out.println("Exp level="+currentLevel+", exp="+expand + ", level=" + level); +// if (expand && level<=currentLevel && level>0) return; +// +// TreeNode treeNode = ( TreeNode ) treePath.getLastPathComponent(); +// TreeModel treeModel=tree.getModel(); +// if ( treeModel.getChildCount(treeNode) >= 0 ) { +// for ( int i = 0; i < treeModel.getChildCount(treeNode); i++ ) { +// TreeNode n = ( TreeNode )treeModel.getChild(treeNode, i); +// TreePath path = treePath.pathByAddingChild( n ); +// expandOrCollapsePath(tree,path,level,currentLevel+1,expand); +// } +// if (!expand && currentLevel"; } + + + private void expandAll() { + Enumeration topLevelNodes = ((TreeNode) tree.getModel().getRoot()).children(); + while(topLevelNodes.hasMoreElements()) { + DefaultMutableTreeNode N = (DefaultMutableTreeNode) topLevelNodes.nextElement(); + tree.expandPath(new TreePath(N.getPath())); + expandNode( N); + } + } + + private void collapseAll() { + Enumeration topLevelNodes = ((TreeNode) tree.getModel().getRoot()).children(); + while(topLevelNodes.hasMoreElements()) { + DefaultMutableTreeNode N = (DefaultMutableTreeNode) topLevelNodes.nextElement(); + tree.collapsePath(new TreePath(N.getPath())); + collapseNode(N); + } + } + + private void expandNode(DefaultMutableTreeNode N) { + Enumeration topLevelNodes = ((TreeNode) N).children(); + while(topLevelNodes.hasMoreElements()) { + DefaultMutableTreeNode N1 = (DefaultMutableTreeNode) topLevelNodes.nextElement(); + tree.expandPath(new TreePath(N1.getPath())); + expandNode(N1); + } + } + + private void collapseNode(DefaultMutableTreeNode N) { + Enumeration topLevelNodes = ((TreeNode) N).children(); + while(topLevelNodes.hasMoreElements()) { + DefaultMutableTreeNode N1 = (DefaultMutableTreeNode) topLevelNodes.nextElement(); + tree.collapsePath(new TreePath(N1.getPath())); + collapseNode( N1 ); + } + tree.collapsePath(new TreePath(N.getPath())); + } + } diff --git a/src/app/evaluate.java b/src/app/evaluate.java index 7481548..c9d69ed 100644 --- a/src/app/evaluate.java +++ b/src/app/evaluate.java @@ -44,6 +44,7 @@ import javax.swing.JOptionPane; import java.awt.Color; import java.awt.Desktop; import javax.swing.JEditorPane; +import java.awt.event.ActionListener; public class evaluate extends JFrame { @@ -54,7 +55,6 @@ public class evaluate extends JFrame { /** * */ - @SuppressWarnings("unused") private JToolBar toolBar = new JToolBar(); private JPanel contentPane; private JLabel lblPath = new JLabel(); @@ -92,7 +92,10 @@ public class evaluate extends JFrame { JMenu mnNewMenu = new JMenu("Fichier"); mnNewMenu.setMnemonic( 'F' ); menuBar.add(mnNewMenu); - mnNewMenu.add( actExit ); + mnNewMenu.add( actSave ); + mnNewMenu.add( actSaveas ); + mnNewMenu.addSeparator(); + mnNewMenu.add( actExit ); JMenu mnMenu_Fichier = new JMenu("Fichier d'analyse"); @@ -122,6 +125,8 @@ public class evaluate extends JFrame { mnMenu_Evaluation.add(actSelectFolder); mnMenu_Evaluation.addSeparator(); mnMenu_Evaluation.add(actEvaluate); + mnMenu_Evaluation.addSeparator(); + mnMenu_Evaluation.add(actVerifHistorique); JMenu mnMenu_Informations = new JMenu("Informations"); menuBar.add(mnMenu_Informations); @@ -196,13 +201,18 @@ public class evaluate extends JFrame { toolBar.addSeparator(); JButton btnSelectFolder = toolBar.add(actSelectFolder); - btnSelectFolder.setIcon(new ImageIcon(evaluate.class.getResource("/resources/open2.png"))); + btnSelectFolder.setIcon(new ImageIcon(evaluate.class.getResource("/resources/open.png"))); btnSelectFolder.setHideActionText(true); toolBar.add(btnSelectFolder); btnEvaluerLesFichiers.setIcon(new ImageIcon(evaluate.class.getResource("/resources/evaluate.png"))); toolBar.add(btnEvaluerLesFichiers); + JButton btnVerifHistorique = toolBar.add(actVerifHistorique); + btnVerifHistorique.setIcon(new ImageIcon(evaluate.class.getResource("/resources/verifhistorique.png"))); + btnVerifHistorique.setHideActionText(true); + toolBar.add(btnVerifHistorique); + toolBar.addSeparator(); JButton btnNewButton = toolBar.add( actDocumentation ); @@ -403,9 +413,9 @@ public class evaluate extends JFrame { private static final long serialVersionUID = 1L; { - putValue(LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/evaluate.png"))); - putValue( Action.NAME, "Evaluer les fichiers (CTRL+E)" ); - putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/evaluate.png")) ); + putValue(Action.LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/evaluate.png"))); + putValue( Action.NAME, "Evaluer les fichiers" ); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/evaluatemini.png")) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_E ); putValue( Action.SHORT_DESCRIPTION, "Evaluer les fichiers (CTRL+E)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK) ); @@ -414,16 +424,51 @@ public class evaluate extends JFrame { @Override public void actionPerformed( ActionEvent e ) { if(commandes.fichierAnalyseValide) { - try { - msgBox V = new msgBox("Je travaille dure.",false,false,"Attendez"); - Thread.sleep(100); - evaluerLesFichiersEtudiants(); - V.close(); - } catch (ParserConfigurationException | SAXException | IOException | CloneNotSupportedException e1) { - e1.printStackTrace(); - } catch (InterruptedException e1) { - e1.printStackTrace(); - } +// JOptionPane.showMessageDialog(null, "Je boss", "Je travaille", JOptionPane.PLAIN_MESSAGE, null); + + // TODO Auto-generated method stub + + + Thread t1 = new Thread(new Runnable() { + @Override + public void run() { +// JOptionPane.showConfirmDialog(null, "Message"); + msgBox V = new msgBox("Je travaille dure.",true,false,"Attendez"); + V.setVisible(true); +// V.close(); + } + }); + +// JOptionPane.showConfirmDialog(null, "Message"); + + Thread t2 = new Thread(new Runnable() { + @Override + public void run() { + try { + evaluerLesFichiersEtudiants(); + } catch (ParserConfigurationException | SAXException | IOException + | CloneNotSupportedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + + t1.start(); + t2.start(); + +// try { +// t1.join(); +// t2.join(); +// +// } catch (InterruptedException e1) { +// // TODO Auto-generated catch block +// e1.printStackTrace(); +// } + + + + }else { txtpnmessages.setText("*** Veuillez charger un fichier d'analyse ***"); new msgBox("Le fichier d'analyse n'est pas valide.",true,false,"Avertissement"); @@ -441,8 +486,8 @@ public class evaluate extends JFrame { { putValue(LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyse.png"))); - putValue( Action.NAME, "Ouvrir un nouveau fichier d'analyse (CTRL+O)" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/fichierAnalyse.png")) ); + putValue( Action.NAME, "Ouvrir un nouveau fichier d'analyse" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/fichierAnalysemini.png")) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_O ); putValue( Action.SHORT_DESCRIPTION, "Ouvrir un nouveau fichier d'analyse (CTRL+O)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK) ); @@ -465,9 +510,9 @@ public class evaluate extends JFrame { private static final long serialVersionUID = 1L; { - putValue(LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/fichierSVG.png"))); - putValue( Action.NAME, "Charge un logo SVG (CTRL+G)" ); - putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierSVG.png"))); + putValue(Action.LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/fichierSVG.png"))); + putValue( Action.NAME, "Charge un logo SVG" ); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierSVGmini.png"))); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_G ); putValue( Action.SHORT_DESCRIPTION, "Charge un logo SVG (CTRL+G)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_G, InputEvent.CTRL_DOWN_MASK) ); @@ -508,11 +553,11 @@ public class evaluate extends JFrame { private static final long serialVersionUID = 1L; { - putValue(LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/open2.png"))); - putValue( Action.NAME, "Dossier des étudiants (CTRL+U)" ); - putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/open2.png")) ); + putValue(LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/open.png"))); + putValue( Action.NAME, "Dossier d'analyse" ); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/openmini.png")) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_U ); - putValue( Action.SHORT_DESCRIPTION, "Dossier des étudiants (CTRL+U)" ); + putValue( Action.SHORT_DESCRIPTION, "Dossier d'analyse (CTRL+U)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_DOWN_MASK) ); } @@ -537,75 +582,116 @@ public class evaluate extends JFrame { } }; - private AbstractAction actVerifCSV = new AbstractAction() { + /** + + /** + * Verification + */ + private AbstractAction actVerifHistorique = new AbstractAction() { private static final long serialVersionUID = 1L; { - putValue(LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/fichierCSVInfoXML.png"))); - putValue( Action.NAME, "Vérification du CSV avec les paramètres du fichier d'analyse (CTRL+B)" ); - putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierCSVInfoXML.png")) ); - putValue( Action.MNEMONIC_KEY, KeyEvent.VK_U ); - putValue( Action.SHORT_DESCRIPTION, "Vérification du CSV avec les paramètres du fichier d'analyse (CTRL+B)" ); - putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_DOWN_MASK) ); + putValue(Action.LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/verifhistorique.png"))); + putValue( Action.NAME, "Evaluer l'historique des modification" ); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/verifhistoriquemini.png"))); + putValue( Action.MNEMONIC_KEY, KeyEvent.VK_H ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer l'historique des modification (CTRL+H)" ); + putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_H, InputEvent.CTRL_DOWN_MASK) ); } @Override public void actionPerformed( ActionEvent e ) { - - if(commandes.fichierAnalyseValide) { - if(commandes.fourniCSV) { - node settingCSV = commandes.sujet.retourneFirstEnfantsByName("import_moodle"); - if(settingCSV.isHasAttributs()) { - String email ="inconnu"; - String name = "inconnu"; - String firstname = "inconnu"; - String id = "inconnu"; - boolean avertissement = false; - if(settingCSV.getAttributs().get("email")!=null) { - email = settingCSV.getAttributs().get("email"); - } - if(settingCSV.getAttributs().get("name")!=null) { - name = settingCSV.getAttributs().get("name"); - } - if(settingCSV.getAttributs().get("firstname")!=null) { - firstname = settingCSV.getAttributs().get("firstname"); - } - if(settingCSV.getAttributs().get("id")!=null) { - id = settingCSV.getAttributs().get("id"); - } - if(commandes.nodeCSV.getNodes().get(0).getAttributs().get(firstname)==null) { - txtpnmessages.setText("*** AVERTISSEMENT - Il n'y a pas le champ " + firstname + " dans le fichier CSV. ***"); - avertissement=true; - } - if(commandes.nodeCSV.getNodes().get(0).getAttributs().get(name)==null) { - txtpnmessages.setText("*** AVERTISSEMENT - Il n'y a pas le champ " + name + " dans le fichier CSV. ***"); - avertissement=true; - } - if(commandes.nodeCSV.getNodes().get(0).getAttributs().get(id)==null) { - txtpnmessages.setText("*** AVERTISSEMENT - Il n'y a pas le champ " + id + " dans le fichier CSV. ***"); - avertissement=true; - } - if(commandes.nodeCSV.getNodes().get(0).getAttributs().get(email)==null) { - txtpnmessages.setText("*** AVERTISSEMENT - Il n'y a pas le champ " + email + " dans le fichier CSV. ***"); - avertissement=true; - } - if(!avertissement) { - txtpnmessages.setText("*** Le fichier CSV contenant la liste des étudiants peut être utilisé avec les paramètres du fichier d'analyse ***"); - } - }else { - txtpnmessages.setText("*** Le fichier CSV contenant la liste des étudiants est vide ***"); - } - }else { - txtpnmessages.setText("*** Veuillez charger un fichier CSV contenant la liste des étudiants ***"); - new msgBox("Le fichier CSV contenant la liste des étudiants n'est pas chargé.",true,false,"Avertissement"); - } + commandes.verifHisto = true; + commandes.analyse = false; + if(!commandes.path.isEmpty()) { + try { + msgBox V = new msgBox("Je travaille dure.",false,false,"Attendez"); + Thread.sleep(100); + meptl.analyseVerifieHistoriqueLesFichiersEtudiantsEtExportNoteCSV(); + txtpnmessages.setText(commandes.message.toString()); + V.close(); + } catch (ParserConfigurationException | SAXException | IOException | CloneNotSupportedException e1) { + e1.printStackTrace(); + } catch (InterruptedException e1) { + e1.printStackTrace(); + } }else { - txtpnmessages.setText("*** Veuillez charger un fichier d'analyse ***"); - new msgBox("Le fichier d'analyse n'est pas valide.",true,false,"Avertissement"); + txtpnmessages.setText("*** Veuillez sélectionner un dossier d'analyse. ***"); } + commandes.verifHisto = false; } }; - + private AbstractAction actVerifCSV = new AbstractAction() { + + private static final long serialVersionUID = 1L; + { + putValue(Action.LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/fichierCSVInfoXML.png"))); + putValue( Action.NAME, "Vérification des champs du CSV" ); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierCSVInfoXMLmini.png")) ); + putValue( Action.MNEMONIC_KEY, KeyEvent.VK_U ); + putValue( Action.SHORT_DESCRIPTION, "Vérification des champs du CSV (CTRL+B)" ); + putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_DOWN_MASK) ); + } + @Override + public void actionPerformed( ActionEvent e ) { + + if(commandes.fichierAnalyseValide) { + if(commandes.fourniCSV) { + node settingCSV = commandes.sujet.retourneFirstEnfantsByName("import_moodle"); + if(settingCSV.isHasAttributs()) { + String email ="inconnu"; + String name = "inconnu"; + String firstname = "inconnu"; + String id = "inconnu"; + boolean avertissement = false; + if(settingCSV.getAttributs().get("email")!=null) { + email = settingCSV.getAttributs().get("email"); + } + if(settingCSV.getAttributs().get("name")!=null) { + name = settingCSV.getAttributs().get("name"); + } + if(settingCSV.getAttributs().get("firstname")!=null) { + firstname = settingCSV.getAttributs().get("firstname"); + } + if(settingCSV.getAttributs().get("id")!=null) { + id = settingCSV.getAttributs().get("id"); + } + if(commandes.nodeCSV.getNodes().get(0).getAttributs().get(firstname)==null) { + txtpnmessages.setText("*** AVERTISSEMENT - Il n'y a pas le champ " + firstname + " dans le fichier CSV. ***"); + avertissement=true; + } + if(commandes.nodeCSV.getNodes().get(0).getAttributs().get(name)==null) { + txtpnmessages.setText("*** AVERTISSEMENT - Il n'y a pas le champ " + name + " dans le fichier CSV. ***"); + avertissement=true; + } + if(commandes.nodeCSV.getNodes().get(0).getAttributs().get(id)==null) { + txtpnmessages.setText("*** AVERTISSEMENT - Il n'y a pas le champ " + id + " dans le fichier CSV. ***"); + avertissement=true; + } + if(commandes.nodeCSV.getNodes().get(0).getAttributs().get(email)==null) { + txtpnmessages.setText("*** AVERTISSEMENT - Il n'y a pas le champ " + email + " dans le fichier CSV. ***"); + avertissement=true; + } + if(!avertissement) { + txtpnmessages.setText("*** Le fichier CSV contenant la liste des étudiants peut être utilisé avec les paramètres du fichier d'analyse ***"); + } + }else { + txtpnmessages.setText("*** Le fichier CSV contenant la liste des étudiants est vide ***"); + } + }else { + txtpnmessages.setText("*** Veuillez charger un fichier CSV contenant la liste des étudiants ***"); + new msgBox("Le fichier CSV contenant la liste des étudiants n'est pas chargé.",true,false,"Avertissement"); + } + }else { + txtpnmessages.setText("*** Veuillez charger un fichier d'analyse ***"); + new msgBox("Le fichier d'analyse n'est pas valide.",true,false,"Avertissement"); + } + } + }; + + + + /** * Gènère un nouveau fichier d'analyse à partir d'un fichier ODF */ @@ -614,9 +700,9 @@ public class evaluate extends JFrame { private static final long serialVersionUID = 1L; { - putValue(LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/fichierODF.png"))); - putValue( Action.NAME, "Génère un nouveau fichier d'analyse (CTRL+N)" ); - putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierODF.png")) ); + putValue(Action.LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/fichierODF.png"))); + putValue( Action.NAME, "Génère un nouveau fichier d'analyse" ); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierODFmini.png")) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_N ); putValue( Action.SHORT_DESCRIPTION, "Générer un nouveau fichier d'analyse (CTRL+N)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_N, InputEvent.CTRL_DOWN_MASK) ); @@ -684,10 +770,10 @@ public class evaluate extends JFrame { private static final long serialVersionUID = 1L; { - putValue( Action.NAME, "Informations du fichier d'analyse (CTRL+I)" ); - putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyseInfo2.png"))); + putValue( Action.NAME, "Informations du fichier d'analyse" ); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyseInfo2mini.png"))); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_K ); - putValue( Action.SHORT_DESCRIPTION, "Informations du fichier d'analyse (CTRL+I)" ); + putValue( Action.SHORT_DESCRIPTION, "Informations du fichier d'analyse (CTRL+K)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_K, InputEvent.CTRL_DOWN_MASK) ); } @@ -711,8 +797,9 @@ public class evaluate extends JFrame { private static final long serialVersionUID = 1L; { - putValue( Action.NAME, "Quitter (CTRL+Q)" ); - putValue( Action.SMALL_ICON, new ImageIcon( getClass().getResource("/exit.png") ) ); + putValue( Action.NAME, "Quitter" ); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/exitmini.png"))); + putValue( Action.LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/exit.png")) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_Q ); putValue( Action.SHORT_DESCRIPTION, "Quitter (CRTL+Q)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_Q, KeyEvent.CTRL_DOWN_MASK ) ); @@ -730,7 +817,41 @@ public class evaluate extends JFrame { } }; - + + private AbstractAction actSave = new AbstractAction() { + + private static final long serialVersionUID = 1L; + + { + putValue( Action.NAME, "Enregistrer la zone de texte" ); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/savemini.png"))); + putValue( Action.MNEMONIC_KEY, KeyEvent.VK_S ); + putValue( Action.SHORT_DESCRIPTION, "Enregistrer la zone de texte (CRTL+S)" ); + putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_DOWN_MASK ) ); + } + + @Override public void actionPerformed( ActionEvent e ) { + + + + } + }; + private AbstractAction actSaveas = new AbstractAction() { + + private static final long serialVersionUID = 1L; + + { + putValue( Action.NAME, "Enregistrer la zone de texte sous ..." ); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/saveasmini.png"))); + putValue( Action.SHORT_DESCRIPTION, "Enregistrer la zone de texte sous ..." ); + } + + @Override public void actionPerformed( ActionEvent e ) { + + + + } + }; /** * Affiche la fenêtre d'information sur analyseWriter @@ -740,8 +861,8 @@ public class evaluate extends JFrame { private static final long serialVersionUID = 1L; { - putValue( Action.NAME, "Informations (CTRL+I)" ); - putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/apropos.png")) ); + putValue( Action.NAME, "Informations" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/aproposmini.png")) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_I ); putValue( Action.SHORT_DESCRIPTION, "Informations (CTRL+I)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_I, InputEvent.CTRL_DOWN_MASK) ); @@ -761,8 +882,9 @@ public class evaluate extends JFrame { private static final long serialVersionUID = 1L; { - putValue( Action.NAME, "Affiche le code XML (CTRL+J)" ); - putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyseInfo.png")) ); + putValue( Action.NAME, "Affiche le code XML" ); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyseInfomini.png")) ); + putValue( Action.LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyseInfo.png")) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_J ); putValue( Action.SHORT_DESCRIPTION, "Affiche le code XML (CTRL+J)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_DOWN_MASK) ); @@ -787,8 +909,9 @@ public class evaluate extends JFrame { private static final long serialVersionUID = 1L; { - putValue( Action.NAME, "Modifier le fichier d'analyse (CTRL+M)" ); - putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyseModif.png")) ); + putValue( Action.NAME, "Modifier le fichier d'analyse" ); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyseModifmini.png")) ); + putValue(Action.LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyseModif.png"))); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_M ); putValue( Action.SHORT_DESCRIPTION, "Modifier le fichier d'analyse (CTRL+M)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_M, InputEvent.CTRL_DOWN_MASK) ); @@ -815,7 +938,7 @@ public class evaluate extends JFrame { { putValue( Action.NAME, "Documentation (CTRL+D)" ); - putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/documentation.png"))); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/documentationmini.png"))); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_D ); putValue( Action.SHORT_DESCRIPTION, "Documentation (CTRL+D)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK) ); @@ -842,8 +965,9 @@ public class evaluate extends JFrame { private static final long serialVersionUID = 1L; { - putValue( Action.NAME, "Charge la liste des étudiants (CTRL+L)" ); - putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierCSV.png")) ); + putValue( Action.NAME, "Charge la liste des étudiants" ); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierCSVmini.png")) ); + putValue( Action.LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/fichierCSV.png")) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_L ); putValue( Action.SHORT_DESCRIPTION, "Charge la liste des étudiants (CTRL+L)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_L, InputEvent.CTRL_DOWN_MASK) ); @@ -893,8 +1017,9 @@ public class evaluate extends JFrame { private static final long serialVersionUID = 1L; { - putValue( Action.NAME, "Affiche la liste des étudiants (ALT+L)" ); - putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierCSVInfo.png")) ); + putValue( Action.NAME, "Affiche la liste des étudiants" ); + putValue( Action.SMALL_ICON, new ImageIcon(evaluate.class.getResource("/resources/fichierCSVInfomini.png")) ); + putValue( Action.LARGE_ICON_KEY, new ImageIcon(evaluate.class.getResource("/resources/fichierCSVInfo.png")) ); putValue( Action.MNEMONIC_KEY, KeyEvent.VK_L ); putValue( Action.SHORT_DESCRIPTION, "Affiche la liste des étudiants (ALT+L)" ); putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_L, InputEvent.ALT_DOWN_MASK) ); diff --git a/src/app/mainApp.java b/src/app/mainApp.java index 76367e3..033fe5a 100644 --- a/src/app/mainApp.java +++ b/src/app/mainApp.java @@ -66,7 +66,7 @@ public class mainApp extends JFrame implements ActionListener{ frmEvalwriter = new JFrame(); frmEvalwriter.setResizable(false); frmEvalwriter.setTitle("analyseWriter"); - frmEvalwriter.setBounds(100, 100, 555, 380); + frmEvalwriter.setBounds(100, 100, 500, 380); frmEvalwriter.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); frmEvalwriter.getContentPane().setLayout(null); ImageIcon img = new ImageIcon(getClass().getResource("/evalwriter.png") ); @@ -75,19 +75,19 @@ public class mainApp extends JFrame implements ActionListener{ btnCreate = new JButton("Modifier un fichier d'analyse"); btnCreate.setHorizontalAlignment(SwingConstants.LEFT); btnCreate.setIcon(new ImageIcon(mainApp.class.getResource("/resources/fichierAnalyseModif.png"))); - btnCreate.setFont(new Font("Tahoma", Font.PLAIN, 14)); + btnCreate.setFont(new Font("Arial", Font.BOLD, 16)); btnCreate.addActionListener(this); - btnCreate.setBounds(34, 180, 470, 60); + btnCreate.setBounds(34, 180, 420, 60); frmEvalwriter.getContentPane().add(btnCreate); - actCharge = new JButton("Evaluer les fichiers des étudiants - Créer un fichier d'analyse"); + actCharge = new JButton("Evaluer les fichiers des étudiants"); actCharge.setHorizontalAlignment(SwingConstants.LEFT); actCharge.setIcon(new ImageIcon(mainApp.class.getResource("/resources/evaluate.png"))); actCharge.setBackground(SystemColor.inactiveCaption); actCharge.addActionListener(this); - actCharge.setFont(new Font("Tahoma", Font.PLAIN, 14)); - actCharge.setBounds(34, 110, 470, 60); + actCharge.setFont(new Font("Arial", Font.BOLD, 16)); + actCharge.setBounds(34, 110, 420, 60); frmEvalwriter.getContentPane().add(actCharge); JLabel lblNewLabel = new JLabel(); @@ -95,7 +95,7 @@ public class mainApp extends JFrame implements ActionListener{ lblNewLabel.setIcon(img2); lblNewLabel.setHorizontalAlignment(SwingConstants.CENTER); lblNewLabel.setFont(new Font("Pacifico", Font.PLAIN, 26)); - lblNewLabel.setBounds(34, 11, 470, 74); + lblNewLabel.setBounds(10, 25, 470, 74); frmEvalwriter.getContentPane().add(lblNewLabel); JButton btnNewButton = new JButton("Informations"); @@ -104,9 +104,9 @@ public class mainApp extends JFrame implements ActionListener{ new about(); } }); - btnNewButton.setFont(new Font("Tahoma", Font.PLAIN, 14)); + btnNewButton.setFont(new Font("Arial", Font.PLAIN, 14)); btnNewButton.setIcon(new ImageIcon(mainApp.class.getResource("/resources/apropos.png"))); - btnNewButton.setBounds(34, 270, 220, 60); + btnNewButton.setBounds(34, 270, 200, 60); frmEvalwriter.getContentPane().add(btnNewButton); JButton btnDocumentation = new JButton("Documentation"); @@ -122,8 +122,8 @@ public class mainApp extends JFrame implements ActionListener{ } }); btnDocumentation.setIcon(new ImageIcon(mainApp.class.getResource("/resources/documentation.png"))); - btnDocumentation.setFont(new Font("Tahoma", Font.PLAIN, 14)); - btnDocumentation.setBounds(284, 270, 220, 60); + btnDocumentation.setFont(new Font("Arial", Font.PLAIN, 14)); + btnDocumentation.setBounds(254, 270, 200, 60); frmEvalwriter.getContentPane().add(btnDocumentation); } diff --git a/src/app/msgBox.java b/src/app/msgBox.java index d37c528..175b885 100644 --- a/src/app/msgBox.java +++ b/src/app/msgBox.java @@ -5,17 +5,16 @@ import java.awt.FlowLayout; import javax.swing.JButton; import javax.swing.JDialog; +import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.border.EmptyBorder; import javax.swing.JLabel; import java.awt.event.ActionListener; -//import java.awt.event.ComponentEvent; -//import java.awt.event.ComponentListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.event.ActionEvent; -public class msgBox extends JDialog { +public class msgBox extends JFrame { /** * diff --git a/src/resources/apropos.png b/src/resources/apropos.png index fbba6ba..c16ba74 100644 Binary files a/src/resources/apropos.png and b/src/resources/apropos.png differ diff --git a/src/resources/aproposmini.png b/src/resources/aproposmini.png new file mode 100644 index 0000000..2cfc4b9 Binary files /dev/null and b/src/resources/aproposmini.png differ diff --git a/src/resources/collapseallmini.png b/src/resources/collapseallmini.png new file mode 100644 index 0000000..4a63c4c Binary files /dev/null and b/src/resources/collapseallmini.png differ diff --git a/src/resources/collapsenodemini.png b/src/resources/collapsenodemini.png new file mode 100644 index 0000000..46aad05 Binary files /dev/null and b/src/resources/collapsenodemini.png differ diff --git a/src/resources/documentation.pdf b/src/resources/documentation.pdf index 6ab34c2..f8133b4 100644 Binary files a/src/resources/documentation.pdf and b/src/resources/documentation.pdf differ diff --git a/src/resources/documentationmini.png b/src/resources/documentationmini.png new file mode 100644 index 0000000..234b511 Binary files /dev/null and b/src/resources/documentationmini.png differ diff --git a/src/resources/evaluate.png b/src/resources/evaluate.png index 47a4da8..28b48eb 100644 Binary files a/src/resources/evaluate.png and b/src/resources/evaluate.png differ diff --git a/src/resources/evaluatemini.png b/src/resources/evaluatemini.png new file mode 100644 index 0000000..2bbf8f5 Binary files /dev/null and b/src/resources/evaluatemini.png differ diff --git a/src/resources/evaluerfalsemini.png b/src/resources/evaluerfalsemini.png new file mode 100644 index 0000000..37cf791 Binary files /dev/null and b/src/resources/evaluerfalsemini.png differ diff --git a/src/resources/evaluertruemini.png b/src/resources/evaluertruemini.png new file mode 100644 index 0000000..9f6ec6e Binary files /dev/null and b/src/resources/evaluertruemini.png differ diff --git a/src/resources/exit.png b/src/resources/exit.png index 9eb7a87..4859421 100644 Binary files a/src/resources/exit.png and b/src/resources/exit.png differ diff --git a/src/resources/exitmini.png b/src/resources/exitmini.png new file mode 100644 index 0000000..4c52c01 Binary files /dev/null and b/src/resources/exitmini.png differ diff --git a/src/resources/expandall.png b/src/resources/expandall.png new file mode 100644 index 0000000..d33e110 Binary files /dev/null and b/src/resources/expandall.png differ diff --git a/src/resources/expandallmini.png b/src/resources/expandallmini.png new file mode 100644 index 0000000..1cad595 Binary files /dev/null and b/src/resources/expandallmini.png differ diff --git a/src/resources/expandnodemini.png b/src/resources/expandnodemini.png new file mode 100644 index 0000000..419ed8c Binary files /dev/null and b/src/resources/expandnodemini.png differ diff --git a/src/resources/fichierAnalyse.png b/src/resources/fichierAnalyse.png index 6af63ab..d637a68 100644 Binary files a/src/resources/fichierAnalyse.png and b/src/resources/fichierAnalyse.png differ diff --git a/src/resources/fichierAnalyseInfo.png b/src/resources/fichierAnalyseInfo.png index e65ccfb..0b167f1 100644 Binary files a/src/resources/fichierAnalyseInfo.png and b/src/resources/fichierAnalyseInfo.png differ diff --git a/src/resources/fichierAnalyseInfo2.png b/src/resources/fichierAnalyseInfo2.png index 5931716..ae1fc60 100644 Binary files a/src/resources/fichierAnalyseInfo2.png and b/src/resources/fichierAnalyseInfo2.png differ diff --git a/src/resources/fichierAnalyseInfo2mini.png b/src/resources/fichierAnalyseInfo2mini.png new file mode 100644 index 0000000..c2ecfc5 Binary files /dev/null and b/src/resources/fichierAnalyseInfo2mini.png differ diff --git a/src/resources/fichierAnalyseInfomini.png b/src/resources/fichierAnalyseInfomini.png new file mode 100644 index 0000000..aae3c55 Binary files /dev/null and b/src/resources/fichierAnalyseInfomini.png differ diff --git a/src/resources/fichierAnalyseModifmini.png b/src/resources/fichierAnalyseModifmini.png new file mode 100644 index 0000000..5cbdd94 Binary files /dev/null and b/src/resources/fichierAnalyseModifmini.png differ diff --git a/src/resources/fichierAnalysemini.png b/src/resources/fichierAnalysemini.png new file mode 100644 index 0000000..86f62c3 Binary files /dev/null and b/src/resources/fichierAnalysemini.png differ diff --git a/src/resources/fichierCSV.png b/src/resources/fichierCSV.png index de88a0a..5b8413b 100644 Binary files a/src/resources/fichierCSV.png and b/src/resources/fichierCSV.png differ diff --git a/src/resources/fichierCSVInfo.png b/src/resources/fichierCSVInfo.png index c5de141..6a2ac6f 100644 Binary files a/src/resources/fichierCSVInfo.png and b/src/resources/fichierCSVInfo.png differ diff --git a/src/resources/fichierCSVInfoXML.png b/src/resources/fichierCSVInfoXML.png index 566c86d..e0c1870 100644 Binary files a/src/resources/fichierCSVInfoXML.png and b/src/resources/fichierCSVInfoXML.png differ diff --git a/src/resources/fichierCSVInfoXMLmini.png b/src/resources/fichierCSVInfoXMLmini.png new file mode 100644 index 0000000..022af23 Binary files /dev/null and b/src/resources/fichierCSVInfoXMLmini.png differ diff --git a/src/resources/fichierCSVInfomini.png b/src/resources/fichierCSVInfomini.png new file mode 100644 index 0000000..80642fe Binary files /dev/null and b/src/resources/fichierCSVInfomini.png differ diff --git a/src/resources/fichierCSVmini.png b/src/resources/fichierCSVmini.png new file mode 100644 index 0000000..3407e22 Binary files /dev/null and b/src/resources/fichierCSVmini.png differ diff --git a/src/resources/fichierODF.png b/src/resources/fichierODF.png index d6b8dc5..0c7e2c3 100644 Binary files a/src/resources/fichierODF.png and b/src/resources/fichierODF.png differ diff --git a/src/resources/fichierODFmini.png b/src/resources/fichierODFmini.png new file mode 100644 index 0000000..4c33188 Binary files /dev/null and b/src/resources/fichierODFmini.png differ diff --git a/src/resources/fichierSVG.png b/src/resources/fichierSVG.png index 4ef12e6..5f6a211 100644 Binary files a/src/resources/fichierSVG.png and b/src/resources/fichierSVG.png differ diff --git a/src/resources/fichierSVGmini.png b/src/resources/fichierSVGmini.png new file mode 100644 index 0000000..d665f24 Binary files /dev/null and b/src/resources/fichierSVGmini.png differ diff --git a/src/resources/nodeFichier.png b/src/resources/nodeFichier.png new file mode 100644 index 0000000..d6349c6 Binary files /dev/null and b/src/resources/nodeFichier.png differ diff --git a/src/resources/nodeFichiermini.png b/src/resources/nodeFichiermini.png new file mode 100644 index 0000000..8fc7e8d Binary files /dev/null and b/src/resources/nodeFichiermini.png differ diff --git a/src/resources/open.png b/src/resources/open.png index 7715f9e..1adbbf5 100644 Binary files a/src/resources/open.png and b/src/resources/open.png differ diff --git a/src/resources/openmini.png b/src/resources/openmini.png new file mode 100644 index 0000000..1a3f148 Binary files /dev/null and b/src/resources/openmini.png differ diff --git a/src/resources/saveasmini.png b/src/resources/saveasmini.png new file mode 100644 index 0000000..060892b Binary files /dev/null and b/src/resources/saveasmini.png differ diff --git a/src/resources/savemini.png b/src/resources/savemini.png new file mode 100644 index 0000000..d844f61 Binary files /dev/null and b/src/resources/savemini.png differ diff --git a/src/resources/supprimemini.png b/src/resources/supprimemini.png new file mode 100644 index 0000000..fff48b1 Binary files /dev/null and b/src/resources/supprimemini.png differ diff --git a/src/resources/treeOpen.png b/src/resources/treeOpen.png index 26a67af..64fdfe1 100644 Binary files a/src/resources/treeOpen.png and b/src/resources/treeOpen.png differ diff --git a/src/resources/verifhistorique.png b/src/resources/verifhistorique.png new file mode 100644 index 0000000..7ad3dcd Binary files /dev/null and b/src/resources/verifhistorique.png differ diff --git a/src/resources/verifhistoriquemini.png b/src/resources/verifhistoriquemini.png new file mode 100644 index 0000000..7131d5f Binary files /dev/null and b/src/resources/verifhistoriquemini.png differ