From b17cf118d73e39648bda2bb0b660e1da38ba8e17 Mon Sep 17 00:00:00 2001
From: pablo rodriguez <58742538+1-pablo-rodriguez@users.noreply.github.com>
Date: Wed, 18 Dec 2024 11:01:48 +0100
Subject: [PATCH] maj
---
base_evaluations_analyseCalc.xml | 2 +-
.../Classeur2$feuille$graphic.class | Bin 25656 -> 25656 bytes
...ur2$feuille$ligne$cellule$validation.class | Bin 3748 -> 3748 bytes
.../Classeur2$feuille$ligne$cellule.class | Bin 15317 -> 15317 bytes
bin/AnalyseCalc/Classeur2$feuille$ligne.class | Bin 6461 -> 6461 bytes
bin/AnalyseCalc/Classeur2$feuille.class | Bin 13743 -> 13766 bytes
bin/AnalyseCalc/Classeur2.class | Bin 23228 -> 22715 bytes
src/AnalyseCalc/Classeur2.java | 136 ++++++++----------
src/xml/node.java | 2 +-
sujet.xml | 2 +-
10 files changed, 62 insertions(+), 80 deletions(-)
diff --git a/base_evaluations_analyseCalc.xml b/base_evaluations_analyseCalc.xml
index 52f35e1..da85b8c 100644
--- a/base_evaluations_analyseCalc.xml
+++ b/base_evaluations_analyseCalc.xml
@@ -1 +1 @@
-![]()
EJ €- € €- €???Page 1(???)???, 00/00/000000:00:00Page 1/ 99
\ No newline at end of file
+![]()
EJ €- € €- €???Page 1(???)???, 00/00/000000:00:00Page 1/ 99![]()
EJ €- € €- €???Page 1(???)???, 00/00/000000:00:00Page 1/ 99
\ No newline at end of file
diff --git a/bin/AnalyseCalc/Classeur2$feuille$graphic.class b/bin/AnalyseCalc/Classeur2$feuille$graphic.class
index ec4cc0a77c3b0e227f19d34d322615e62ca0c1a9..47c156f61da182e5df964cc454c3cd9e8faee28a 100644
GIT binary patch
delta 1915
zcmW;Md7RGm768KxMLNcN>{U0XGheJtHDDBS1u{BzFxoc})OkCVS&=kM3Kqw9x$SKqix>WsUr
z?zt1ZG$&``#qv1Fi$
zEJ0J*fdnZ)GtZ#87mF5Nd$jb1qm?%gt-Ty1dPmXLJB4;$5nlF{M|)p0yy6>xSA8M;
z!}lpV_;#bC?-Dxs1+V$5qqDywy7)(;tA7!?`8T4w{{(vY@1bX)ERtdaP0=fmjNXB%
z=o46mzJXon7r2PzC=dOkYGXiDcMQxc(Qv2J>DkAcz7iU&_F#y*hM_td!*o1`>mo#W)kdcvBt|Ogu770w$YQm|~JJ&7@$uNk^uc
zgxTg@%rQBbYmOqz{DgVt3g(+aEU=~Uj%|X4HU*39%*t477vn>_4jOGORms?<(($z#hV5!RzEN4&p_b!Y
zwGum34tA+re5X!gw|am*T4Aqt*r%&uzwU$sdJGQg_i;$)k-DjvCi;V-ukf4lea*nNa2ZYiF+@2K2m
zYWQhThYq1e1QJN3P>@LvpVNnf^y3x-EX61`Vl?})3K(~V`Hx?o5Xm7
z*vy;8=H7d(?JZ>+?{l{Ga@fw>6Yj_OYF?@KwvbP)&{LSJmvf_D%T4+yztrdXmA=o-Mste^Fy92Z)imWcGk{;4>D+EsaktqJ;`ioD
z?lGsi*Zj?WHir9cJ07sZdC)H4A)Cv?_9Tzk2R!O3@(0(NKf1v@=H~La%i#(4BTu@!
zJcV*RjTd+ZaXgETJcrTz1(WzI-ev(-@B;SoH(cjM7US=%$4l(R%go?)hGy^v=dzG1
zc$2GniyL{Hn|X(4`3IlyPw{wHqIpl^d0&!PB$N19GWkT-ijq9hk}pPn7Asf9c}C!g
z&?_n8l@ZTN5TBPKelJssd8?(kw@FHPhoz)rK*7Z((S|{B
ndP+ovVNHvudU{aLjA&GPUCdRGtnAOy`{)JX-80$62Uq_;hBEuF
delta 1915
zcmW;MXLQw776tIz_CEjjl2D~ei5d){h0qgf0C6M?9Skj`&{-5gU_$W;$k0KFjx!@j
zks^>Wfs7Ck5Tti$4ka@NkzRFxP?Y%A`*eTzeA{>3v-1z>{6ji-OvAucwbNZw7u>jNJ<&bTe|Nv=?e14y;Qp^)xQ8avJu+?GV>8GVnZLRx
z=1cd~9C6Rg9rxUpa4&2*S8SU?*>=#j4~(4vXJ-L+9%vWCZ#N;#oM6hMTlfD$eq
zC0#$1a??=SEk_x*2W8zAly|pK0pX~KdZ>i1sEl!V86TqxwxBA`qZ*!}I;$X(t?&v{
z@hWE^igQte8}T}iBbxV7Q%WO78lsLQpsut-taL465)7Y!wlfyOcdO=LWp$z;UK
zQY6SOG?zlO@C;gdQE26LKx=Op+IaJj=w+j=cLMFbb9lomLI+KlujWEnff~
zeJhdV+lx-VtN62D(Agh@F8(BR^^Za~|6+9aZ$c0M8T9l&La(q2=p7XnkGI46AvtUs
z`h+b<->^OC7j^~x!#xZLuZxuM?nuom)p)nlgR)M=zZn>;_G5^;iJ>|I!*m>m>s}b4
zGci&x!)Uz%WAu8A)m!n7K8bPqGREs-ylcWR(Nw}D6Nf1#0aHzDOf$VO-K1cK$-qpL
ziP`2O%rV)RYffOE`2q9Ibu2J?in#-H6X@E|%LpSZNPq
zjlG1m_69cOeVwq|7syc_HmPuIR#lOwY9n7Y#5UCw+f_e&qcX5V4aH710lU;(e5+Pq
zw_1%oDjVOaTwAaaec45j_@1^~X4-^Ko1k;Dk{)X`=8SQwQfw
zeOxd-anbb0C6gLJffU!XrOT}|H3BS2T_}wkR3-?bHyU(fIchv40
z4g9pIM0WcXBkGY2}`gqD=?iEIfRuskCpiqU*>66;bT^n
z%B&`@v%0ioq$Khc>Bv{53ty9ojFM%nA^TWYj;p7%N1d289;%jO&2{@{6vZ{?Nga8ClAm7iVIOYEkau)9iT4>g&+)l$B#
zb}?BMvX3_GtE1Rox8ndkm;?1}rt0-f(?^-E?{bhS$-yR$Lrf12H4`|@e9GZw8%LN+
z9BF>%C|jMQZ6e3o434w2INq+~yY?_A*xQ`wB6@R@i)E(k#wl(*r@Bx0p4-ZRyTJF|
zb52Lq;4Zi32T0>A%;apW;T#+c?)J^#b9tQ4T3o{>xmJD4FV%6bSJ$~g6>+21%+}<;bS-|R
z8!<;GGgnXLCcT22^#VB6X1UH
zZyqq`dC>gELpG9!ZF?TE!+6v#;4z!a3-KN=V-BT3K$rmz%#j-)P!g&oSxS4yq>Oh;%6gaNC9hD*h5MY8_tlgNzD^RE
zm(;h8>lLG7q?YO~wbc}kya*GTALfvHtSf*dfg!_F|AzI{DILrDWpRKV|CY%B2r^@
z&yczYl^oKiLG=%*AT?U2hEypnI@qp>Y3=p!(EYQtSUoDF!l2#>sYZINo)FTApfW?s
pNsrdkLb?;w^pIjQV)d+$MrYK=Tm_kz^+iUqUKpH}%_=!4<_{M;`)vRK
diff --git a/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule$validation.class b/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule$validation.class
index a5e067a7cc7ce51a2ae3d242346dd09a13cc2bd9..50a0c71f957dd59a59e72a5dffb0eab371de73c1 100644
GIT binary patch
delta 221
zcmW;Azb^xE9Eb7u=X)vc>D^InMRBLCA6FqFgbwYY5+vb0({yc6KwpC!qcjFV=9lY;2x4nVZ
LlH3k_CprED3wJ10
delta 221
zcmW;Ay-LGi97gfy|AwMDCb9Oz@5HuNV?j|U6qJA>x`~_6!O6kF(b2`#LFn+Vjvbst
zZ@_C1x;Z(z33>r4T@F9aFde4Pk5ji3YB8xJLS2IHh%_M93yDTd>z%SbspyNU%}}#0
zbvt9$&Y80-7VVxTdt%w%NbQ@<)mU*o8m>>%-OzFmth!g)?t`_!u^wdP!2zA%m`zVTd}_t`{lvNLkF}HJ
JcIf-b$sgD2CxZY0
diff --git a/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule.class b/bin/AnalyseCalc/Classeur2$feuille$ligne$cellule.class
index d606db35ab115a8eadb84d03907ad516d8769517..667eda2f2682153442906ed3d5c2546685727ad5 100644
GIT binary patch
delta 1214
zcma))`*+WE9LL|+&-eMPme7#SNn*Z3wJBp4JIpj~!;V$TTxNz%V;hUvM&FoYY$5wP
zn@c%1g+sdS96EKFPNOkqZiieNjZ>{tNO3~+Ip4p)Z;$hQK3~5)&g*pH>B28=_41_&
zVua{`L=lW6(H+U62S$nB7%loCMGV4N5rqLF-v}n*|HV6N+VBsk*|_5N9AFz@}ofQ@!=hH9`n=#
z%-6k8s7GRf&Owo0jbdGg5`6{>^mMvBYGd)Kp-p`5ep4NtBt}SZ<$2xgClM
zn~C>r8CKezSZ$Bt1A7x|oUW*JV&HeuvDPU?m9q`iP7~HU*Ravk86SDV24j*`P>}kU%u-J;8*oJs)M>=*Q3!kC{U)J>sDX_l14=HV*E3Mv@w%?WZohz-u
zm3B}pL!;P%L!udn#Z5HHt~erNa8#zFS(f6M+=dp}gyZrWPRM&WsXF77>V`8a1ZP!0
z{HUUQIHyu^QBA;4Dif`0CN3!-E~_g1thS>~?ZOpx09VyT{Gu-5S9Ke$+Tex`!e6=*
zZt9-+TZiKx9f?~y9=CNO{?+4gM`z=%&c{7ng8%elD!qYP*V5=+w7QNS{XL-@Nj>rm
zAJMIRRJZdneVvc%2kc-xe8O~MN7Id+jh9cFFb11wb}_^Fj2XoqW;&lWi`d&NV~D9>
zAG4W#>(2LYkWYn)Acl+X93Z@WNks5vF`NTM3M1;iet{m}5D~&yk;I`QmBYk1#)(W0
z7sZShOF2TU;wxeu6GSav6)j8@_n9Q0XR=J=X!$P3$XcezgG`mpd`+I<>+%-gl=u0T
zQXH@PFij(Q~c-EDt&+phk^m@s+WUlcR(
EfBX7Fi~s-t
delta 1214
zcma))=~LBp7{$Nq@19dJriPfkATzwA6Q;&q7ovZqJUzcAl?*QF*L4Q
zRF+sl5n~fG>5P-wf*XljjH$U0*`zIMmNshGZ|+~V#n6GyD@R~Y2Z7^-cyhIOW*n)M2yJf*R)v-tlzD7Ei=ryyr>BR*w(0
zo^9CX*^duB9ry?qb?A+HB;sRa;8WzF5vBONsZUs;_3ge#X?t90dtGT?xzfINr8T?K
z_KW2>C_cd<(TWyv9pA|i9F}otl^Hl9%W+iJ;h1c}ad`zNYiM*Wt!|{Fn+W|4sSofzJ@O>)
z*XQ|wzRVzfm0k2*K4?7bYPzwT>B)zTm%%22JxnY^%ut4!QGC>7v$rW@m|4!grjlOs
zKKnJD>Hn>KI8p?0fat|%gqP2XC=L|E7$wGVP}9z*=<&siFg`C*I8>xDK}_HotU?3kD6K)T?d8?Zz$zy@+%NVb0
z3(&2Y2ze?%Lt?}2S$B6XaKAJ*Qnm;31F>Ft(SJ2I-u~vczq@USKRGT!Uh^-EoBThq
Cf<&GG
diff --git a/bin/AnalyseCalc/Classeur2$feuille$ligne.class b/bin/AnalyseCalc/Classeur2$feuille$ligne.class
index fea291aff3c4acad541a9e4b5e607b3527362846..3b47a849f23b07edd620cda3bb3e9ff6a83d1a71 100644
GIT binary patch
delta 394
zcmajY&nv@m9LMqZ`}4J4lY=RAU{hj178nWSJ2MZ%Y!y!tDL|lTFBBcI;XlSaYwidURpolX>(EYL$
zl_dt1(v`LnO6WrA64`CY?l-L;=O1W#KfKTIjk=@mpvTfaPq`SQe2kNd39@05N-;$a
zOj9*x$cF{0!y+|ciMkM^K`c`kD|ChsWe{c)R$0Ru*I=Dnu)*Dk@BlV>2wOagZ9bAW
ziQUksr79bD6QsS)J@Kl#+58
aDlc+!rJ*({x1lkqT7AFB$0NF;dH(?0Ep^)f
diff --git a/bin/AnalyseCalc/Classeur2$feuille.class b/bin/AnalyseCalc/Classeur2$feuille.class
index e6a7ff0ba6baa9c689881a480e28baa18ffe03a0..b9ddf7e27571b65ff36ba45999d4dab74e91f62d 100644
GIT binary patch
delta 5468
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
E2Z-tob^rhX
diff --git a/bin/AnalyseCalc/Classeur2.class b/bin/AnalyseCalc/Classeur2.class
index bd328eaaa91bf351fccf8e96c8dcf73fe2fa28c7..e9b417ce473da9b27dce3b71e5275552c5788ae4 100644
GIT binary patch
delta 2790
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 axeYsecondaire = new TreeMap();
private TreeMap series = new TreeMap();
-
+ //chargement sujet
public graphic(node nodeGraphic ) {
- //chargement sujet
if(nodeGraphic.getAttributs().get("nomObjet")!=null) nomObjet = nodeGraphic.getAttributs().get("nomObjet");
if(nodeGraphic.getAttributs().get("type")!=null) type = nodeGraphic.getAttributs().get("type");
if(nodeGraphic.getAttributs().get("evaluer")!=null) evaluer = nodeGraphic.getAttributs().get("evaluer");
@@ -1987,7 +1986,7 @@ public class Classeur2 {
}
/**
- * Chragement d'une nouvelle ligne
+ * Chargement d'une nouvelle ligne
* @param nodeLigne : nodeAC de la ligne actuelle
* @param numLigne : numéro de la ligne
* @param XMLContent
@@ -2638,34 +2637,64 @@ public class Classeur2 {
* @author Pablo
*
*******************************************/
- public class formatConditionnel{
- private String Refdata ;
- private String evaluer = "false";
- private String communication ="";
- private String titre="";
- private boolean saut = false;
- private String styletitrePrincipale = "H1";
+ public class formatConditionnel{
private TreeMap conditionalformat = new TreeMap();
-
+ private TreeMap styleFormatConditionnel = new TreeMap();
+
// chargement dans le node sujet.
public formatConditionnel(node nodeFormatsConditionnels ) {
+ if(nodeFormatsConditionnels.getAttributs().get("targetRangeAddress")!=null) conditionalformat.put("targetRangeAddress", nodeFormatsConditionnels.getAttributs().get("targetRangeAddress"));
+ if(nodeFormatsConditionnels.getAttributs().get("styleName")!=null) conditionalformat.put("styleName", nodeFormatsConditionnels.getAttributs().get("styleName"));
+ if(nodeFormatsConditionnels.getAttributs().get("condition")!=null) conditionalformat.put("condition", nodeFormatsConditionnels.getAttributs().get("condition"));
+ if(nodeFormatsConditionnels.getAttributs().get("baseCellAddress")!=null) conditionalformat.put("baseCellAddress", nodeFormatsConditionnels.getAttributs().get("baseCellAddress"));
}
// Chargement depuis le classeur de l'étudiant.
public formatConditionnel(node nodeFormatConditionnel,node nod, Integer indexStudent ) {
- if(nodeFormatConditionnel.getAttributs().get("calcext:target-range-address")!=null) conditionalformat.put("target-range-address", nodeFormatConditionnel.getAttributs().get("calcext:target-range-address"));
+ if(nodeFormatConditionnel.getAttributs().get("calcext:target-range-address")!=null) conditionalformat.put("targetRangeAddress", nodeFormatConditionnel.getAttributs().get("calcext:target-range-address"));
for (node condition : nodeFormatConditionnel.getEnfants()) {
if(condition.getAttributs().get("calcext:apply-style-name")!=null) conditionalformat.put("styleName", condition.getAttributs().get("calcext:apply-style-name"));
if(condition.getAttributs().get("calcext:value")!=null) conditionalformat.put("condition", condition.getAttributs().get("calcext:value"));
- if(condition.getAttributs().get("calcext:base-cell-address")!=null) conditionalformat.put("base-cell-address", condition.getAttributs().get("calcext:base-cell-address"));
+ if(condition.getAttributs().get("calcext:base-cell-address")!=null) conditionalformat.put("baseCellAddress", condition.getAttributs().get("calcext:base-cell-address"));
+ node nodeStyle = nod.retourneFirstEnfant("style:style", "style:display-name", condition.getAttributs().get("calcext:apply-style-name"));
+ if(nodeStyle!=null) {
+ if(nodeStyle.getAttributs().get("style:family")!=null) styleFormatConditionnel.put("styleFamily", nodeStyle.getAttributs().get("style:family"));
+ if(nodeStyle.getAttributs().get("style:parent-style-name")!=null) styleFormatConditionnel.put("parentStyleName", nodeStyle.getAttributs().get("style:parent-style-name"));
+ if(nodeStyle.getAttributs().get("style:data-style-name")!=null) styleFormatConditionnel.put("dataStyleName", nodeStyle.getAttributs().get("style:data-style-name"));
+
+ node b = nodeStyle.retourneFirstEnfant("style:table-cell-properties");
+ if(b!=null) {
+ if(b.getAttributs().get("fo:background-color")!=null) styleFormatConditionnel.put("arrierPlan", b.getAttributs().get("fo:background-color"));
+ }
+
+ b = nodeStyle.retourneFirstEnfant("style:text-properties");
+ if(b!=null) {
+ if(b.getAttributs().get("style:font-name")!=null) styleFormatConditionnel.put("police", b.getAttributs().get("style:font-name"));
+ if(b.getAttributs().get("fo:font-family")!=null) styleFormatConditionnel.put("policeFamille", b.getAttributs().get("fo:font-family"));
+ if(b.getAttributs().get("style:font-style-name")!=null) styleFormatConditionnel.put("nomStylePolice", b.getAttributs().get("style:font-style-name"));
+ if(b.getAttributs().get("fo:font-size")!=null) styleFormatConditionnel.put("taille", b.getAttributs().get("fo:font-size"));
+ if(b.getAttributs().get("fo:font-style")!=null) styleFormatConditionnel.put("stylePolice", b.getAttributs().get("fo:font-style"));
+ if(b.getAttributs().get("fo:font-weight")!=null) styleFormatConditionnel.put("policeGras", b.getAttributs().get("fo:font-weight"));
+ }
+ }
+
+
+
}
}
-
-
-
+
+ public TreeMap getConditionalformat() {
+ return conditionalformat;
+ }
+
+ public TreeMap getStyleFormatConditionnel() {
+ return styleFormatConditionnel;
+ }
+
+
} // formatConditionnel
@@ -2878,72 +2907,25 @@ public class Classeur2 {
* @throws IOException
*/
private void ecritureFormatsConditionnels(StringBuilder fichier, formatConditionnel k1, String prefix ) throws IOException {
- fichier.append(prefix+"");
+ fichier.append(prefix+"");
fichier.append("" ) ;
- fichier.append(prefix+" k2 : k1.getPropertiesGraphic().entrySet()) {
+ fichier.append(prefix+" k2 : k1.getConditionalformat().entrySet()) {
fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ;
}
- fichier.append(">");
-
- fichier.append(prefix+" k2 : k1.getTitre().entrySet()) {
- fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ;
- }
- fichier.append(">");
-
- fichier.append(prefix+" k2 : k1.getSoustitre().entrySet()) {
- fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ;
- }
- fichier.append(">");
-
- fichier.append(prefix+" k2 : k1.getAiregraphic().entrySet()) {
- fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ;
- }
- fichier.append(">");
-
- fichier.append(prefix+" k2 : k1.getAxeXprincipal().entrySet()) {
- fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ;
- }
- fichier.append(">");
-
- fichier.append(prefix+" k2 : k1.getAxeYprincipal().entrySet()) {
- fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ;
- }
- fichier.append(">");
-
- fichier.append(prefix+" k2 : k1.getAxeXsecondaire().entrySet()) {
- fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ;
- }
- fichier.append(">");
-
- fichier.append(prefix+" k2 : k1.getAxeYsecondaire().entrySet()) {
- fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ;
- }
- fichier.append(">");
-
- fichier.append(prefix+" k2 : k1.getLegend().entrySet()) {
- fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ;
- }
- fichier.append(">");
-
- fichier.append(prefix+" k2 : k1.getSeries().entrySet()) {
- fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ;
- }
- fichier.append(">");
+ fichier.append(">");
-
- fichier.append(prefix+"");
+ fichier.append(" k2 : k1.getStyleFormatConditionnel().entrySet()) {
+ fichier.append(" " + k2.getKey() + "=\"" + k2.getValue() + "\"" ) ;
+ }
+ fichier.append(">");
+
+ fichier.append("");
+
+ fichier.append(prefix+"");
}
diff --git a/src/xml/node.java b/src/xml/node.java
index e64040d..75f9554 100644
--- a/src/xml/node.java
+++ b/src/xml/node.java
@@ -225,7 +225,7 @@ protected boolean nodeClose = false;
/**
* Retourne le premier node ayant le nameNode et ayant l'attribut nameAttribut avec comme valeur valueAttribut.
- * Sinom retourne un null.
+ * Sinon retourne un null.
* @param nameNode
* @param nameAttribut
* @param valueAttribut
diff --git a/sujet.xml b/sujet.xml
index 499c137..da2e7c7 100644
--- a/sujet.xml
+++ b/sujet.xml
@@ -1 +1 @@
-![]()
EJ €- € €- €???Page 1(???)???, 00/00/000000:00:00Page 1/ 99
\ No newline at end of file
+![]()
EJ €- € €- €???Page 1(???)???, 00/00/000000:00:00Page 1/ 99
\ No newline at end of file