pablo/analyseWriter
pablo
/
analyseWriter
1
1
Fork 0
Code Issues Pull Requests Projects Releases 14 Wiki Activity

Finalise V4.3.1

This commit is contained in:
pablo rodriguez 2022-12-03 11:10:57 +01:00
parent 658420e6d7
commit 1cbe975044
20 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
analyseWriter.exe
View File

Binary file not shown.

BIN
analyseWriter.jar
View File

Binary file not shown.

1
bin/.gitignore vendored
View File

@ -1 +1,2 @@
/fenetres/
/evaluer/

BIN
bin/evaluer/analyseLesNodesEnfants.class
View File

Binary file not shown.

BIN
bin/fenetres/create$1.class
View File

Binary file not shown.

BIN
bin/fenetres/create$10.class
View File

Binary file not shown.

BIN
bin/fenetres/create$11.class
View File

Binary file not shown.

BIN
bin/fenetres/create$12.class
View File

Binary file not shown.

BIN
bin/fenetres/create$13.class
View File

Binary file not shown.

BIN
bin/fenetres/create$2.class
View File

Binary file not shown.

BIN
bin/fenetres/create$3.class
View File

Binary file not shown.

BIN
bin/fenetres/create$4.class
View File

Binary file not shown.

BIN
bin/fenetres/create$5.class
View File

Binary file not shown.

BIN
bin/fenetres/create$6.class
View File

Binary file not shown.

BIN
bin/fenetres/create$7.class
View File

Binary file not shown.

BIN
bin/fenetres/create$8.class
View File

Binary file not shown.

BIN
bin/fenetres/create$9.class
View File

Binary file not shown.

BIN
bin/fenetres/create.class
View File

Binary file not shown.

138
src/evaluer/analyseLesNodesEnfants.java
View File

@ -52,15 +52,15 @@ public class analyseLesNodesEnfants {
//********************************
PourAnalyse = meptl.addNodeSautTitre(nodEnfantSujet, PourAnalyse,nodmenu,a);
//*******************
//** Le node <OU/> **
//*******************
if(nameNode.equals("OU")) {
if(nodEnfantSujet.getNodes().size()>1) {
PourAnalyse = NodeOu(j,nodEnfantSujet, PourAnalyse, nomDuNodePourAnalyse,nod2Student,nod1Student,nodStudent,nodSujet,nodSujetParagraphs,nodStudentParagraphes,nodmenu,a);
}
continue;
}
// //*******************
// //** Le node <OU/> **
// //*******************
// if(nameNode.equals("OU")) {
// if(nodEnfantSujet.getNodes().size()>1) {
// PourAnalyse = NodeOu(j,nodEnfantSujet, PourAnalyse, nomDuNodePourAnalyse,nod2Student,nod1Student,nodStudent,nodSujet,nodSujetParagraphs,nodStudentParagraphes,nodmenu,a);
// }
// continue;
// }
//***************************************************
//** Recherche le node correspondant de l'étudiant **
@ -179,66 +179,66 @@ public class analyseLesNodesEnfants {
}
public static node NodeOu(Integer j , node nodEnfantSujet , node PourAnalyse, String nomDuNodePourAnalyse, node nod2Student, node nod1Student, node nodStudent, node nodSujet, node nodSujetParagraphs, node nodStudentParagraphes, node nodmenu,Run a) {
node nodStudentCorrespondantAuNodSujet = null;
for(int k = j+1 ; k < nodSujet.getNodes().size();k++ ) {
nodEnfantSujet = nodSujet.getNodes().get(k);
String nameNode = nodEnfantSujet.getNomElt();
//***************************************************
//** Recherche le node correspondant de l'étudiant **
//***************************************************
if(nodEnfantSujet.getAttributs().get("evaluer")!=null) {
if(nodEnfantSujet.getAttributs().get("evaluer").equals("true")) {
if(nod2Student!=null) {
if(nod2Student.containElementByName(nameNode)) {
nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a);
}
}
if(nodStudentCorrespondantAuNodSujet==null && nod1Student!=null) {
if(nod1Student.containElementByName(nameNode)) {
nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a);
}
}
if(nodStudentCorrespondantAuNodSujet==null && nodStudent!=null) {
if(nodStudent.containElementByName(nameNode)) {
nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a);
}
}
}
}
//**************************************************************
//** Analyse attribut et contenu du node enfant de l'étudiant **
//**************************************************************
PourAnalyse = evaluationAttribut.evalLesAttributEtContenuDuNode(nodStudentCorrespondantAuNodSujet, nodEnfantSujet, PourAnalyse, nomDuNodePourAnalyse,nameNode);
//*******************************
//** méthode analyseStyle=true **
//*******************************
if(nameNode.contains("text:") && nodEnfantSujet.getAttributs().get("analyseStyle")!=null && nodSujetParagraphs!=null) {
if(nodEnfantSujet.getAttributs().get("analyseStyle").equalsIgnoreCase("true")) {
PourAnalyse = analyseStyle(PourAnalyse, nomDuNodePourAnalyse, nodEnfantSujet,nodStudentCorrespondantAuNodSujet, nodSujetParagraphs,nodStudentParagraphes, nodmenu, a);
}
}
//************************************************************
//** Analyse les nodes enfants du node enfant - Récursivité **
//************************************************************
if(nodEnfantSujet!=null) {
PourAnalyse = nodeNext(PourAnalyse, nomDuNodePourAnalyse, nodStudentCorrespondantAuNodSujet, nod2Student, nod1Student, nodEnfantSujet, nodSujetParagraphs, nodStudentParagraphes, nodmenu,a);
}
}
return PourAnalyse;
}
// public static node NodeOu(Integer j , node nodEnfantSujet , node PourAnalyse, String nomDuNodePourAnalyse, node nod2Student, node nod1Student, node nodStudent, node nodSujet, node nodSujetParagraphs, node nodStudentParagraphes, node nodmenu,Run a) {
//
// node nodStudentCorrespondantAuNodSujet = null;
//
// for(int k = j+1 ; k < nodSujet.getNodes().size();k++ ) {
//
// nodEnfantSujet = nodSujet.getNodes().get(k);
// String nameNode = nodEnfantSujet.getNomElt();
//
// //***************************************************
// //** Recherche le node correspondant de l'étudiant **
// //***************************************************
// if(nodEnfantSujet.getAttributs().get("evaluer")!=null) {
// if(nodEnfantSujet.getAttributs().get("evaluer").equals("true")) {
// if(nod2Student!=null) {
// if(nod2Student.containElementByName(nameNode)) {
// nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a);
// }
// }
// if(nodStudentCorrespondantAuNodSujet==null && nod1Student!=null) {
// if(nod1Student.containElementByName(nameNode)) {
// nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a);
// }
// }
// if(nodStudentCorrespondantAuNodSujet==null && nodStudent!=null) {
// if(nodStudent.containElementByName(nameNode)) {
// nodStudentCorrespondantAuNodSujet = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodEnfantSujet,nodStudent,nod1Student,nod2Student,a);
// }
// }
// }
// }
//
//
// //**************************************************************
// //** Analyse attribut et contenu du node enfant de l'étudiant **
// //**************************************************************
// PourAnalyse = evaluationAttribut.evalLesAttributEtContenuDuNode(nodStudentCorrespondantAuNodSujet, nodEnfantSujet, PourAnalyse, nomDuNodePourAnalyse,nameNode);
//
// //*******************************
// //** méthode analyseStyle=true **
// //*******************************
// if(nameNode.contains("text:") && nodEnfantSujet.getAttributs().get("analyseStyle")!=null && nodSujetParagraphs!=null) {
// if(nodEnfantSujet.getAttributs().get("analyseStyle").equalsIgnoreCase("true")) {
// PourAnalyse = analyseStyle(PourAnalyse, nomDuNodePourAnalyse, nodEnfantSujet,nodStudentCorrespondantAuNodSujet, nodSujetParagraphs,nodStudentParagraphes, nodmenu, a);
// }
// }
//
// //************************************************************
// //** Analyse les nodes enfants du node enfant - Récursivité **
// //************************************************************
// if(nodEnfantSujet!=null) {
// PourAnalyse = nodeNext(PourAnalyse, nomDuNodePourAnalyse, nodStudentCorrespondantAuNodSujet, nod2Student, nod1Student, nodEnfantSujet, nodSujetParagraphs, nodStudentParagraphes, nodmenu,a);
// }
//
//
// }
//
//
// return PourAnalyse;
// }

