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

MAJ amélioration sur l'évaluation des draw:frame

This commit is contained in:
pablo rodriguez 2022-06-12 11:56:13 +02:00
parent 4fde13a2eb
commit cd762f54c2
14 changed files with 24 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -10,6 +10,6 @@
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/zip4j-1.2.7.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/miglayout15-swing.jar"/>
<classpathentry kind="lib" path="jgoodies-forms-1.8.0.jar" sourcepath="jgoodies-forms-1.8.0-sources.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar" sourcepath="/cXML"/>
<classpathentry kind="output" path="bin"/>
</classpath>

BIN
analyseWriter.jar
View File

Binary file not shown.

2
bin/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
/app/
/MEPTL/

BIN
bin/MEPTL/analyseLesNodesPrincipaux.class
View File

Binary file not shown.

BIN
bin/MEPTL/rechercherUnNodeStudent.class
View File

Binary file not shown.

BIN
bin/app/attributs$10.class
View File

Binary file not shown.

BIN
bin/app/attributs$11.class
View File

Binary file not shown.

BIN
bin/app/attributs$MyMouseListener.class
View File

Binary file not shown.

BIN
bin/app/attributs.class
View File

Binary file not shown.

BIN
bin/app/create.class
View File

Binary file not shown.

67
src/MEPTL/analyseLesNodesPrincipaux.java
View File

@ -428,73 +428,6 @@ public class analyseLesNodesPrincipaux {
section = analyseLesNodesEnfants.nodeNext(section, "ana:section", sectionStudent, null, null, sectionSujet, null, null,nodmenu, a);
// // les enfants du premier niveau du node
// for(int j = 0 ; j < sectionSujet.getNodes().size();j++ ) { //niveau 2
//
// node nodSujet = sectionSujet.getNodes().get(j);
// String nameNode = nodSujet.getNomElt();
// node nodStudent = null;
//
// if(sectionStudent!=null) nodStudent = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode,nodSujet,null,null,sectionStudent,a);
//
// //insère un saut si titre pas vide et saut=true
// section=addNodeSautTitre(nodSujet, section);
//
//
// // analyse attribut et contenu des enfants du premier niveau
// section = analyseLesAttributEtContenuDuNode(nodStudent, nodSujet, section, "ana:section",nameNode);
//
//
// for(int k = 0 ; k < nodSujet.getNodes().size();k++) { //niveau 3
// node nod2Sujet = nodSujet.getNodes().get(k);
// String nameNode2 = nod2Sujet.getNomElt();
// node nod2Student = null;
//
// if(sectionStudent!=null) nod2Student = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode2,nod2Sujet,null,sectionStudent,nodStudent,a);
//
// //insère un saut si titre pas vide et saut=true
// section=addNodeSautTitre(nod2Sujet, section);
//
// // analyse attribut et contenu des enfants du second niveau
// section = analyseLesAttributEtContenuDuNode(nod2Student, nod2Sujet, section, "ana:section",nameNode2 );
//
//
// for(int l = 0 ; l < nod2Sujet.getNodes().size();l++) { //niveau 4
// node nod3Sujet = nod2Sujet.getNodes().get(l);
// String nameNode3 = nod3Sujet.getNomElt();
// node nod3Student = null;
//
// if(sectionStudent!=null) nod3Student = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode3,nod3Sujet,sectionStudent,nodStudent,nod2Student,a);
//
// //insère un saut si titre pas vide et saut=true
// section=addNodeSautTitre(nod3Sujet, section);
//
// // analyse attribut et contenu des enfants du second niveau
// section = analyseLesAttributEtContenuDuNode(nod3Student, nod3Sujet, section, "ana:section", nameNode3);
//
//
// for(int m = 0 ; m < nod3Sujet.getNodes().size();m++) { //niveau 5
// node nod4Sujet = nod3Sujet.getNodes().get(m);
// String nameNode4 = nod4Sujet.getNomElt();
// node nod4Student = null;
//
// if(sectionStudent!=null) nod4Student = rechercherUnNodeStudent.rechercheLeNodeEnCascade(nameNode4,nod4Sujet,nodStudent,nod2Student,nod3Student,a);
//
// //insère un saut si titre pas vide et saut=true
// section=addNodeSautTitre(nod4Sujet, section);
//
// // analyse attribut et contenu des enfants du second niveau
// section = analyseLesAttributEtContenuDuNode(nod4Student, nod4Sujet, section, "ana:section", nameNode4);
//
// }
//
//
// }
//
// }
//
// }
//****************************************************************
//** Insère les attributs des points dans les node de l'analyse **
//****************************************************************

17
src/MEPTL/rechercherUnNodeStudent.java
View File

@ -399,17 +399,20 @@ public class rechercherUnNodeStudent {
*/
private static node findDrawFrame(String nameNode, node nodSujet,node nod0Student, node nod1Student, node nod2Student, Run a) {
node nodStudent = null;
String nameDraw = outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("draw:name"));
System.out.println("recherche image ou cadre =" nameDraw);
//recherche par le nom de l'objet draw:name par défaut
if(nod2Student!=null) nodStudent = a.retourneFirstNodeByNameAttributValueNetTexte(nod2Student, nameNode, "draw:name", outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("draw:name")));
if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValueNetTexte(nod1Student, nameNode, "draw:name", outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("draw:name")));
if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValueNetTexte(nod0Student, nameNode, "draw:name", outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("draw:name")));
if(nod2Student!=null) nodStudent = a.retourneFirstNodeByNameAttributValueNetTexte(nod2Student, nameNode, "draw:name", nameDraw);
if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValueNetTexte(nod1Student, nameNode, "draw:name", nameDraw);
if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValueNetTexte(nod0Student, nameNode, "draw:name", nameDraw);
if(nodStudent!=null) return nodStudent;
if(nodSujet.getAttributs().get("recherche_anchor-page-number")!=null) if(nodSujet.getAttributs().get("recherche_anchor-page-number").equalsIgnoreCase("true")) {
if(nod2Student!=null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod2Student, nameNode, "text:anchor-page-number", outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("text:anchor-page-number")));
if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod1Student, nameNode, "text:anchor-page-number", outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("text:anchor-page-number")));
if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod0Student, nameNode, "text:anchor-page-number", outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("text:anchor-page-number")));
String AncragePage = outils.withoutCodeAndPointPourRechercheContenuExact(nodSujet.getAttributs().get("text:anchor-page-number"));
if(nod2Student!=null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod2Student, nameNode, "text:anchor-page-number", AncragePage);
if(nod1Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod1Student, nameNode, "text:anchor-page-number", AncragePage);
if(nod0Student!=null) if(nodStudent==null) nodStudent = a.retourneFirstNodeByNameAttributValue(nod0Student, nameNode, "text:anchor-page-number", AncragePage);
}
return nodStudent;

20
src/app/attributs.java
View File

@ -289,17 +289,19 @@ public class attributs extends JFrame {
String codeEvaluateur = "‽";
node nodStyleParent = nod.retourneParentAyantLAttribut("style:name");
if(nodStyleParent!=null) {
String nomDuStle = nodStyleParent.getAttributs().get("style:name");
Pattern p = Pattern.compile("^P[0-9]{1,}$|^T[0-9]{1,}$");
Matcher m = p.matcher(nomDuStle);
if(m.find()) {
codeEvaluateur = "‼";
// Le code evaluateur ‼ que dans les nodes des styles de paragraphe
if(nod.chemin().contains("style:paragraph")) {
node nodStyleParent = nod.retourneParentAyantLAttribut("style:name");
if(nodStyleParent!=null) {
String nomDuStle = nodStyleParent.getAttributs().get("style:name");
Pattern p = Pattern.compile("^P[0-9]{1,}$|^T[0-9]{1,}$");
Matcher m = p.matcher(nomDuStle);
if(m.find()) {
codeEvaluateur = "‼";
}
}
}
for(int i = 0 ; i<Leslabels.size();i++) {
String value = Lesvaleurs.get(i).getText();

7
src/app/create.java
View File

@ -2381,14 +2381,7 @@ public class create extends JFrame {
Run.parentAndLevel(commandes.sujet, commandes.sujet, 0);
try {
Run.ecritureNodeEnXML(commandes.sujet, "test", commandes.PathFilenameAnalysis, "");
} catch (IOException e) {
e.printStackTrace();
}
DefaultMutableTreeNode root = null;
commandes.tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
commandes.tree.setExpandsSelectedPaths(true);