u07RaH^{2Pn{gBc
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
literal 15622
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
ZBQKB^0&2Jgq(R^@gkt0a(rjSy#{iX@D4_rV
delta 187
zcmcbryi1wu)W2Q(7#J9A7HvHU^E|jI7%k*(du5>c*HcbTQa6
z^fFih6^lW%Ft{<;0eL{p4EBs142%qpKsGA_vzR0g12ZEhki*2t#mEh$g@77v0cj9;
O451i#fHWIe{4oINXdia~
diff --git a/bin/versevaluate.png b/bin/versevaluate.png
new file mode 100644
index 0000000000000000000000000000000000000000..2158f06de0c8b19ecbc612d14879ffe8aa28e44b
GIT binary patch
literal 2007
zcmV;|2PpW7P)B7f(3z8v?e4`Djca&)r1yQ
zglbhv!iUl#9#N%00TH_o5@HcmC=CHGiEF#Wtt+`faZ&|R6d;BKW7lu*n)R;lJ^gTZ
z*Vo>sy^iyjj`rS}GjslX?wOf0GfG4l52ch9NCPZ@0Lt{sxaWA#fe{hWlF&^W%1l}*
zH3P^3a)6nD-9#=#oCNQoUjh6;FVF`J00D{Sr3oU&=xFDowQO)F^A<|Bs558Co5r8-1JPnk5c
zn8RjHQqKI8$&T$ilM`fd0zbn2z$X~t;!CAt*;_4$WThnP)be8szEvp$5fC7Sdg)R
z1BC~u>!}+pv|_;^Z3pH8%Pz?aC3zHO6j8sVp7Kx1(TNyqcHmnWGn60r0_bM!
zw3!s9jP!ku`)FL!NNrCoEdwoMD+LQM2b?7k5b&L3bSj-NQW_8;6gmoNSlWQyV&{eH
zFGMPIVFy^&=L>E
zx~7y;mIS|J5aH>0_IVt<_aLPomNKXf#w2XB*f{;bX_h&cF{lml+?D5y3IYB)1OAu|
z-amspZfX^d2pe!Wqf2_CP%(#-7D2kx-^t>v#Z)h-=BZ0h#ppp%Ra8Y;ZW#cTS1Y;U
zy8)fR?rgZZ3Wnam$hpi2dwM2Nh7m8JFwuk0(GoH9ROE{weQD?t-GOeNy!%Nm^k3lU
zmq#N=A1pjb#XS`OT@FAWHo
zbTmW+eo7OKNJtLcI3OY-e%&u?TGxoVZr5kKB!s>|pUid76&}hKGFJ<qms^T%9Zxvb`cR792u0d)-s_HdFIkHqKh6Tz539@f-6U`
z9!o&hEIpHyE`eWakoljeq-jLfw5}0N*F;2QSR0o8ZTn?d8x|3f{{DXX_V>RhWG)f7
zHUYw^%KHL&U&LHo>U-zzoPPwo7h!6X!(JbSB%qkSJkF*h7r7<^tfXWq_UK>Ez^;02jkHJyowVSXC9)
zO)n`SzqS^YnVHC3_^VD?c#Nwc|JX5pd-@IDeYcu|f(q=m-M|Pc5TNV%=ke6kgw^e(
zrR2Z$7RqjqXKvI%Q#BC7qLlO>IU;6sH8jZMX*rUHQ?_F>^sH9#y!qxBy&<<-uBWHR
z8i+@Lhk=YK_w>wt`^et5E&T3pZN;;BGlxd{IE0r~1dIwz<9}PXGIaKASl6+BJ$W@X
zsI-{Lr-Bs2V|+|!Z{LoqvT~I0#~;(ab}f3Zk*BOjXNCDI`~7ro*}|Rr`fyohc{#cJ
z_s24+5l)y=fHK9JqpU1k9=Lp&+ht|w-Q989i_b^LrcL;on!;t~enM&(w+BOjmNIGG
zbn!EA_%M1;55p}jw69%@*4Y`a=_n(wmyV4ax#M;tUN8MGzdWXX#5ni34Riq`DIY-I
zG;XdI1Kg>rqixo#N%f--4sv_LhKTY3pbb6;T7g~>(Np&HzhU>=U(uFE1NOqz|H5A2
zLyYhsYL+)qEKzFp3fNl$#djIUT`55a{Tg&PK}#J}df)~y6uQcr64D_krDg+jh=2AR
p?Yeq=S?GGB4
+
diff --git a/bin/versevaluatemini.png b/bin/versevaluatemini.png
new file mode 100644
index 0000000000000000000000000000000000000000..379c72c59161c154233a7848f10c2e607710c73d
GIT binary patch
literal 965
zcmV;$13LVPP)0ZjMZs{#U^d(Or6eBmL_}CC4Vo{#CFM&=pJ}@
z4~OUcf9E{sd7on>0bq==0N0`mFeSbK3xF*tOBH4$VFKn+>iCQdjR@=Z(TGX@CdLmy
zhosp`0EY>hCSKxu9;dOY9VLwPf$m|1h%u(S(n&1Vv7=h?=9SI3R=Nz$tOiyA9%GCt
zx5mPWyBhIOeTW8E19sL1Cl+u&Z~$qn`G!-hZ0N8ckE+%hG((`9eAmVZn7W&zMY+s~kXkVq=R#l%I{yVukA
zWFMo6QNH}R2YTOttDgdQE!k+@V^H%+abnB@XddDd@CvUnfEYl>|2VE0dq&$wx9f89
zvVNHulRNN~a19A`i{BKCm+{{O&-}g&;63Zr*!-9z>G0tmdDpxyxKTp9S`S@yEIn8v
zlc4o{D-U$+q(8g^d%mMYUHmt*7B8h>zm7*aeJO%H@4I9193ajG=CBJh580#+eg{u)
z2G6&549GRRy{3%^X(i37WzFtfeS>xG*>%~u4hPiy5BWVKCf}|h_s0N8QhvM_>%*V$
zzjuMJNE0Z;TGl1DY&n6;T0wefh-~8eGU@X;ucb-7kEF8R4*SPJZ_}hk_6srs$>}_;
z;o)JW1_l&!I246t-UI`Hx2j%bfLFOfCtu+A?!>aLU|CrfhKF%)-Aa8|7slZzxwI-k
z-h7+<3`W19ZTHu>GhJNUw~u6RFSVf%_Z~e8R*_u!^yE_%1x@>W%FNCxn@lPm462h_
zjeufqx02zoBx&x@p`sL31RQ{OqM$@~x3adacuPxBzGEJbQfJOclBPCn$OHNTS4F_f
z@InMMwRWwheZC^`0;IN9@on1_1%+W@1-uKGWo26OmW(kU!NEu1dEo9!_mqU|VK{LN
n-jtN72)GrNA5!5Z)1vS{n8_9|rB?h{00000NkvXXu0mjfp?$re
literal 0
HcmV?d00001
diff --git a/src/MEPTL/ecritureSujet.java b/src/MEPTL/ecritureSujet.java
index 8b3cf04..2c4b7f3 100644
--- a/src/MEPTL/ecritureSujet.java
+++ b/src/MEPTL/ecritureSujet.java
@@ -307,7 +307,7 @@ public class ecritureSujet {
if( listeDesNodesAvecEvalNameNode.isEvalNameNode(no.get(k))) no.get(k).getAttributs().put("evalNameNode", "0");
if(listeDesNodesSautEtTitre(no.get(k).getNomElt())) {no.get(k).getAttributs().put("saut", "false"); no.get(k).getAttributs().put("titre", "");}
if(listeDesNodesRechercheByContenu.isRechercheByContenu(no.get(k))) {no.get(k).getAttributs().put("recherche_index", "false"); no.get(k).getAttributs().put("recherche_contenu_exact", "false");no.get(k).getAttributs().put("recherche_contenu_plus_proche_voisin", "false");no.get(k).getAttributs().put("allContent", "strict0");}
- if(listeDesNodesEvalPlacement.isPlacement(no.get(k)))no.get(k).getAttributs().put("evalPlacement", "false");
+ if(listeDesNodesEvalPlacement.isPlacement(no.get(k)))no.get(k).getAttributs().put("evalPlacement", "0");
if(listeDesNodesAnalyseStyle.isAnalyseStyle(no.get(k))) no.get(k).getAttributs().put("analyseStyle", "false");
if(listeRechercheParAnchorPageNumber.isRechercheParAnchorPageNumber(no.get(k))) no.get(k).getAttributs().put("recherche_anchor-page-number", "false");
diff --git a/src/MEPTL/rechercherUnNodeStudent.java b/src/MEPTL/rechercherUnNodeStudent.java
index 05ba938..6338dc6 100644
--- a/src/MEPTL/rechercherUnNodeStudent.java
+++ b/src/MEPTL/rechercherUnNodeStudent.java
@@ -76,9 +76,9 @@ public class rechercherUnNodeStudent {
- //**************************************************************************
- //** Recherche les nodes text:p, text:h, text:span par le contenu textuel **
- //**************************************************************************
+ //*************************************************************************************
+ //** Recherche les nodes text:p, text:h, text:span, text:list par le contenu textuel **
+ //*************************************************************************************
if(nodSujet.getNomElt().contains("text:")) {
nodStudent = findNodeByContenuTextuel(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a);
if(nodStudent!=null) return nodStudent;
@@ -261,22 +261,7 @@ public class rechercherUnNodeStudent {
}
if(nodStudent!=null) return nodStudent;
System.out.println("n'a pas trouvé par la méthode contenu exact sans casse et trim()");
- nodStudent = findNodeParContenuPlusProcheVoisinSim(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a, 0.95);
- if(nodStudent!=null) return nodStudent;
- System.out.println("n'a pas trouvé par la méthode plus proche voisin avec distance de 0.95");
- nodStudent = findNodeParContenuPlusProcheVoisinSim(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a, 0.9);
- if(nodStudent!=null) return nodStudent;
- System.out.println("n'a pas trouvé par la méthode plus proche voisin avec distance de 0.9");
- nodStudent = findNodeParContenuPlusProcheVoisinSim(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a, 0.85);
- if(nodStudent!=null) return nodStudent;
- System.out.println("n'a pas trouvé par la méthode plus proche voisin avec distance de 0.85");
- nodStudent = findNodeParContenuPlusProcheVoisinSim(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a, 0.8);
- if(nodStudent!=null) return nodStudent;
- System.out.println("n'a pas trouvé par la méthode plus proche voisin avec distance de 0.8");
nodStudent = findNodeParContenuPlusProcheVoisinSim(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a, 0.75);
- if(nodStudent!=null) return nodStudent;
- System.out.println("n'a pas trouvé par la méthode plus proche voisin avec distance de 0.75");
- nodStudent = findNodeParContenuPlusProcheVoisinSim(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a, 0.7);
return nodStudent;
}
diff --git a/src/fenetres/allContent.java b/src/fenetres/allContent.java
index e269d68..011e520 100644
--- a/src/fenetres/allContent.java
+++ b/src/fenetres/allContent.java
@@ -1,27 +1,25 @@
package fenetres;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
import javax.swing.border.EmptyBorder;
import MEPTL.commandes;
import cXML.node;
-
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-
-import java.awt.Font;
-import java.awt.event.ActionEvent;
-
-import javax.swing.JComboBox;
-import javax.swing.JTextField;
-import javax.swing.SwingConstants;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.ImageIcon;
-
-import java.awt.event.ActionListener;
+import list.listeDesNodesAllContent;
public class allContent extends JFrame {
@@ -32,6 +30,7 @@ public class allContent extends JFrame {
private JPanel contentPane;
private JTextField textFieldPoint;
private JLabel lblExplication;
+
node nod;
afficheText J;
JComboBox comboBoxValeur;
@@ -42,10 +41,10 @@ public class allContent extends JFrame {
/**
* Create the frame.
*/
- public allContent(node nod, afficheText J) {
+ public allContent(node nod, afficheText J,boolean Childs) {
this.nod=nod;
this.J=J;
-
+
if(nod.getAttributs().get("allContent")!=null) {
String value = nod.getAttributs().get("allContent");
@@ -149,10 +148,20 @@ public class allContent extends JFrame {
try {
int point = Integer.valueOf(textFieldPoint.getText());
if(point<0) point =0;
- nod.getAttributs().put("allContent", comboBoxValeur.getSelectedItem() + String.valueOf(point));
- nod.evaluerAllChildTrue();
- J.refreshAffichage(nod);
- dispose();
+ if(!Childs) {
+ nod.getAttributs().put("allContent", comboBoxValeur.getSelectedItem() + String.valueOf(point));
+ nod.evaluerAllChildTrue();
+ J.refreshAffichage(nod);
+ }else {
+ for(int i = 0 ; i < nod.getNodes().size(); i++) {
+ if( listeDesNodesAllContent.isAllContent(nod.getNodes().get(i))){
+ nod.getNodes().get(i).getAttributs().put("allContent", comboBoxValeur.getSelectedItem() + String.valueOf(point));
+ nod.getNodes().get(i).evaluerAllChildTrue(); }
+ }
+ J.refreshAffichage(nod);
+ }
+
+ dispose();
} catch (Exception e2) {
JOptionPane.showMessageDialog(null, "Le nombre de point doit être un entier.");
}
diff --git a/src/fenetres/createPopupMenu.java b/src/fenetres/createPopupMenu.java
index d9a9b21..38b9b7a 100644
--- a/src/fenetres/createPopupMenu.java
+++ b/src/fenetres/createPopupMenu.java
@@ -8,6 +8,7 @@ import cXML.node;
import fenetres.create_act.actAddMenuFalse;
import fenetres.create_act.actAddMenuTrue;
import fenetres.create_act.actAllContent;
+import fenetres.create_act.actAllContentChilds;
import fenetres.create_act.actAttribut;
import fenetres.create_act.actCoefficient;
import fenetres.create_act.actCollapseAll;
@@ -555,8 +556,13 @@ if(nod!=null) {
if(listeDesNodesAllContent.isAllContent(nod) ) {
mnGroupeMethodeEvaluer.addSeparator();
mnGroupeMethodeEvaluer.add(new actAllContent());
+ if(listeDesNodesPourEvaluerPage.isPage(nod)) {
+ mnGroupeMethodeEvaluer.addSeparator();
+ mnGroupeMethodeEvaluer.add(new actAllContentChilds());
+ }
}
+
if(listeEvalNameNode.isNodeEvalNameNode(nod)) {
mnGroupeMethodeEvaluer.addSeparator();
mnGroupeMethodeEvaluer.add(mnEvalNameNode());
diff --git a/src/fenetres/create_act/actAllContent.java b/src/fenetres/create_act/actAllContent.java
index e9da73e..dd64eb6 100644
--- a/src/fenetres/create_act/actAllContent.java
+++ b/src/fenetres/create_act/actAllContent.java
@@ -25,7 +25,7 @@ public class actAllContent extends AbstractAction{
@Override
public void actionPerformed(ActionEvent e) {
node nod = (node) fenetres.create.getSelectNode().getUserObject();
- new allContent(nod,fenetres.create.getTextNodeSelect());
+ new allContent(nod,fenetres.create.getTextNodeSelect(),false);
}
}
diff --git a/src/fenetres/create_act/actAllContentChilds.java b/src/fenetres/create_act/actAllContentChilds.java
new file mode 100644
index 0000000..1cca7f2
--- /dev/null
+++ b/src/fenetres/create_act/actAllContentChilds.java
@@ -0,0 +1,30 @@
+package fenetres.create_act;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ImageIcon;
+
+import cXML.node;
+import fenetres.allContent;
+import fenetres.create;
+
+public class actAllContentChilds extends AbstractAction{
+ {
+ putValue( Action.NAME, "Evaluer le contenu de tous les nodes enfants" );
+ putValue( Action.SHORT_DESCRIPTION, "Evaluer le contenu de tous les nodes enfants" );
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/allcontentmini.png")) );
+ }
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ node nod = (node) fenetres.create.getSelectNode().getUserObject();
+ new allContent(nod,fenetres.create.getTextNodeSelect(),true);
+ }
+
+}
diff --git a/src/fenetres/create_act/actEvaluer.java b/src/fenetres/create_act/actEvaluer.java
index 4248573..95c285a 100644
--- a/src/fenetres/create_act/actEvaluer.java
+++ b/src/fenetres/create_act/actEvaluer.java
@@ -26,7 +26,7 @@ public class actEvaluer extends AbstractAction{
}
@Override
public void actionPerformed(ActionEvent e) {
- new evaluate();
+ evaluate.getInstance();
create.getInstance().dispose();
}
diff --git a/src/fenetres/create_act/actTousLesNodesEvaluer.java b/src/fenetres/create_act/actTousLesNodesEvaluer.java
index 60f972c..cd952e0 100644
--- a/src/fenetres/create_act/actTousLesNodesEvaluer.java
+++ b/src/fenetres/create_act/actTousLesNodesEvaluer.java
@@ -26,7 +26,7 @@ public class actTousLesNodesEvaluer extends AbstractAction{
try {
commandes.sujetSauvegarde = commandes.sujet.clone();
- commandes.sujet.supprimeTousLesNodesEvaluerFalseOuNull2();
+ commandes.sujet.supprimeTousLesNodesEvaluerFalseOuNull();
commandes.fichierAnalyseValide=false;
fenetres.create.getTextNodeSelect().setContentType("text/html");
diff --git a/src/fenetres/evaluate.java b/src/fenetres/evaluate.java
index 1c03738..21d9ac4 100644
--- a/src/fenetres/evaluate.java
+++ b/src/fenetres/evaluate.java
@@ -25,6 +25,7 @@ import javax.swing.JScrollPane;
import javax.swing.JToolBar;
import javax.swing.KeyStroke;
import javax.swing.SwingConstants;
+import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -72,17 +73,26 @@ public class evaluate extends JFrame {
private JCheckBox chckbxNoDetail;
private afficheText txtpnmessages;
+ private static evaluate instance;
+
/**
* Create the frame.
*/
- public evaluate() {
+ public void initialize() throws UnsupportedLookAndFeelException{
+ setSize(1200,800);
+
+
+
+
ImageIcon img = new ImageIcon(getClass().getResource("/evalwriter.png") );
this.setIconImage(img.getImage());
setTitle(commandes.Titre + " " + commandes.version + " " + commandes.branch);
-
+
+ setLocationRelativeTo( null );
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
- setBounds(100, 100, 980, 700);
+
+// setBounds(100, 100, 980, 700);
int screenWidth = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getWidth();
int screenHeight = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getHeight();
setLocation(( (screenWidth) - getWidth()) / 2, (screenHeight - getHeight()) / 2);
@@ -331,8 +341,27 @@ public class evaluate extends JFrame {
});
}
+ public static evaluate getInstance() {
+ if (instance == null) {
+ instance = new evaluate();
+ }
+ instance.setVisible(true);
+ return instance;
+ }
+ /**
+ * Create the application.
+ */
+ public evaluate() {
+ try {
+ initialize();
+ } catch (UnsupportedLookAndFeelException e) {
+ e.printStackTrace();
+ }
+ setVisible(true);
+ }
+
private void createMenu() {
JMenuBar menuBar = new JMenuBar();
@@ -415,6 +444,10 @@ public class evaluate extends JFrame {
toolBar.add(btnAfficheCodeFichierAnalyse);
JButton btnModifierFichierAnalyse = toolBar.add(actModifierFichierAnalyse);
+ btnModifierFichierAnalyse.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ }
+ });
btnModifierFichierAnalyse.setIcon(new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyseModif.png")));
btnModifierFichierAnalyse.setHideActionText(true);
toolBar.add(btnModifierFichierAnalyse);
@@ -948,7 +981,7 @@ public class evaluate extends JFrame {
@Override public void actionPerformed( ActionEvent e ) {
create.getInstance();
- dispose();
+ evaluate.getInstance().dispose();
}
};
diff --git a/src/fenetres/mainApp.java b/src/fenetres/mainApp.java
index a02e9df..8387f71 100644
--- a/src/fenetres/mainApp.java
+++ b/src/fenetres/mainApp.java
@@ -134,7 +134,7 @@ public class mainApp extends JFrame implements ActionListener{
if(e.getSource()==actCharge) {
if(!commandes.console) System.out.println( "Début chargement du fichier d'analyse." );
- new evaluate();
+ evaluate.getInstance();
frmEvalwriter.dispose();
}