13
src/fenetres/create.java
View File

@ -83,7 +83,6 @@ import fenetres.create_act.actExpandNode;
import fenetres.create_act.actNewFichierAnalyse;
import fenetres.create_act.actNodeFichier;
import fenetres.create_act.actOpen;
import fenetres.create_act.actOu;
import fenetres.create_act.actPaste;
import fenetres.create_act.actRechercheAnchorPageNumberFalse;
import fenetres.create_act.actRechercheAnchorPageNumberTrue;
@ -450,10 +449,10 @@ public final class create extends JFrame {
mnEvaluerStylesParagraphes.setIcon(new ImageIcon(create.class.getResource("/resources/evaluertouslesstylesparagraphesmini.png")));
mnEvaluerStylesParagraphes.add( new actEvaluerTousLesStylesParagraphesTrue());
//Menu OU
JMenu mnOu = new JMenu("Insérer un node OU.");
mnOu.setIcon(new ImageIcon(create.class.getResource("/resources/oumini.png")));
mnOu.add( new actOu());
// //Menu OU
// JMenu mnOu = new JMenu("Insérer un node OU.");
// mnOu.setIcon(new ImageIcon(create.class.getResource("/resources/oumini.png")));
// mnOu.add( new actOu());
@ -531,8 +530,8 @@ public final class create extends JFrame {
mnPopupTree.add(mnEvalNumeroAbsoluePage);
mnPopupTree.addSeparator();
mnPopupTree.add(mnEvaluerStylesParagraphes);
mnPopupTree.addSeparator();
mnPopupTree.add(mnOu);
// mnPopupTree.addSeparator();
// mnPopupTree.add(mnOu);
}
if(nod.getNomElt().equals("text:user-defined") && nod.chemin().contains("structurepage")) {
mnPopupTree.addSeparator();