MAJ V4.2.2

Ajout la méthode evalLegacyStyleParentPresent
Ajoute des valeurs par défaut dans le style de paragraphe "style de
paragraphe par défaut"
This commit is contained in:
pablo rodriguez 2023-02-05 21:09:09 +01:00
parent b40b6edb05
commit 38a6723386
26 changed files with 307 additions and 8 deletions

Binary file not shown.

Binary file not shown.

4
bin/.gitignore vendored
View File

@ -7,3 +7,7 @@
/menucontextuel/
/sousmenuEvaluation/
/sousmenuRepresentation/
/resources/
/legacystyleparentpresent.svg
/menulegacystyleparentpresent.png
/menulegacystyleparentpresentmini.png

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,118 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="45"
height="45"
viewBox="0 0 11.90625 11.90625"
version="1.1"
id="svg5"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="legacystyleparentpresent.svg"
inkscape:export-filename="menulegacystyleparentpresent.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
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">
<sodipodi:namedview
id="namedview7"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
showgrid="false"
inkscape:zoom="15.982927"
inkscape:cx="24.307188"
inkscape:cy="19.42698"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g542"
showguides="true">
<sodipodi:guide
position="9.2206465,2.4538458"
orientation="0,-1"
id="guide621"
inkscape:locked="false" />
<sodipodi:guide
position="2.830755,9.0423867"
orientation="1,0"
id="guide623"
inkscape:locked="false" />
</sodipodi:namedview>
<defs
id="defs2" />
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1">
<g
id="g350"
transform="translate(-0.04532431,0.11331077)">
<g
id="g542"
transform="translate(-0.31727014,0.47590521)">
<path
style="fill:none;stroke:#333333;stroke-width:0.9;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:0.45, 0.45;stroke-dashoffset:0"
d="M 3.1933495,2.2746472 V 8.8631881 H 9.583241"
id="path679" />
<path
sodipodi:type="star"
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.856455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
id="path617"
inkscape:flatsided="false"
sodipodi:sides="5"
sodipodi:cx="8.9470472"
sodipodi:cy="8.6967802"
sodipodi:r1="8.5111504"
sodipodi:r2="4.2555752"
sodipodi:arg1="0.90523997"
sodipodi:arg2="1.5335585"
inkscape:rounded="0"
inkscape:randomized="0"
d="M 14.202656,15.391424 9.105479,12.949405 4.2041347,15.76392 4.9515186,10.161591 0.76015757,6.3698685 6.319243,5.3494581 8.6301837,0.19153018 11.318504,5.1632105 l 5.6196,0.6039478 -3.897612,4.0930778 z"
transform="matrix(0.30745241,0,0,0.31041134,0.51352941,-0.32966544)"
inkscape:transform-center-x="0.030104671"
inkscape:transform-center-y="-0.22320291" />
<path
sodipodi:type="star"
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.856455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
id="path619"
inkscape:flatsided="false"
sodipodi:sides="5"
sodipodi:cx="8.9470472"
sodipodi:cy="8.6967802"
sodipodi:r1="8.5111504"
sodipodi:r2="4.2555752"
sodipodi:arg1="0.90523997"
sodipodi:arg2="1.5335585"
inkscape:rounded="0"
inkscape:randomized="0"
d="M 14.202656,15.391424 9.105479,12.949405 4.2041347,15.76392 4.9515186,10.161591 0.76015757,6.3698685 6.319243,5.3494581 8.6301837,0.19153018 11.318504,5.1632105 l 5.6196,0.6039478 -3.897612,4.0930778 z"
transform="matrix(0.30745241,0,0,0.31041134,6.7213256,6.1429967)"
inkscape:transform-center-x="0.030104671"
inkscape:transform-center-y="-0.22320291" />
<text
xml:space="preserve"
style="font-size:8.30468px;line-height:1.2;font-family:Symbol;-inkscape-font-specification:Symbol;fill:#ffcc00;stroke-width:0.264583"
x="5.9957051"
y="6.193212"
id="text1238"
transform="scale(0.93137378,1.0736828)"><tspan
sodipodi:role="line"
id="tspan1236"
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Arial;-inkscape-font-specification:'Arial Heavy';fill:#ffcc00;stroke-width:0.264583"
x="5.9957051"
y="6.193212">?</tspan></text>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 944 B

