MAJ v4.0.2

This commit is contained in:
pablo rodriguez 2022-06-04 15:43:08 +02:00
parent f9bdf8191f
commit c8a390a0e7
57 changed files with 580 additions and 522 deletions

11
bin/.gitignore vendored
View File

@ -1 +1,12 @@
/app/
/attributmini.png
/saut.svg
/sautmini.png
/titre.svg
/titremini.png
/voir.svg
/voirmini.png
/what.svg
/whatmini.png
/MEPTL/
/resources/

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.

BIN
icons/savepreference.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

167
icons/savepreference.svg Normal file
View File

@ -0,0 +1,167 @@
<?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\savepreferencemini.png"
sodipodi:docname="savepreference.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">
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter5476"
x="-0.023548288"
y="-0.023436684"
width="1.0470966"
height="1.0468734">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.19913317"
id="feGaussianBlur5478" />
</filter>
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter11078"
x="-0.09419507"
y="-0.096008412"
width="1.1883901"
height="1.1920168">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="15.826359"
id="feGaussianBlur11080" />
</filter>
</defs>
<sodipodi:namedview
inkscape:snap-global="false"
inkscape:window-maximized="1"
inkscape:window-y="-8"
inkscape:window-x="-8"
inkscape:window-height="1009"
inkscape:window-width="1920"
inkscape:object-nodes="true"
inkscape:bbox-nodes="true"
inkscape:bbox-paths="true"
inkscape:snap-bbox="true"
inkscape:snap-page="true"
units="px"
showgrid="false"
inkscape:document-rotation="0"
inkscape:current-layer="g10920"
inkscape:document-units="mm"
inkscape:cy="21.493944"
inkscape:cx="41.290997"
inkscape:zoom="7.0717595"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
inkscape:pagecheckerboard="0"
inkscape:object-paths="true"
inkscape:snap-intersection-paths="true" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 2"
id="layer2"
inkscape:groupmode="layer">
<g
transform="matrix(0.12313291,0,0,0.12313291,3.8933229,-12.453772)"
id="g862"
style="fill:#0000ff">
<g
id="g1030">
<g
id="g10920"
transform="matrix(0.10651002,0,0,0.10651002,-29.355999,157.21836)">
<path
style="fill:#f4d2b1;fill-opacity:1;stroke:#c87137;stroke-width:13.3772;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 36.909642,-22.413441 C 190.07266,-52.525003 335.65949,-95.935075 451.1501,81.174398 c 24.80916,38.045852 79.36083,49.853622 116.66975,65.029052 44.90876,22.49021 10.10403,86.37763 -38.25239,70.7669 l -151.0969,-44.93657 151.0969,44.93657 c 42.93345,19.15156 167.0354,-42.07762 250.5531,-63.11644 79.12711,-20.38415 99.17841,64.1715 30.60191,89.89311 L 531.48009,345.11581 C 417.38988,388.82785 355.39968,355.76094 288.57746,329.81487 L 145.13103,239.92178 90.015216,232.7597 C 69.892927,233.00068 57.102091,218.64778 44.381639,197.76796 28.17348,128.09962 23.69967,102.74358 15.998676,21.609366 13.960158,6.047162 10.456136,-17.219084 36.909642,-22.413441 Z"
id="path1043"
sodipodi:nodetypes="csccccccccccccc" />
<path
id="path11058"
style="opacity:0.447188;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:18.5286;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;filter:url(#filter11078);stop-color:#000000"
d="m 579.00721,-469.63855 c -9.9246,0 -17.91308,7.98851 -17.91308,17.91311 v 47.42007 c 0,3.50366 1.01252,6.75475 2.73764,9.50974 a 186.17991,176.94203 0 0 0 -40.74577,14.40356 c -0.72787,-1.01526 -1.53866,-1.99148 -2.47007,-2.89204 l -38.18304,-36.91716 c -8.30792,-8.03286 -21.4638,-7.80875 -29.49669,0.49919 l -38.37859,39.69595 c -8.03285,8.30793 -7.81391,21.46381 0.49401,29.4967 l 34.29786,33.16058 a 186.17991,176.94203 0 0 0 -22.26661,49.51449 h -46.92605 c -11.55631,0 -20.8566,9.30543 -20.8566,20.86174 v 55.2162 c 0,11.55633 9.30029,20.86176 20.8566,20.86176 h 49.27776 a 186.17991,176.94203 0 0 0 19.15844,40.79722 l -34.59633,33.44877 c -8.30792,8.03286 -8.52687,21.1836 -0.49402,29.49153 l 38.37861,39.695973 c 8.03287,8.307927 21.18876,8.532021 29.49668,0.499161 l 38.18306,-36.917154 c 0.81526,-0.78827 1.52766,-1.63888 2.18703,-2.51638 a 186.17991,176.94203 0 0 0 40.64284,14.666001 c -1.48881,2.614626 -2.3517,5.635813 -2.3517,8.871643 V 4.5673234 c -2e-5,9.9246006 7.9885,17.9131046 17.9131,17.9131046 h 60.06885 c 9.9246,0 17.91311,-7.988504 17.91311,-17.9131046 V -42.857896 c 0,-3.561659 -1.04184,-6.865234 -2.81997,-9.648684 a 186.17991,176.94203 0 0 0 43.6738,-16.79643 c 0.79782,1.17452 1.7262,2.28629 2.7891,3.314 l 38.17793,36.917157 c 8.30792,8.032861 21.46383,7.813913 29.49668,-0.494013 l 38.38376,-39.695974 c 8.03285,-8.30793 7.80878,-21.46382 -0.49916,-29.49668 l -37.92062,-36.67014 a 186.17991,176.94203 0 0 0 17.22355,-38.7903 c 0.81538,0.0959 1.63832,0.15954 2.48035,0.15954 h 53.11151 c 11.55631,0 20.86173,-9.30029 20.86176,-20.8566 v -55.22136 c -3e-5,-11.55631 -9.30545,-20.85661 -20.86176,-20.85661 h -53.11151 c -0.45423,0 -0.89627,0.0387 -1.3431,0.067 a 186.17991,176.94203 0 0 0 -18.71588,-41.66174 c 0.38809,-0.32484 0.77779,-0.64595 1.14755,-1.00344 l 38.18308,-36.91715 c 8.30792,-8.0329 8.52686,-21.18878 0.49401,-29.4967 l -38.37863,-39.696 c -8.03285,-8.30792 -21.18873,-8.53204 -29.49666,-0.49919 l -38.18307,36.91717 c -1.69003,1.63409 -3.02536,3.49091 -4.04475,5.46502 a 186.17991,176.94203 0 0 0 -42.80412,-16.24069 c 2.02071,-2.90085 3.21108,-6.42706 3.21108,-10.24563 v -47.42006 c 0,-9.92461 -7.98851,-17.91312 -17.9131,-17.91312 z m 27.39713,165.84933 a 84.952219,80.737058 0 0 1 84.95474,80.73506 84.952219,80.737058 0 0 1 -84.95474,80.73505 84.952219,80.737058 0 0 1 -84.94961,-80.73505 84.952219,80.737058 0 0 1 84.94961,-80.73506 z" />
<path
id="ellipse7810"
style="opacity:1;fill:#ac9d93;fill-opacity:1;stroke:#000000;stroke-width:18.5286;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
d="m 552.92264,-466.37633 c -9.9246,0 -17.91308,7.98851 -17.91308,17.91311 v 47.42007 c 0,3.50366 1.01252,6.75475 2.73764,9.50974 a 186.17991,176.94203 0 0 0 -40.74577,14.40356 c -0.72787,-1.01526 -1.53866,-1.99148 -2.47007,-2.89204 l -38.18304,-36.91716 c -8.30792,-8.03286 -21.4638,-7.80875 -29.49669,0.49919 l -38.37859,39.69595 c -8.03285,8.30793 -7.81391,21.46381 0.49401,29.4967 l 34.29786,33.16058 a 186.17991,176.94203 0 0 0 -22.26661,49.51449 h -46.92605 c -11.55631,0 -20.8566,9.30543 -20.8566,20.86174 v 55.2162 c 0,11.55633 9.30029,20.86176 20.8566,20.86176 h 49.27776 a 186.17991,176.94203 0 0 0 19.15844,40.79722 l -34.59633,33.448771 c -8.30792,8.032864 -8.52687,21.183605 -0.49402,29.491529 l 38.37861,39.695977 c 8.03287,8.307927 21.18876,8.532021 29.49668,0.499161 l 38.18306,-36.917158 c 0.81526,-0.788267 1.52766,-1.638878 2.18703,-2.516376 a 186.17991,176.94203 0 0 0 40.64284,14.666001 c -1.48881,2.614626 -2.3517,5.635813 -2.3517,8.871643 V 7.8295477 c -2e-5,9.9246003 7.9885,17.9131043 17.9131,17.9131043 h 60.06885 c 9.9246,0 17.91311,-7.988504 17.91311,-17.9131043 V -39.595672 c 0,-3.561659 -1.04184,-6.865234 -2.81997,-9.648684 a 186.17991,176.94203 0 0 0 43.6738,-16.796432 c 0.79782,1.17452 1.7262,2.286291 2.7891,3.314003 l 38.17793,36.917156 c 8.30792,8.032861 21.46383,7.813913 29.49668,-0.494013 l 38.38376,-39.695978 c 8.03285,-8.307927 7.80878,-21.463813 -0.49916,-29.496674 L 741.1312,-132.16644 a 186.17991,176.94203 0 0 0 17.22355,-38.7903 c 0.81538,0.0959 1.63832,0.15954 2.48035,0.15954 h 53.11151 c 11.55631,0 20.86173,-9.30029 20.86176,-20.8566 v -55.22136 c -3e-5,-11.55631 -9.30545,-20.85661 -20.86176,-20.85661 H 760.8351 c -0.45423,0 -0.89627,0.0387 -1.3431,0.067 a 186.17991,176.94203 0 0 0 -18.71588,-41.66174 c 0.38809,-0.32484 0.77779,-0.64595 1.14755,-1.00344 l 38.18308,-36.91715 c 8.30792,-8.0329 8.52686,-21.18878 0.49401,-29.4967 l -38.37863,-39.696 c -8.03285,-8.30792 -21.18873,-8.53204 -29.49666,-0.49919 l -38.18307,36.91717 c -1.69003,1.63409 -3.02536,3.49091 -4.04475,5.46502 a 186.17991,176.94203 0 0 0 -42.80412,-16.24069 c 2.02071,-2.90085 3.21108,-6.42706 3.21108,-10.24563 v -47.42006 c 0,-9.92461 -7.98851,-17.91312 -17.9131,-17.91312 z m 27.39713,165.84933 a 84.952219,80.737058 0 0 1 84.95474,80.73506 84.952219,80.737058 0 0 1 -84.95474,80.73505 84.952219,80.737058 0 0 1 -84.94961,-80.73505 84.952219,80.737058 0 0 1 84.94961,-80.73506 z" />
</g>
<g
id="g996"
transform="matrix(0.88208206,0,0,0.88208206,-9.3037506,-0.2171412)">
<g
id="g5732"
transform="matrix(2.1487621,0,0,2.1487621,-24.088632,120.32937)">
<path
style="opacity:0.73251;mix-blend-mode:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter5476)"
d="M 2.3250513,18.968908 V 3.0548142 L 3.6458567,1.2507872 H 21.009615 l 1.610738,1.804027 V 20.193069 l -1.610738,1.449665 H 5.1599507 Z"
id="path5438"
sodipodi:nodetypes="ccccccccc" />
<path
style="fill:#098aff;fill-opacity:1;stroke:#0000ff;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 1.9006711,19.457718 V 3.543624 L 3.2214765,1.739597 H 20.585235 l 1.610738,1.804027 v 17.138255 l -1.610738,1.449665 H 4.7355705 Z"
id="path1085"
sodipodi:nodetypes="ccccccccc" />
<path
style="fill:#ffffff;stroke:#0000ff;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 4.7355705,4.316779 H 18.910067 v 8.536912 H 4.7355705 Z"
id="path1415" />
<path
style="fill:#cccccc;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 5.7342282,22.131544 V 14.883221 H 17.84698 v 7.248323 H 11.01745 V 16.010738 H 7.8281879 v 6.120806 z"
id="path1417" />
</g>
<g
id="g4710"
transform="matrix(2.1487621,0,0,2.1487621,-24.923595,120.68128)">
<circle
style="opacity:1;fill:#098aff;fill-opacity:1;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="path910"
cx="7.5065589"
cy="10.778644"
r="1" />
<circle
style="opacity:1;fill:#098aff;fill-opacity:1;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="circle4623"
cx="10.458958"
cy="10.778644"
r="1" />
<circle
style="opacity:1;fill:#098aff;fill-opacity:1;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="circle4625"
cx="13.411355"
cy="10.778644"
r="1" />
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -3277,7 +3277,7 @@ public class meptl {
/**
* Analyse le nom du node
* Evalue le nom du node
*
* @param retour : le node retour qui contient l'item ajouté
* @param nodStudent : le node Student qui peut être null
@ -3299,7 +3299,7 @@ public class meptl {
}
/**
*
* Evalue le champ auteur (éditeur).
* @param retour
* @param nodStudent
* @param nameCreator
@ -3321,7 +3321,7 @@ public class meptl {
/**
*
* Evalue le nom de l'auteur (créteur ou premier auteur)
* @param retour
* @param nodStudent
* @param nameCreator

72
src/app/ProgressBar.java Normal file
View File

@ -0,0 +1,72 @@
package app;
import java.awt.BorderLayout;
import java.awt.Container;
import javax.swing.JFrame;
import javax.swing.JProgressBar;
import javax.swing.SwingUtilities;
public class ProgressBar extends JFrame implements Runnable{
@Override
public void run() {
ProgressBar myProgressBar = new ProgressBar();
int i = 0;
while (i <= 100) {
System.out.println("" + i + "%");
myProgressBar.setValue(i);
try {
Thread.sleep(50);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
break;
}
i = i + 5;
}
}
private JProgressBar bar;
public ProgressBar() {
super("loading");
setSize(200, 100);
Container content = getContentPane();
content.setLayout(new BorderLayout());
bar = new JProgressBar();
bar.setMinimum(0);
bar.setMaximum(100);
bar.setStringPainted(true);
bar.setBorder(null);
content.add(bar, BorderLayout.SOUTH);
setVisible(true);
}
void updateProgress(final int newValue) {
bar.setValue(newValue);
}
public void setValue(final int j) {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
updateProgress(j);
}
});
}
public static void main(final String Args[]) {
ProgressBar myProgressBar = new ProgressBar();
int i = 0;
while (i <= 100) {
System.out.println("" + i + "%");
myProgressBar.setValue(i);
try {
Thread.sleep(50);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
break;
}
i = i + 5;
}
}
}

View File

@ -14,6 +14,8 @@ import java.util.Enumeration;
import net.miginfocom.swing.MigLayout;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import java.awt.Font;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
@ -35,6 +37,7 @@ public class attributs extends JFrame {
/**
* Create the frame.
*/
@SuppressWarnings("unlikely-arg-type")
public attributs(node nod) {
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
setBounds(100, 100, 727, 669);
@ -96,35 +99,39 @@ public class attributs extends JFrame {
Enumeration<String> key = nod.getAttributs().keys();
while(key.hasMoreElements()) {
String k = key.nextElement();
String value = nod.getAttributs().get(k);
String point = "0";
JCheckBox checkEval = new JCheckBox();
boolean evaluer = false;
if(value.contains("")||value.contains("")) {
evaluer=true;
if(value.contains("")) {
point = value.substring(value.lastIndexOf("")+1,value.length());
value = value.substring(0,value.lastIndexOf(""));
}
if(value.contains("")) {
point = value.substring(value.lastIndexOf("")+1,value.length());
value = value.substring(0,value.lastIndexOf(""));
if(!listeAttributsAnalyseWriter.isAttributAnalyseWriter(k)) {
String value = nod.getAttributs().get(k);
String point = "0";
JCheckBox checkEval = new JCheckBox();
boolean evaluer = false;
if(value.contains("")||value.contains("")) {
evaluer=true;
if(value.contains("")) {
point = value.substring(value.lastIndexOf("")+1,value.length());
value = value.substring(0,value.lastIndexOf(""));
}
if(value.contains("")) {
point = value.substring(value.lastIndexOf("")+1,value.length());
value = value.substring(0,value.lastIndexOf(""));
}
}
JTextField txtFielPoints = new JTextField(point);
txtFielPoints.setColumns(2);
checkEval.setSelected(evaluer);
Leslabels.add(new JLabel(k));
Lesvaleurs.add(new JTextField(value));
Lespoints.add(txtFielPoints);
Lesevaluer.add(checkEval);
}
JTextField txtFielPoints = new JTextField(point);
txtFielPoints.setColumns(2);
checkEval.setSelected(evaluer);
Leslabels.add(new JLabel(k));
Lesvaleurs.add(new JTextField(value));
Lespoints.add(txtFielPoints);
Lesevaluer.add(checkEval);
}
//Placement dans le panel des informations
for(int i = 0 ; i<Leslabels.size();i++) {
Leslabels.get(i).setFont(new Font("Tahoma", Font.BOLD, 11));
Lesvaleurs.get(i).setColumns(10);
@ -134,6 +141,20 @@ public class attributs extends JFrame {
panelCentre.add(Lespoints.get(i), "cell 3 " + i+1 +",alignx left,growy");
}
//Enabled information
for(int i = 0 ; i<Leslabels.size();i++) {
if(Leslabels.get(i).getText().equals("style:name")) {Lesvaleurs.get(i).setEditable(false);}
if(Leslabels.get(i).getText().equals("style:display-name")) {Lesvaleurs.get(i).setEditable(false);}
if(Leslabels.get(i).getText().equals("style:next-style-name")) {Lesvaleurs.get(i).setEditable(false);}
if(Leslabels.get(i).getText().equals("style:parent-style-name")) {Lesvaleurs.get(i).setEditable(false);}
if(Leslabels.get(i).getText().equals("style:family")) {Lesvaleurs.get(i).setEditable(false);}
if(Leslabels.get(i).getText().equals("style:master-page-name")) {Lesvaleurs.get(i).setEditable(false);}
if(Leslabels.get(i).getText().equals("numeroabsolue")) {Lesvaleurs.get(i).setEditable(false);}
if(Leslabels.get(i).getText().equals("numero")) {Lesvaleurs.get(i).setEditable(false);}
if(Leslabels.get(i).getText().equals("style:page_number")) {Lesvaleurs.get(i).setEditable(false);}
}
btnNewButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@ -142,7 +163,7 @@ public class attributs extends JFrame {
String value = Lesvaleurs.get(i).getText();
if(value.contains("")) value = value.substring(0,value.lastIndexOf(""));
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";
@ -151,7 +172,7 @@ public class attributs extends JFrame {
pointNumeric = Integer.valueOf(Lespoints.get(i).getText());
point = String.valueOf(pointNumeric);
} catch (Exception e2) {
JOptionPane.showMessageDialog(null, "La valeur pour l'attributs " + Leslabels.get(i) + " n'est pas un entier");
}
value = value + point;
@ -168,4 +189,11 @@ public class attributs extends JFrame {
this.setVisible(true);
}
}

25
src/app/baliseStyle.java Normal file
View File

@ -0,0 +1,25 @@
package app;
public class baliseStyle {
public baliseStyle() {
}
public static String balise() {
return "<style type=\"text/css\">"
+ "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;}"
+ "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;}"
+ "spanpablo { float: right; width: 8em; font-size: 250%; font-family: algerian, courier; line-height: 80%; margin-right: 1%; color: red; text-align: center}"
+ "p.p1{color:blue;font-family:\"Arial\";font-size: 14pt;margin-bottom: 0cm; margin-top: 0cm; line-height: 0%; background: transparent; margin-left: 0cm; white-space: pre;}"
+ "li.p2{color:green;font-family:\"Arial\";font-size: 14pt;margin-bottom: 0cm; margin-top: 0cm; line-height: 0%; background: transparent; margin-left: 0cm; white-space: pre;}"
+ "li.p3{color:red;font-family:\"Arial\";font-size: 14pt;margin-bottom: 0cm; margin-top: 0cm; line-height: 0%; background: transparent; margin-left: 0cm; white-space: pre;}"
+ "p.p4{margin-left: 0px; margin-bottom: 0cm; margin-top: 4px; line-height: 115%}"
+ "</style>";
}
}

View File

@ -5,41 +5,36 @@ import java.awt.Color;
import java.awt.Desktop;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.SystemColor;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JEditorPane;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.JLabel;
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;
import javax.swing.JTabbedPane;
import javax.swing.JTextField;
import javax.swing.JToolBar;
import javax.swing.JTree;
import javax.swing.KeyStroke;
import javax.swing.SwingConstants;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.filechooser.FileNameExtensionFilter;
import javax.swing.tree.DefaultMutableTreeNode;
@ -59,7 +54,6 @@ import cXML.Run;
import cXML.node;
import java.awt.event.InputEvent;
import javax.swing.tree.DefaultTreeModel;
@ -71,51 +65,7 @@ public class create extends JFrame {
private JEditorPane textNodeSelect = new JEditorPane();
private JToolBar toolBar = new JToolBar();
private JMenuBar menuBar = new JMenuBar();
private JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
// les éléments de l'évaluation
private JTextField textFieldTitreAvantLeSaut = new JTextField();
private JComboBox<String> comboBoxAttribut = new JComboBox<String>();
private JEditorPane editorPaneInformationNode = new JEditorPane();
private JEditorPane editorPaneInfosAttribut = new JEditorPane();
private JEditorPane editorPaneInfosNode = new JEditorPane();
private JCheckBox chckbxEvaluerNode = new JCheckBox("Evaluer un ou des éléments de ce node.");
private JCheckBox chckbxSautApresTitre = new JCheckBox("Insérer un titre puis un saut avant l'évaluation de ce node.");
private JCheckBox chckbxEvaluerPresenceDeCeNode = new JCheckBox("Evaluer la présence de ce node.");
private JTextField textField_NombrePointEvalThisNode = new JTextField();
private JCheckBox chckbxEvaluerAttribut = new JCheckBox("Evaluer l'attribut");
private JTextField textField_NombrePointAttribut = new JTextField();
private JEditorPane editorPaneAttribut = new JEditorPane();
private JEditorPane editorPaneContenuNode = new JEditorPane();
private JCheckBox chckbxEvaluerContenuDuNode = new JCheckBox("Evaluer le contenu du node ci-dessous");
private JTextField textFieldNombrePointContenuNode = new JTextField();
private JButton btnEtendu = new JButton("→ Tolérance");
private JButton btnOuExact = new JButton("¦ OU");
private JButton btnContient = new JButton("{ Contient }");
private JButton btnColor = new JButton("# Couleur");
private JButton btnBordure = new JButton("Bordure");
private String messg = "Valeur de l'attribut - fonctions - évaluateur et point";
private JLabel lblType = new JLabel(messg);
private JEditorPane editorPaneContenuEnfant = new JEditorPane();
private JTextField textField_DistanceSimilitude = new JTextField();
private JTextField textFieldNbrPointContenuEnfant = new JTextField();
private JCheckBox chckbxEvaluerSimilitude = new JCheckBox("Evaluer le contenu complet avec les nodes enfants (Similitude)");
private JCheckBox chckbxIgnoreValeurNumerique = new JCheckBox("Ignorer les valeurs numériques");
private JCheckBox chckbxIgnoreLaCasse = new JCheckBox("Ignore la casse");
private JCheckBox chckbxIgnoreLesCaracteresSpeciaux = new JCheckBox("Ignore les caractères spéciaux");
private final JPanel panelStyleStructure = new JPanel();
private String messg2 = "Le style du paragraphe est : ";
private JLabel lblLeStyleDeParagrapheDuParagraphe = new JLabel(messg2);
private final JLabel lblAttribut_analyseStyle = new JLabel("Sélectionner l'attribut");
private final JComboBox<String> comboBoxAttribut_analyseStyle = new JComboBox<String>();
private JCheckBox chckbx_EvaluateStyleDeParagraphe = new JCheckBox("Evaluer le style de paragraphe");
private JTextField textField_evaluateStyleParagrapheAttributNbrPoint = new JTextField();
private JEditorPane editorPane_evaluateStyleParagrapheAttribut = new JEditorPane();
private JLabel lbl_NombrePointAttributEvaluationStyleParagraphe = new JLabel("Nombre point");
private JScrollPane scrollPane_evaluationAttributStyleParagraphe = new JScrollPane();
/**
* Create the application.
@ -142,10 +92,10 @@ public class create extends JFrame {
/*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") );
// 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();
@ -164,24 +114,6 @@ public class create extends JFrame {
// Construction et injection de la barre de menu
setJMenuBar( this.createMenuBar() );
tree.setModel(new DefaultTreeModel(
new DefaultMutableTreeNode("Charger un fichier d'analyse") {
{
DefaultMutableTreeNode node_1;
add(new DefaultMutableTreeNode("node fichier"));
node_1 = new DefaultMutableTreeNode("node style");
node_1.add(new DefaultMutableTreeNode("paragraphe"));
node_1.add(new DefaultMutableTreeNode("caractère"));
add(node_1);
node_1 = new DefaultMutableTreeNode("strcturepage");
node_1.add(new DefaultMutableTreeNode("page"));
node_1.add(new DefaultMutableTreeNode("page"));
node_1.add(new DefaultMutableTreeNode("page"));
node_1.add(new DefaultMutableTreeNode("page"));
add(node_1);
}
}
));
tree.setVisibleRowCount(30);
// Ajoute le menu contextuel de la tree
@ -193,6 +125,10 @@ public class create extends JFrame {
this.createPopupMenuTree(null);
getContentPane().setLayout(new BorderLayout(2, 2));
contentPane.add( toolBar, BorderLayout.NORTH );
toolBar.addSeparator();
JButton button_2 = toolBar.add( actExit );
button_2.setHideActionText( true );
// The content of the window
if(commandes.fichierAnalyseValide) tree = commandes.tree;
@ -204,260 +140,12 @@ public class create extends JFrame {
getContentPane().add(panel, BorderLayout.CENTER);
panel.setLayout(null);
tabbedPane.setBounds(816, 10, 600, 785);
panel.add(tabbedPane);
JPanel panelProperties = new JPanel();
panelProperties.setLayout(null);
tabbedPane.addTab("Propriétés", img3, panelProperties, null);
chckbxEvaluerNode.setFont(new Font("Tahoma", Font.BOLD, 12));
chckbxEvaluerNode.setBounds(6, 144, 285, 23);
panelProperties.add(chckbxEvaluerNode);
chckbxSautApresTitre.setFont(new Font("Tahoma", Font.BOLD, 12));
chckbxSautApresTitre.setBounds(6, 342, 461, 23);
panelProperties.add(chckbxSautApresTitre);
textFieldTitreAvantLeSaut.setFont(new Font("Tahoma", Font.PLAIN, 12));
textFieldTitreAvantLeSaut.setColumns(10);
textFieldTitreAvantLeSaut.setBounds(10, 395, 536, 33);
panelProperties.add(textFieldTitreAvantLeSaut);
JLabel lblNewLabel_1 = new JLabel("Texte à insérer avant l'évaluation de ce node. (Si un saut est inséré)");
lblNewLabel_1.setFont(new Font("Tahoma", Font.BOLD, 12));
lblNewLabel_1.setBounds(6, 372, 511, 23);
panelProperties.add(lblNewLabel_1);
chckbxEvaluerPresenceDeCeNode.setFont(new Font("Tahoma", Font.BOLD, 12));
chckbxEvaluerPresenceDeCeNode.setBounds(6, 458, 226, 23);
panelProperties.add(chckbxEvaluerPresenceDeCeNode);
JScrollPane scrollPane_1 = new JScrollPane();
scrollPane_1.setBounds(10, 11, 536, 125);
panelProperties.add(scrollPane_1);
editorPaneInfosNode.setEditable(false);
scrollPane_1.setViewportView(editorPaneInfosNode);
editorPaneInfosNode.setText((String) null);
JScrollPane scrollPane_2 = new JScrollPane();
scrollPane_2.setBounds(10, 235, 536, 100);
panelProperties.add(scrollPane_2);
scrollPane_2.setViewportView(editorPaneInformationNode);
editorPaneInformationNode.setText((String) null);
editorPaneInformationNode.setEditable(false);
textField_NombrePointEvalThisNode.setText("1");
textField_NombrePointEvalThisNode.setHorizontalAlignment(SwingConstants.CENTER);
textField_NombrePointEvalThisNode.setFont(new Font("Tahoma", Font.BOLD, 12));
textField_NombrePointEvalThisNode.setColumns(10);
textField_NombrePointEvalThisNode.setBounds(360, 459, 45, 20);
panelProperties.add(textField_NombrePointEvalThisNode);
JLabel lblNbrePointsPourEvaluerCeNode = new JLabel("Nbre point");
lblNbrePointsPourEvaluerCeNode.setFont(new Font("Tahoma", Font.BOLD, 12));
lblNbrePointsPourEvaluerCeNode.setBounds(271, 462, 79, 14);
panelProperties.add(lblNbrePointsPourEvaluerCeNode);
JPanel panelAttributs = new JPanel();
panelAttributs.setLayout(null);
tabbedPane.addTab("Attributs", img1, panelAttributs, null);
comboBoxAttribut.setToolTipText("Les attributs présents dans ce node.");
comboBoxAttribut.setMaximumRowCount(10);
comboBoxAttribut.setFont(new Font("Tahoma", Font.PLAIN, 14));
comboBoxAttribut.setBounds(10, 31, 510, 31);
panelAttributs.add(comboBoxAttribut);
JScrollPane scrollPane_3 = new JScrollPane();
scrollPane_3.setBounds(10, 201, 536, 135);
panelAttributs.add(scrollPane_3);
scrollPane_3.setViewportView(editorPaneAttribut);
editorPaneAttribut.setFont(new Font("Tahoma", Font.BOLD, 16));
JLabel lblAttribut = new JLabel("Sélectionner l'attribut");
lblAttribut.setFont(new Font("Tahoma", Font.BOLD, 12));
lblAttribut.setBounds(10, 11, 149, 22);
panelAttributs.add(lblAttribut);
textField_NombrePointAttribut.setText("0");
textField_NombrePointAttribut.setHorizontalAlignment(SwingConstants.CENTER);
textField_NombrePointAttribut.setFont(new Font("Tahoma", Font.BOLD, 12));
textField_NombrePointAttribut.setColumns(10);
textField_NombrePointAttribut.setBounds(114, 126, 57, 31);
panelAttributs.add(textField_NombrePointAttribut);
JLabel lblNewLabel = new JLabel("Nombre point");
lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 12));
lblNewLabel.setBounds(16, 134, 94, 14);
panelAttributs.add(lblNewLabel);
chckbxEvaluerAttribut.setFont(new Font("Tahoma", Font.BOLD, 14));
chckbxEvaluerAttribut.setBounds(10, 97, 269, 23);
panelAttributs.add(chckbxEvaluerAttribut);
JLabel lblAvertissement = new JLabel("");
lblAvertissement.setVerticalAlignment(SwingConstants.TOP);
lblAvertissement.setForeground(Color.RED);
lblAvertissement.setBounds(153, 11, 393, 22);
panelAttributs.add(lblAvertissement);
lblType.setVerticalAlignment(SwingConstants.TOP);
lblType.setHorizontalAlignment(SwingConstants.LEFT);
lblType.setBounds(10, 168, 547, 22);
panelAttributs.add(lblType);
JScrollPane scrollPane_3_1 = new JScrollPane();
scrollPane_3_1.setBounds(10, 389, 536, 323);
panelAttributs.add(scrollPane_3_1);
scrollPane_3_1.setViewportView(editorPaneInfosAttribut);
btnEtendu.setBounds(10, 347, 100, 31);
panelAttributs.add(btnEtendu);
btnOuExact.setBounds(120, 347, 90, 30);
panelAttributs.add(btnOuExact);
btnContient.setBounds(220, 347, 100, 30);
panelAttributs.add(btnContient);
btnColor.setBounds(330, 347, 90, 30);
panelAttributs.add(btnColor);
btnBordure.setBounds(430, 347, 90, 30);
panelAttributs.add(btnBordure);
JPanel panelContenu = new JPanel();
panelContenu.setLayout(null);
tabbedPane.addTab("Contenu", img4, panelContenu, null);
JScrollPane scrollPane = new JScrollPane();
scrollPane.setBounds(10, 67, 530, 86);
panelContenu.add(scrollPane);
editorPaneContenuNode.setEditable(false);
scrollPane.setViewportView(editorPaneContenuNode);
chckbxEvaluerContenuDuNode.setFont(new Font("Tahoma", Font.BOLD, 12));
chckbxEvaluerContenuDuNode.setBounds(6, 25, 304, 23);
panelContenu.add(chckbxEvaluerContenuDuNode);
JLabel lblNbrPointContenuNode = new JLabel("Nbre point contenu node");
lblNbrPointContenuNode.setFont(new Font("Tahoma", Font.BOLD, 12));
lblNbrPointContenuNode.setBounds(316, 27, 155, 19);
panelContenu.add(lblNbrPointContenuNode);
textFieldNombrePointContenuNode.setText("0");
textFieldNombrePointContenuNode.setHorizontalAlignment(SwingConstants.CENTER);
textFieldNombrePointContenuNode.setFont(new Font("Tahoma", Font.BOLD, 12));
textFieldNombrePointContenuNode.setColumns(10);
textFieldNombrePointContenuNode.setBounds(481, 22, 59, 30);
panelContenu.add(textFieldNombrePointContenuNode);
JScrollPane scrollPane_4 = new JScrollPane();
scrollPane_4.setBounds(10, 258, 530, 242);
panelContenu.add(scrollPane_4);
editorPaneContenuEnfant.setEditable(false);
scrollPane_4.setViewportView(editorPaneContenuEnfant);
JLabel lblNbrePointContenu = new JLabel("Nbre point contenu complet avec ceux des nodes enfants");
lblNbrePointContenu.setFont(new Font("Tahoma", Font.BOLD, 12));
lblNbrePointContenu.setBounds(10, 222, 389, 19);
panelContenu.add(lblNbrePointContenu);
textFieldNbrPointContenuEnfant.setToolTipText("<html>Nombre de point si le contenu est similaire<br>(distance Levenshtein inférieure ou égale)</html>");
textFieldNbrPointContenuEnfant.setText("0");
textFieldNbrPointContenuEnfant.setHorizontalAlignment(SwingConstants.CENTER);
textFieldNbrPointContenuEnfant.setFont(new Font("Tahoma", Font.BOLD, 12));
textFieldNbrPointContenuEnfant.setColumns(10);
textFieldNbrPointContenuEnfant.setBounds(481, 217, 59, 30);
panelContenu.add(textFieldNbrPointContenuEnfant);
textField_DistanceSimilitude.setToolTipText("Distance de Levenshtein");
textField_DistanceSimilitude.setHorizontalAlignment(SwingConstants.CENTER);
textField_DistanceSimilitude.setText("2");
textField_DistanceSimilitude.setBounds(490, 183, 50, 23);
panelContenu.add(textField_DistanceSimilitude);
textField_DistanceSimilitude.setColumns(10);
chckbxEvaluerSimilitude.setToolTipText("Comparaison des différents mots du contenu.");
chckbxEvaluerSimilitude.setFont(new Font("Tahoma", Font.BOLD, 12));
chckbxEvaluerSimilitude.setBounds(10, 182, 474, 23);
panelContenu.add(chckbxEvaluerSimilitude);
chckbxIgnoreValeurNumerique.setToolTipText("<html>Le texte sera nettoyé de toutes les valeurs numériques<br>avant la comparaison avec le fichier de l'étudiant.</html>");
chckbxIgnoreValeurNumerique.setFont(new Font("Tahoma", Font.BOLD, 12));
chckbxIgnoreValeurNumerique.setBounds(10, 532, 285, 23);
panelContenu.add(chckbxIgnoreValeurNumerique);
JSeparator separator = new JSeparator();
separator.setForeground(SystemColor.activeCaption);
separator.setBounds(10, 164, 530, 11);
panelContenu.add(separator);
chckbxIgnoreLaCasse.setFont(new Font("Tahoma", Font.BOLD, 12));
chckbxIgnoreLaCasse.setBounds(10, 568, 228, 23);
panelContenu.add(chckbxIgnoreLaCasse);
JSeparator separator_1 = new JSeparator();
separator_1.setForeground(SystemColor.activeCaption);
separator_1.setBounds(10, 511, 530, 2);
panelContenu.add(separator_1);
chckbxIgnoreLesCaracteresSpeciaux.setFont(new Font("Tahoma", Font.BOLD, 12));
chckbxIgnoreLesCaracteresSpeciaux.setBounds(302, 533, 238, 23);
panelContenu.add(chckbxIgnoreLesCaracteresSpeciaux);
tabbedPane.addTab("Style", img2, panelStyleStructure, null);
panelStyleStructure.setLayout(null);
lblAttribut_analyseStyle.setBounds(10, 96, 135, 15);
lblAttribut_analyseStyle.setFont(new Font("Tahoma", Font.BOLD, 12));
panelStyleStructure.add(lblAttribut_analyseStyle);
comboBoxAttribut_analyseStyle.setToolTipText("Les attributs présents dans ce node.");
comboBoxAttribut_analyseStyle.setMaximumRowCount(10);
comboBoxAttribut_analyseStyle.setFont(new Font("Tahoma", Font.PLAIN, 14));
comboBoxAttribut_analyseStyle.setBounds(10, 122, 519, 31);
panelStyleStructure.add(comboBoxAttribut_analyseStyle);
lblLeStyleDeParagrapheDuParagraphe.setHorizontalAlignment(SwingConstants.LEFT);
lblLeStyleDeParagrapheDuParagraphe.setVerticalAlignment(SwingConstants.TOP);
lblLeStyleDeParagrapheDuParagraphe.setBounds(10, 11, 536, 24);
panelStyleStructure.add(lblLeStyleDeParagrapheDuParagraphe);
chckbx_EvaluateStyleDeParagraphe.setFont(new Font("Tahoma", Font.BOLD, 14));
chckbx_EvaluateStyleDeParagraphe.setBounds(6, 42, 540, 23);
panelStyleStructure.add(chckbx_EvaluateStyleDeParagraphe);
scrollPane_evaluationAttributStyleParagraphe.setBounds(10, 192, 519, 97);
panelStyleStructure.add(scrollPane_evaluationAttributStyleParagraphe);
scrollPane_evaluationAttributStyleParagraphe.setViewportView(editorPane_evaluateStyleParagrapheAttribut);
lbl_NombrePointAttributEvaluationStyleParagraphe.setFont(new Font("Tahoma", Font.BOLD, 12));
lbl_NombrePointAttributEvaluationStyleParagraphe.setBounds(10, 164, 94, 14);
panelStyleStructure.add(lbl_NombrePointAttributEvaluationStyleParagraphe);
textField_evaluateStyleParagrapheAttributNbrPoint.setText("0");
textField_evaluateStyleParagrapheAttributNbrPoint.setHorizontalAlignment(SwingConstants.CENTER);
textField_evaluateStyleParagrapheAttributNbrPoint.setFont(new Font("Tahoma", Font.BOLD, 12));
textField_evaluateStyleParagrapheAttributNbrPoint.setColumns(10);
textField_evaluateStyleParagrapheAttributNbrPoint.setBounds(114, 156, 57, 31);
panelStyleStructure.add(textField_evaluateStyleParagrapheAttributNbrPoint);
JScrollPane leftScrollPane = new JScrollPane( );
leftScrollPane.setPreferredSize( new Dimension( 200, 0 ) );
JScrollPane rightScrollPane = new JScrollPane( );
JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftScrollPane, rightScrollPane );
splitPane.setBounds(10, 10, 800, 783);
splitPane.setBounds(10, 10, 1364, 783);
panel.add(splitPane);
rightScrollPane.setViewportView(textNodeSelect);
textNodeSelect.setFont(new Font("Monospaced", Font.PLAIN, 15));
@ -515,50 +203,64 @@ public class create extends JFrame {
sb.append("<br><h1>Nom du node : " + nod.getNomElt() + "</h1><br>");
sb.append("<hr>");
if(nod.getAttributs().size()>0) {
if(nod.getAttributs().size()==1) sb.append("<br><h4><u>ATTRIBUT DU NODE</u></h4>");
if(nod.getAttributs().size()>1) sb.append("<br><h4><u>ATTRIBUTS DU NODE</u></h4>");
}
Enumeration<String> key = nod.getAttributs().keys();
if(nod.getAttributs().size()>0) sb.append("<br><h4><u>Attribut(s)</u></h4>");
sb.append("<ul>");
List<String> Lesattributsdunode = new ArrayList<String>();
while(key.hasMoreElements()) {
String k = key.nextElement();
// boolean ecrit =false;
if(nod.getAttributs().get("evaluer")!=null) {
if(nod.getAttributs().get("evaluer").equals("true")) {
sb.append("<li class=\"p2\"><b>" + k + "=\"" + nod.getAttributs().get(k)+"\"</b></li>");
// switch(k) {
// case ("evalContenu"):
// sb.append("<li class=\"p2\"><b>" + k + "=\"" + nod.getAttributs().get(k)+"\"</b></li>");
// ecrit=true;
// break;
// case("evaluer"):
// sb.append("<li class=\"p2\"><b>" + k + "=\"" + nod.getAttributs().get(k)+"\"</b></li>");
// ecrit=true;
// break;
// }
//
// if(nod.getAttributs().get(k).contains("") && !ecrit) {
// sb.append("<li class=\"p2\"><b>" + k + "=\"" + nod.getAttributs().get(k)+"\"</b></li>");
// ecrit=true;
// }else {
// sb.append("<li class=\"p2\">" + k + "=\"" + nod.getAttributs().get(k)+"\"</li>");
// ecrit=true;
// }
}else {
sb.append("<li class=\"p3\">" + k + "=\"" + nod.getAttributs().get(k)+"\"</li>");
if(nod.getAttributs().get(k).contains("")) sb.append("<li class=\"p3\"><b>" + k + "=\"" + nod.getAttributs().get(k)+"\"</b></li>");
String K = key.nextElement();
Lesattributsdunode.add(K);
}
//permet le tri par ordre alphabétique des clés du dictionnaire
Lesattributsdunode = Lesattributsdunode.stream().sorted().collect(Collectors.toList());
if(nod.getAttributs().get("evaluer")!=null) if(nod.getAttributs().get("evaluer").equalsIgnoreCase("true")) {
sb.append("<br>");
sb.append("<ul>");
sb.append("<li class=\"p2\"><b><u>Les attributs d'analyseWriter</u></b></li>");
for(int i=0; i < Lesattributsdunode.size();i++) {
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(Lesattributsdunode.get(i))) {
sb.append("<li class=\"p2\"><b>" + Lesattributsdunode.get(i) + "=\"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</b></li>");
}
}
if(nod.getAttributs().get("evaluer")==null) {
sb.append("<li class=\"p3\">" + k + "=\"" + nod.getAttributs().get(k)+"\"</li>");
sb.append("</ul>");
sb.append("<br>");
sb.append("<ul>");
sb.append("<li class=\"p2\"><b><u>Les attributs de Writer</u></b></li>");
for(int i=0; i < Lesattributsdunode.size();i++) {
if(!listeAttributsAnalyseWriter.isAttributAnalyseWriter(Lesattributsdunode.get(i))) {
sb.append("<li class=\"p2\"><b>" + Lesattributsdunode.get(i) + "=\"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</b></li>");
}
}
sb.append("</ul>");
}
sb.append("</ul>");
if(nod.getAttributs().get("evaluer")!=null) if(!nod.getAttributs().get("evaluer").equalsIgnoreCase("true")) {
sb.append("<br>");
sb.append("<ul>");
sb.append("<li class=\"p3\"><b><u>Les attributs d'analyseWriter</u></b></li>");
for(int i=0; i < Lesattributsdunode.size();i++) {
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(Lesattributsdunode.get(i))) {
sb.append("<li class=\"p3\"><b>" + Lesattributsdunode.get(i) + "=\"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</b></li>");
}
}
sb.append("</ul>");
sb.append("<br>");
sb.append("<ul>");
sb.append("<li class=\"p3\"><b><u>Les attributs de Writer</u></b></li>");
for(int i=0; i < Lesattributsdunode.size();i++) {
if(!listeAttributsAnalyseWriter.isAttributAnalyseWriter(Lesattributsdunode.get(i))) {
sb.append("<li class=\"p3\"><b>" + Lesattributsdunode.get(i) + "=\"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</b></li>");
}
}
sb.append("</ul>");
}
if(!nod.retourneLesContenusEnfants("").trim().isEmpty()) {
sb.append("<br><br><h4><u>Contenu</u></h4><br> " + nod.retourneLesContenusEnfants("") );
@ -567,9 +269,10 @@ public class create extends JFrame {
textNodeSelect.setText("<html>"+sb.toString()+"</html>");
createPopupMenuTree(nod);
}
}
}
/**
@ -722,7 +425,6 @@ public class create extends JFrame {
// Définition du menu déroulant "Edit" et de son contenu
JMenu mnuExercice = new JMenu( "Création évaluation" );
mnuExercice.setMnemonic( 'N' );
mnuExercice.add(actConfiguration);
mnuExercice.add(actEvaluer);
menuBar.add(mnuExercice);
@ -761,7 +463,7 @@ public class create extends JFrame {
toolBar.addSeparator();
JButton btnAbout = toolBar.add( actAbout );
btnAbout.setIcon(new ImageIcon(create.class.getResource("/resources/apropos.png")));
btnAbout.setHideActionText( true );
@ -773,11 +475,6 @@ public class create extends JFrame {
toolBar.add(btnDocumentation);
toolBar.addSeparator();
toolBar.add( actExit ).setHideActionText( true );
toolBar.addSeparator();
toolBar.add( actConfiguration );
JButton button = toolBar.add( actEvaluer );
button.setIcon(new ImageIcon(create.class.getResource("/resources/evaluate.png")));
@ -1697,30 +1394,7 @@ public class create extends JFrame {
};
/**
*
*/
private AbstractAction actConfiguration = new AbstractAction() {
private static final long serialVersionUID = 1L;
{
putValue( Action.NAME, "Configuration" );
putValue( Action.SMALL_ICON, new ImageIcon( getClass().getResource("/configuration.png") ) );
putValue( Action.MNEMONIC_KEY, KeyEvent.VK_W );
putValue( Action.SHORT_DESCRIPTION, "Configurer le fichier pour l'évaluation" );
putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.ALT_DOWN_MASK) );
}
@Override public void actionPerformed( ActionEvent e ) {
if(commandes.fichierAnalyseValide) {
}else {
JOptionPane.showMessageDialog(null, "Charger un fichier Writer (.odt) ou un fichier d'évaluaton (.xml).");
}
System.out.println( "Configuration" );
}
};
/**

View File

@ -73,7 +73,7 @@ public class evaluate extends JFrame {
private JCheckBox chckbxVerif;
private JCheckBox chckbxNewLogo;
private JEditorPane txtpnmessages;
public JProgressBar progressBarre;
/**
@ -175,9 +175,6 @@ public class evaluate extends JFrame {
JScrollPane scrollPane = new JScrollPane();
panelCentre.add(scrollPane);
progressBarre = new JProgressBar();
progressBarre.setEnabled(true);
panelCentre.add(progressBarre, BorderLayout.NORTH);
txtpnmessages = new JEditorPane();
txtpnmessages.setFont(new Font("Tahoma", Font.PLAIN, 14));
@ -192,22 +189,7 @@ public class evaluate extends JFrame {
}
private void Pro() {
// progressBarre = new JProgressBar();
progressBarre.setMaximum(100000000);
progressBarre.setStringPainted(true);
for(int i = 0 ; i < 1000; i++) {
progressBarre.setValue(i);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}
private void createMenu() {
@ -421,7 +403,6 @@ public class evaluate extends JFrame {
text.append("\nFichier d'analyse :");
text.append("\n"+commandes.PathFilenameAnalysis+"\n");
progressBarre.setVisible(false);
txtpnmessages.setText(text.toString());
}
@ -434,67 +415,93 @@ public class evaluate extends JFrame {
}
private AbstractAction actEvaluate = new AbstractAction() {
private static final long serialVersionUID = 1L;
{
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) );
}
@Override
public void actionPerformed(ActionEvent e) {
// Thread t1 = new Thread(new ProgressBar());
Thread t2 = new Thread(new evaluerLesFichiersEtudiants(chckbxfichiersEtudaints.isSelected(), chckbxZipfeedback.isSelected(),chckbxnoFeedback.isSelected(),
chckbxNoNote.isSelected(), chckCSVNotes.isSelected(), chckbxNewLogo.isSelected(), chckbxNoLogo.isSelected(), chckbxVerif.isSelected(), txtpnmessages));
// t1.start();
t2.start();
// evaluerLesFichiersEtudiants E = new evaluerLesFichiersEtudiants(chckbxfichiersEtudaints.isSelected(), chckbxZipfeedback.isSelected(),chckbxnoFeedback.isSelected(),
// chckbxNoNote.isSelected(), chckCSVNotes.isSelected(), chckbxNewLogo.isSelected(), chckbxNoLogo.isSelected(), chckbxVerif.isSelected(), txtpnmessages);
//
// E.run();
}
};
/**
* Evaluer et analayser les fichiers des étudiants
*/
private AbstractAction actEvaluate = new AbstractAction() {
private static final long serialVersionUID = 1L;
{
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) );
}
@Override
public void actionPerformed( ActionEvent e ) {
if(commandes.fichierAnalyseValide) {
// JOptionPane.showMessageDialog(null, "Je boss", "Je travaille", JOptionPane.PLAIN_MESSAGE, null);
// new msgBox("Je travaille dure.",true,false,"Attendez");
evaluerLesFichiersEtudiants E = new evaluerLesFichiersEtudiants(chckbxfichiersEtudaints.isSelected(), chckbxZipfeedback.isSelected(),chckbxnoFeedback.isSelected(),
chckbxNoNote.isSelected(), chckCSVNotes.isSelected(), chckbxNewLogo.isSelected(), chckbxNoLogo.isSelected(), chckbxVerif.isSelected(),
progressBarre, txtpnmessages);
E.run();
// 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");
}
}
};
// private AbstractAction actEvaluate = new AbstractAction() {
//
// private static final long serialVersionUID = 1L;
//
// {
// 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) );
// }
//
// @Override
// public void actionPerformed( ActionEvent e ) {
// if(commandes.fichierAnalyseValide) {
//// JOptionPane.showMessageDialog(null, "Je boss", "Je travaille", JOptionPane.PLAIN_MESSAGE, null);
//// new msgBox("Je travaille dure.",true,false,"Attendez");
//
//
//
//
// evaluerLesFichiersEtudiants E = new evaluerLesFichiersEtudiants(chckbxfichiersEtudaints.isSelected(), chckbxZipfeedback.isSelected(),chckbxnoFeedback.isSelected(),
// chckbxNoNote.isSelected(), chckCSVNotes.isSelected(), chckbxNewLogo.isSelected(), chckbxNoLogo.isSelected(), chckbxVerif.isSelected(), txtpnmessages);
//
// E.run();
//
//
//
//
//
//
//
//
//
//// 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");
// }
// }
// };
/**
@ -856,23 +863,52 @@ public class evaluate extends JFrame {
}
};
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 ) {
}
};
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 ) {
}
};
/**
*
*/
private AbstractAction actSavePreference = new AbstractAction() {
private static final long serialVersionUID = 1L;
{
putValue( Action.NAME, "Enregistrer prefrences" );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/savepreferencemini.png")) );
putValue( Action.LARGE_ICON_KEY, new ImageIcon(create.class.getResource("/resources/savepreference.png")) );
putValue( Action.MNEMONIC_KEY, KeyEvent.VK_W );
putValue( Action.SHORT_DESCRIPTION, "Enregistrer prefrences" );
putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.ALT_DOWN_MASK) );
}
@Override public void actionPerformed( ActionEvent e ) {
if(commandes.fichierAnalyseValide) {
}else {
JOptionPane.showMessageDialog(null, "Charger un fichier Writer (.odt) ou un fichier d'évaluaton (.xml).");
}
System.out.println( "Configuration" );
}
};
/**
* Affiche la fenêtre d'information sur analyseWriter
*/

View File

@ -3,7 +3,6 @@ package app;
import java.io.IOException;
import javax.swing.JEditorPane;
import javax.swing.JProgressBar;
import javax.xml.parsers.ParserConfigurationException;
import org.xml.sax.SAXException;
@ -18,12 +17,11 @@ import net.lingala.zip4j.exception.ZipException;
public class evaluerLesFichiersEtudiants implements Runnable{
private final JProgressBar progressBarre;
private final JEditorPane txt;
public evaluerLesFichiersEtudiants(boolean listeEtudiantCSV, boolean zipfeedback, boolean nofeedback, boolean nonote
, boolean notedansunCSV, boolean newlogo, boolean nologo, boolean verifhisto2uniquement, JProgressBar progressBar, JEditorPane txt) {
, boolean notedansunCSV, boolean newlogo, boolean nologo, boolean verifhisto2uniquement, JEditorPane txt) {
commandes.analyse=true;
@ -35,8 +33,8 @@ public class evaluerLesFichiersEtudiants implements Runnable{
if(newlogo) commandes.newLogo=true;
if(nologo) commandes.noLogo = true;
if(verifhisto2uniquement) commandes.verifHisto2 = true;
this.progressBarre=progressBar;
this.txt=txt;
// this.txt.setContentType("text/html");
}
@ -77,9 +75,6 @@ public class evaluerLesFichiersEtudiants implements Runnable{
//*****************************************
int nbFichierWriter = a.getLectDossiers().getEC().getListeContentWriter().size();
commandes.analyse_Nbre_Fichier_Student = nbFichierWriter;
progressBarre.setMaximum(nbFichierWriter);
progressBarre.setVisible(true);
progressBarre.setStringPainted(true);
commandes.message.append("\nNombre de fichier à analyser et évaluer : " + Integer.valueOf(nbFichierWriter) + "\n");
@ -92,11 +87,14 @@ public class evaluerLesFichiersEtudiants implements Runnable{
verification.setNomElt("verification");
verification.getAttributs().put("nombre_fichier", String.valueOf(a.getLectDossiers().getEC().getListeFichierodt().size()));
for(int i = 0 ; i < nbFichierWriter ; i++) {
txt.setText("\nChargement de l'historique du fichier n° " + String.valueOf(i) +" par comparaison avec les "+ String.valueOf(nbFichierWriter-1) + " autres fichiers");
node nod = Run.XMLContent(a.getLectDossiers().getEC().getListeContentWriter().get(i));
node nodStudent = meptl.LectureFichierEtudiantPourVerification(nod,a,i);
verification.getNodes().add(nodStudent);
}
//a.ecritureNodeEnXML(verification, "VerificationHistorique","",false); //écriture du node de l'étudiant
txt.setText("\nRecherche des concordances temporelles et d'auteur dans l'historique des modifications des " + nbFichierWriter + " fichiers."
+ "\nPatientez, cela peut prendre quelques secondes ou minutes.");
verif = meptl.verificationHistorique(verification, a); // vérification des correspondances entre les fichiers
//********************************
@ -126,8 +124,7 @@ public class evaluerLesFichiersEtudiants implements Runnable{
//** Parcours l'ensemble des fichiers des étudiants ***
//*****************************************************
for(int i = 0 ; i < nbFichierWriter ; i++) {
progressBarre.setValue(i);
txt.setText(String.valueOf(i) +"/"+ String.valueOf(nbFichierWriter-1));
txt.setText("\nEvaluation du fichier n° " + String.valueOf(i) +"/"+ String.valueOf(nbFichierWriter-1) + " fichier(s)");
//index de l'étudiant
commandes.analyse_index_Fichier_Student = i;

View File

@ -0,0 +1,34 @@
package app;
public class listeAttributsAnalyseWriter {
public listeAttributsAnalyseWriter() {
}
public static boolean isAttributAnalyseWriter(String attribut) {
if(attribut.equals("evaluer")) return true;
if(attribut.equals("addmenu")) return true;
if(attribut.equals("saut")) return true;
if(attribut.equals("titre")) return true;
if(attribut.equals("titre1")) return true;
if(attribut.equals("titre2")) return true;
if(attribut.equals("titre3")) return true;
if(attribut.equals("poids")) return true;
if(attribut.equals("analyseStyle")) return true;
if(attribut.equals("allContent")) return true;
if(attribut.equals("index")) return true;
if(attribut.equals("recherche_index")) return true;
if(attribut.equals("recherche_contenu_exact")) return true;
if(attribut.equals("evalNameNode")) return true;
if(attribut.equals("styletitre")) return true;
if(attribut.equals("evalNameCreator")) return true;
if(attribut.equals("evalNameInitialCreator")) return true;
if(attribut.equals("evalNameInitialCreator")) return true;
if(attribut.equals("recherche_anchor-page-number")) return true;
return false;
}
}

View File

@ -0,0 +1,14 @@
package app;
import javax.swing.JEditorPane;
public class savePreferences {
private JEditorPane txt;
savePreferences(JEditorPane txt){
this.txt=txt;
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB