V4.5.0
ajoute pour l'attribut evalPlacement des nodes. analyseStyle peut être utilisé à partir de l'analyse d'un frame.
This commit is contained in:
parent
4cc03b0938
commit
dbc60434a0
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -162,7 +162,10 @@ public class analyseFichier {
|
||||
if(nod.getNomElt().equals("frames")) {
|
||||
if(nod.getAttributs().get("evaluer")!=null) {
|
||||
if(nod.getAttributs().get("evaluer").equals("true")) {
|
||||
nodframes = analyseLesNodesPrincipaux.analyseLesFrames(nodStudent.retourneFirstEnfantsByName("frames"), nod, a, nodmenu);
|
||||
node nodSujetParagraphs = null;
|
||||
if(nodSujet.retourneFirstEnfantsByName("style:paragraph").getNomElt().equals("style:paragraph")) nodSujetParagraphs = nodSujet.retourneFirstEnfantsByName("style:paragraph");
|
||||
node nodStudentParagraphs = nodStudent.retourneFirstEnfantsByName("style:paragraph");
|
||||
nodframes = analyseLesNodesPrincipaux.analyseLesFrames(nodStudent.retourneFirstEnfantsByName("frames"), nod,nodSujetParagraphs, nodStudentParagraphs,a, nodmenu);
|
||||
ordre.add("frames");
|
||||
}
|
||||
}
|
||||
|
@ -200,7 +200,7 @@ public class analyseLesNodesPrincipaux {
|
||||
* @param nodmenu
|
||||
* @return
|
||||
*/
|
||||
public static node analyseLesFrames(node nodStudentFrames, node nodSujetFrames, Run a, node nodmenu) {
|
||||
public static node analyseLesFrames(node nodStudentFrames, node nodSujetFrames, node nodSujetParagraphes, node nodStudentParagraphes,Run a, node nodmenu) {
|
||||
node nodframes = new node();
|
||||
nodframes.setNomElt("frames");
|
||||
nodframes.setAttributs(nodSujetFrames.getAttributs()); //ajoute tous les attributs du sujet
|
||||
@ -254,7 +254,7 @@ public class analyseLesNodesPrincipaux {
|
||||
//************************************
|
||||
//** analyse tous les nodes enfants **
|
||||
//************************************
|
||||
frame = analyseLesNodesEnfants.nodeNext(frame, "ana:frame", frameStudent, null, null, frameSujet, null, null, nodmenu,a);
|
||||
frame = analyseLesNodesEnfants.nodeNext(frame, "ana:frame", frameStudent, null, null, frameSujet, nodSujetParagraphes, nodStudentParagraphes, nodmenu,a);
|
||||
|
||||
//****************************************************************
|
||||
//** Insère les attributs des points dans les node de l'analyse **
|
||||
|
@ -30,6 +30,15 @@ public class listeDesNodesEvalPlacement {
|
||||
case "text:conditional-text": return true;
|
||||
case "text:database-display": return true;
|
||||
case "text:s": return true;
|
||||
case "text:sender-company": return true;
|
||||
case "text:sender-street": return true;
|
||||
case "text:sender-postal-code": return true;
|
||||
case "text:sender-city": return true;
|
||||
case "text:sender-phone-work": return true;
|
||||
case "text:sender-email": return true;
|
||||
case "text:hidden-text": return true;
|
||||
case "text:hidden-paragraph": return true;
|
||||
|
||||
|
||||
default:
|
||||
return false;
|
||||
|
Loading…
x
Reference in New Issue
Block a user