View File

@ -2716,6 +2716,7 @@ public class meptl {
LeStyleDefaut = ensembleDesParagraphes.retourneFirstNodeByNameAndAttributValue("style:default-style","style:family","paragraph");
if(LeStyleDefaut==null) return ensembleDesParagraphes;
if(LeStyleDefaut!=null) {
if(LeStyleDefaut.getAttributs().get("style:master-page-name")==null)LeStyleDefaut.getAttributs().put("style:master-page-name","none");
node styleparagraphproperties = LeStyleDefaut.retourneFirstEnfantsByName("style:paragraph-properties");
if(styleparagraphproperties!=null) {
if(styleparagraphproperties.getAttributs().get("fo:margin-bottom")==null) styleparagraphproperties.getAttributs().put("fo:margin-bottom", "0");
@ -2723,7 +2724,19 @@ public class meptl {
if(styleparagraphproperties.getAttributs().get("fo:margin-right")==null) styleparagraphproperties.getAttributs().put("fo:margin-right", "0");
if(styleparagraphproperties.getAttributs().get("fo:margin-top")==null) styleparagraphproperties.getAttributs().put("fo:margin-top", "0");
if(styleparagraphproperties.getAttributs().get("fo:text-indent")==null) styleparagraphproperties.getAttributs().put("fo:text-indent", "0");
if(styleparagraphproperties.getAttributs().get("fo:line-height")==null) styleparagraphproperties.getAttributs().put("fo:line-height", "100%");
if(styleparagraphproperties.getAttributs().get("fo:orphans")==null) styleparagraphproperties.getAttributs().put("fo:orphans", "2");
if(styleparagraphproperties.getAttributs().get("fo:widows")==null) styleparagraphproperties.getAttributs().put("fo:widows", "2");
if(styleparagraphproperties.getAttributs().get("fo:border-bottom")==null) styleparagraphproperties.getAttributs().put("fo:border-bottom", "none");
if(styleparagraphproperties.getAttributs().get("fo:border-left")==null) styleparagraphproperties.getAttributs().put("fo:border-left", "none");
if(styleparagraphproperties.getAttributs().get("fo:border-right")==null) styleparagraphproperties.getAttributs().put("fo:border-right", "none");
if(styleparagraphproperties.getAttributs().get("fo:border-top")==null) styleparagraphproperties.getAttributs().put("fo:border-top", "none");
if(styleparagraphproperties.getAttributs().get("fo:keep-together")==null) styleparagraphproperties.getAttributs().put("fo:keep-together", "none");
if(styleparagraphproperties.getAttributs().get("fo:keep-with-next")==null) styleparagraphproperties.getAttributs().put("fo:keep-with-next", "none");
if(styleparagraphproperties.getAttributs().get("fo:break-after")==null) styleparagraphproperties.getAttributs().put("fo:break-after", "none");
if(styleparagraphproperties.getAttributs().get("fo:break-before")==null) styleparagraphproperties.getAttributs().put("fo:break-before", "none");
if(styleparagraphproperties.getAttributs().get("fo:text-align")==null) styleparagraphproperties.getAttributs().put("fo:text-align", "start");
}
}
}

View File

@ -11,7 +11,7 @@ import javax.swing.tree.TreePath;
import cXML.node;
import fenetres.create;
public class mnEvaluerATraversAnalyseStyleFalse extends AbstractAction{
public class actEvaluerATraversAnalyseStyleFalse extends AbstractAction{
{
putValue( Action.NAME, "N'évaluer pas le style dans la structure." );
putValue( Action.SHORT_DESCRIPTION, "N'évaluer pas le style:name de ce node dans la struture du fichier de l'étudiant" );

View File

@ -12,7 +12,7 @@ import javax.swing.tree.TreePath;
import cXML.node;
import fenetres.create;
public class mnEvaluerATraversAnalyseStyleTrue extends AbstractAction{
public class actEvaluerATraversAnalyseStyleTrue extends AbstractAction{
{
putValue( Action.NAME, "Evaluer le style dans la structure." );
putValue( Action.SHORT_DESCRIPTION, "Evaluer le style:name de ce node dans la struture du fichier de l'étudiant");

View File

@ -0,0 +1,27 @@
package action;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.ImageIcon;
import cXML.node;
import fenetres.create;
public class actEvaluerLegacyStyleParentFalse extends AbstractAction{
{
putValue( Action.NAME, "Supprime l'évaluation de la présence ou absence du style Parent." );
putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la présence ou absence du style Parent." );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) );
}
private static final long serialVersionUID = 1L;
@Override
public void actionPerformed(ActionEvent e) {
node nod = (node) fenetres.create.getSelectNode().getUserObject();
nod.supprimeAttribut("evalLegacyStyleParentPresent");
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
}
}

View File

@ -0,0 +1,51 @@
package action;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.ImageIcon;
import javax.swing.JOptionPane;
import cXML.node;
import fenetres.baliseStyle;
import fenetres.create;
public class actEvaluerLegacyStyleParentTrue extends AbstractAction{
{
putValue( Action.NAME, "Oui, combien de point?" );
putValue( Action.SHORT_DESCRIPTION, "Evaluer la présence ou l'absence du style Parent.");
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")));
}
private static final long serialVersionUID = 1L;
@Override
public void actionPerformed(ActionEvent e) {
node nod = (node) fenetres.create.getSelectNode().getUserObject();
int point = 0;
if(nod.getAttributs().get("evalLegacyStyleParentPresent")!=null) {
point = Integer.valueOf(nod.getAttributs().get("evalLegacyStyleParentPresent"));
}
String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
if(a!=null) if(!a.isEmpty()) {
try {
point = Integer.valueOf(a);
if(point<=0) {
nod.getAttributs().put("evalLegacyStyleParentPresent", String.valueOf(0));
fenetres.create.getTextNodeSelect().setText(baliseStyle.balise());
fenetres.create.getTextNodeSelect().setText("<h2>Erreur la valeur doit être un nombre entier POSITIF supérieur à zéro.<br>Cependant,la valeur a été modifiée.<br>evalNameLegacyStyle=0.</h2>");
}else {
nod.getAttributs().put("evalLegacyStyleParentPresent", String.valueOf(point));
}
} catch (Exception e2) {
fenetres.create.getTextNodeSelect().setText(baliseStyle.balise());
fenetres.create.getTextNodeSelect().setText("<h2>Erreur la valeur doit être un nombre entier.<br>L'attribut n'a pas été modifiée.</h2>");
}
}
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
}
}

View File

@ -37,7 +37,7 @@ public class actEvaluerNomDuStyleHeriteTrue extends AbstractAction{
try {
point = Integer.valueOf(a);
if(point<=0) {
nod.getAttributs().put("evalNameNode", String.valueOf(0));
nod.getAttributs().put("evalNameLegacyStyle", String.valueOf(0));
fenetres.create.getTextNodeSelect().setText(baliseStyle.balise());
fenetres.create.getTextNodeSelect().setText("<h2>Erreur la valeur doit être un nombre entier POSITIF supérieur à zéro.<br>Cependant,la valeur a été modifiée.<br>evalNameLegacyStyle=0.</h2>");
}else {

View File

@ -174,6 +174,14 @@ public class calculNombrePointEvaluation {
}
}
if(nod.getAttributs().get("evalLegacyStyleParentPresent")!=null) {
try {
point = point + Integer.valueOf(nod.getAttributs().get("evalLegacyStyleParentPresent"));
} catch (Exception e) {
JOptionPane.showInternalMessageDialog(null, "Erreur dans la valeur de l'attribut evalLegacyStyleParentPresent");
}
}
if(nod.getAttributs().get("evalNombreDePageMaxi")!=null) {
try {
String valeur = nod.getAttributs().get("evalNombreDePageMaxi");

View File

@ -418,6 +418,11 @@ public class evaluationAttribut {
retour = evalNombreDePageMini(sujet,nodeStudent,retour,nameElt);
}
//evaluation de la présence ou de l'absence du style Parent
if(k.equals("evalLegacyStyleParentPresent") && sujet.getNomElt().equals("style:style")) {
retour = evalPresenceStyleParent(sujet,nodeStudent,retour,nameElt);
}
}
}
@ -891,7 +896,33 @@ public class evaluationAttribut {
return retour;
}
private static node evalPresenceStyleParent(node sujet,node nodeStudent, node retour, String nameElt) {
boolean presentSujet = false;
boolean presentStudent = false;
int point = 0;
if(sujet.getAttributs().get("evalLegacyStyleParentPresent")!=null) {
String valeur = sujet.getAttributs().get("evalLegacyStyleParentPresent");
point = Integer.valueOf(valeur);
}
if(sujet.getAttributs().get("style:parent-style-name")!=null) {
presentSujet=true;
}
if(nodeStudent!=null) {
if(nodeStudent.getAttributs().get("style:parent-style-name")!=null) {
presentStudent=true;
}
retour = evaluationLegacyStyleParentPresent(retour,String.valueOf(presentStudent), String.valueOf(presentSujet), String.valueOf(point),"Présence style Parent");
}else {
retour = evaluationLegacyStyleParentPresent(retour,"null", String.valueOf(presentSujet), String.valueOf(point),"Présence style Parent");
}
return retour;
}
/**
* Méthode evalPasParagrapheVide.</br>
@ -1374,6 +1405,27 @@ public class evaluationAttribut {
return retour;
}
/**
*
* @param retour
* @param reponseStudent
* @param reponseSujet
* @param point
* @param nameElt
* @return
*/
private static node evaluationLegacyStyleParentPresent(node retour, String reponseStudent, String reponseSujet, String point, String nameElt) {
node item = null;
if(reponseStudent!=null) {
//compare la même valeur "contenuParagraph" pour obtenir les points mais si un voisinage du contenu.
item = retourneNoteAvecResultatsAnalyse("Présence Style Parent","", reponseStudent , reponseSujet + "" +point, nameElt );
}else {
evaluation.IncrementPointTotal(Integer.valueOf(point));
item = new node("Présence Style Parent", "Erreur : -"+ point, "" , "null", reponseSujet , 2, evaluation.getPointEnJeu(),nameElt);
}
retour.getNodes().add(item);
return retour;
}
/**

View File

@ -80,6 +80,7 @@ public class afficheText extends JEditorPane {
String imageEvalPasParagrapheVide= "<img src="+afficheText.class.getResource("/resources/evalpasparagraphevidemini.png").toString()+">";
String imageEvalNombreDePageMaxi= "<img src="+afficheText.class.getResource("/resources/evalnombredepagemaximini.png").toString()+">";
String imageEvalNombreDePageMini= "<img src="+afficheText.class.getResource("/resources/evalnombredepageminimini.png").toString()+">";
String imageEvalLegacyStyleParentPresent= "<img src="+afficheText.class.getResource("/resources/menulegacystyleparentpresentmini.png").toString()+">";
StringBuilder sb = new StringBuilder();
@ -267,6 +268,9 @@ public class afficheText extends JEditorPane {
if(Lesattributsdunode.get(i).equals("evalNombreDePageMini") && !nod.getAttributs().get(Lesattributsdunode.get(i)).isEmpty()) {
sb.append("<li class=\"p4\">"+imageEvalNombreDePageMini+ "<b> " + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</b></li>");
}
if(Lesattributsdunode.get(i).equals("evalLegacyStyleParentPresent") && !nod.getAttributs().get(Lesattributsdunode.get(i)).equals("0")) {
sb.append("<li class=\"p4\">"+imageEvalLegacyStyleParentPresent+ "<b> " + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</b></li>");
}
// sb.append("<li class=\"p4\"><b>" + Lesattributsdunode.get(i) + "=\"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</b></li>");
}

View File

@ -59,6 +59,7 @@ public class listeAttributsAnalyseWriter {
case "evalPasParagrapheVide": return true;
case "evalNombreDePageMaxi": return true;
case "evalNombreDePageMini": return true;
case "evalLegacyStyleParentPresent": return true;
case "analysis_filename": return true;
case "auteur": return true;

View File

@ -22,6 +22,7 @@ import sousmenuEvaluation.mnEvalAncrageNumeroAbsoluPage;
import sousmenuEvaluation.mnEvalEnteteActive;
import sousmenuEvaluation.mnEvalEntetePasActive;
import sousmenuEvaluation.mnEvalFormatageDirect;
import sousmenuEvaluation.mnEvalLegacyStyleParentPresent;
import sousmenuEvaluation.mnEvalNameLegacyStyle;
import sousmenuEvaluation.mnEvalNameNode;
import sousmenuEvaluation.mnEvalNamePage;
@ -133,6 +134,8 @@ public class MnGroupeMethodeEvaluer {
if(nod.getNomElt().equals("style:style")) {
mnGroupeMethodeEvaluer.addSeparator();
mnGroupeMethodeEvaluer.add(mnEvaluerATraversAnalyseStyle.menu());
mnGroupeMethodeEvaluer.addSeparator();
mnGroupeMethodeEvaluer.add(mnEvalLegacyStyleParentPresent.menu());
}
if(nod.getNomElt().equals("meta:initial-creator")) {

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 944 B

View File

@ -0,0 +1,18 @@
package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.actEvaluerLegacyStyleParentFalse;
import action.actEvaluerLegacyStyleParentTrue;
import fenetres.create;
public class mnEvalLegacyStyleParentPresent {
public static JMenu menu(){
JMenu mnEvaluerATraversAnalyseStyle = new JMenu("Evaluer la présence ou l'absence du style Parent");
mnEvaluerATraversAnalyseStyle.setIcon(new ImageIcon(create.class.getResource("/resources/menulegacystyleparentpresentmini.png")));
mnEvaluerATraversAnalyseStyle.add(new actEvaluerLegacyStyleParentTrue());
mnEvaluerATraversAnalyseStyle.add( new actEvaluerLegacyStyleParentFalse());
return mnEvaluerATraversAnalyseStyle;
}
}

View File

@ -3,8 +3,8 @@ package sousmenuEvaluation;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import action.mnEvaluerATraversAnalyseStyleFalse;
import action.mnEvaluerATraversAnalyseStyleTrue;
import action.actEvaluerATraversAnalyseStyleFalse;
import action.actEvaluerATraversAnalyseStyleTrue;
import fenetres.create;
/**
@ -17,8 +17,8 @@ public class mnEvaluerATraversAnalyseStyle{
public static JMenu menu(){
JMenu mnEvaluerATraversAnalyseStyle = new JMenu("Evaluer le style dans la structure");
mnEvaluerATraversAnalyseStyle.setIcon(new ImageIcon(create.class.getResource("/resources/atraversanalysestylemini.png")));
mnEvaluerATraversAnalyseStyle.add(new mnEvaluerATraversAnalyseStyleTrue());
mnEvaluerATraversAnalyseStyle.add( new mnEvaluerATraversAnalyseStyleFalse());
mnEvaluerATraversAnalyseStyle.add(new actEvaluerATraversAnalyseStyleTrue());
mnEvaluerATraversAnalyseStyle.add( new actEvaluerATraversAnalyseStyleFalse());
return mnEvaluerATraversAnalyseStyle;
}