From 2c7837f84deedb736f83cbb418b48dd4e5b8bfc2 Mon Sep 17 00:00:00 2001 From: pablo rodriguez <58742538+1-pablo-rodriguez@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:21:19 +0200 Subject: [PATCH] MAJ V4.5.0 Permet de udpprimer ou d'ajouter un attribut au node. --- bin/.gitignore | 4 + icons/EvalTabDefautStyleLeaderfalse.png | Bin 0 -> 3375 bytes icons/EvalTabDefautStyleLeaderfalsemini.png | Bin 0 -> 1446 bytes icons/EvalTabDefautStyleLeadertrue.png | Bin 0 -> 3263 bytes icons/EvalTabDefautStyleLeadertruemini.png | Bin 0 -> 1410 bytes icons/supprimeAttribut.png | Bin 0 -> 193 bytes icons/supprimeAttribut.svg | 52 +++++ icons/supprimeAttributmini.png | Bin 0 -> 190 bytes ...ctEvalFormatageDirectTousLesNodesTrue.java | 19 +- src/fenetres/attributs.java | 187 ++++++++++++------ src/resources/supprimeAttributmini.png | Bin 0 -> 190 bytes 11 files changed, 189 insertions(+), 73 deletions(-) create mode 100644 icons/EvalTabDefautStyleLeaderfalse.png create mode 100644 icons/EvalTabDefautStyleLeaderfalsemini.png create mode 100644 icons/EvalTabDefautStyleLeadertrue.png create mode 100644 icons/EvalTabDefautStyleLeadertruemini.png create mode 100644 icons/supprimeAttribut.png create mode 100644 icons/supprimeAttribut.svg create mode 100644 icons/supprimeAttributmini.png create mode 100644 src/resources/supprimeAttributmini.png diff --git a/bin/.gitignore b/bin/.gitignore index 3d4bed4..50f4061 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -529,3 +529,7 @@ /zipstudent.svg /zipstudentmini.png /resources/ +/EvalTabDefautStyleLeaderfalse.png +/EvalTabDefautStyleLeaderfalsemini.png +/EvalTabDefautStyleLeadertrue.png +/EvalTabDefautStyleLeadertruemini.png diff --git a/icons/EvalTabDefautStyleLeaderfalse.png b/icons/EvalTabDefautStyleLeaderfalse.png new file mode 100644 index 0000000000000000000000000000000000000000..1482d6580c6989880788e5e2531c4454958b85a1 GIT binary patch literal 3375 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 FV1mLLkc9vM literal 0 HcmV?d00001 diff --git a/icons/EvalTabDefautStyleLeaderfalsemini.png b/icons/EvalTabDefautStyleLeaderfalsemini.png new file mode 100644 index 0000000000000000000000000000000000000000..ebb47dcdaacae85d5577071b8f6ac15c856cb740 GIT binary patch literal 1446 zcmV;X1zGxuP)iJH?WM-Li(QKQiZ z<0VEPydXvsAAA8dYPFo%iW$q|Dj#0=Kh#0tOMKvl*XVm zMzXjz)^?^v10J=}v_TY=BZJ_s0CxxCU5R)pl&YYVjYu~zh89_b(i7lzoErHoA(`Dx zb-sMS-vExS@xkOf-Z|kmp8?Nku=>pWJIB8UZ+Wc})r=la;1!O8t0S5R_I^;kKnw_i zW;J&9#gV>tr<6>lN8a`_?vkSpfsWqZUdMo&b(pHryV*my`L&2lf&73LGQe1Z6w)aD z3Ow1Jn6_5#imtHBICqpL?=L2Auv^~TCJv>JgKz06?pj} zC@au=YMoF|(6D|E`I$wVdbJ;AZ$$AUDzF&MYNVRVqVy1o1j@`5-}~v}@~6Y?>E+=Q z9naq2cf>p~_R<%Zs_~>*`G0&ccVPI?EM9j4cHAQJK~3N^a&L9wc~2t+7q{F4DhmR7 zbA92#kK62@vtb^)CfRsd)A880*g4$4*)PLx+lwKh`3b0Mwz~+WXx_Amx~s05Sy!D!Z@!7y z*-0JLS0QLHFCM7S!s`HJ-~FVt`G4;QF1kQVMBE9)Rw(Uiz?O2E#BI0Hx^*j=r=B9X zVFTqodnjz(I?Ln*kbCBb7$b@0qu(9z+Hb$+9x&o4^=)==>_Y%Am-|h`OQ*?i-aMB; zME>+-?z?NdbLT%~_{Me7+4tMv-=iR-N=f#$*Ch4mqf*?tQ-1F5mQj!>NG~j2umUpK z>*IR{$ywHm^QD`ge;#Liob0AeB>VemdHH3muCBk literal 0 HcmV?d00001 diff --git a/icons/EvalTabDefautStyleLeadertrue.png b/icons/EvalTabDefautStyleLeadertrue.png new file mode 100644 index 0000000000000000000000000000000000000000..dc6bf183848dc4069c4210fbf8f7c4d759a09f06 GIT binary patch literal 3263 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 literal 0 HcmV?d00001 diff --git a/icons/EvalTabDefautStyleLeadertruemini.png b/icons/EvalTabDefautStyleLeadertruemini.png new file mode 100644 index 0000000000000000000000000000000000000000..52ec5f173e2c97db28d12972bb7d58c4d5709e5a GIT binary patch literal 1410 zcmV-|1%3L7P);Msv`QL zoXn8{lZ!V?ejlEzZqZ^J3YrlMBDy~r`9uQO_!S5!r6jYb2EPMk)?w7Fh%nZM?}_K; zGA~+7*KeLoK$}oN&r z85;=>=EszX4a>{E_vZXCKX8_-vL|?3^A9IYuCOJ%b5>1_;iBz-*+H61QN-&1k-b#$VD`1=@;~ zx5otx6umgK>2-qdiCF7E^~B0%oo%Tq7v$Ix#&2Ry_n};1nfiF8w(? z@sOpI!Rsx73Ic}^iJ|a8BQkr{{K%YD38$z#nT`*mhTU0L9d>oI3h;7J=z>BQ1Nqg7 zhVd4)`IJ}F0Z|k$oB?kMc>59mPQ*{6R1u{dL{}+>-l?D1s zIw5?D9alh>Bhm?)i5|HdZ*)KSAw)$%20e*R$vZ}L<*k;3Ub_k>c^XZx1uFt_9NmAc z_1@N0<(IlC>)`et1a}2c1R2JN&PGb-5L-iOt5MRAZMsL#SoNm#^(n1t3I6C=uodVn z>TZ-bV2|Dl{FvtQYdpMzx(_$`>XcGOmnoS>9zZU z4pz^b9pBx0*-M%6eDchZ;r8Fg*BqCA+T>~Zyex3dMs_X4_g_JB9-iF-DhmR7ZFTP1 zFB+Ubvr)FM8JKe0)b8CqiJ2QlKA7>(7X!?&W{}J#^Riv)jS8gZ@eW`kycZy?Z^qXe zF~XajOUYjE(v_M_wUwQJd+a>onvUj8n}~c-^&;xcdiw0XY63)zi7vr2Me5iAK=zX_ z3p;=PB(!*emWp{-5J#c3y8$PxhjGQl_H6*>Rn24T%&k1t{?v6tp2S98J(VDyYVJIK z!EfBKW(ycelsa}Y)3wJ`COa1GK%r;|G_ZHsUf$?=qay!5Di}9EKeQ_{w_c+<91pJ8 zdJK3N;Qfm)Jjzlw=Dj>Sn|E?o&0W0H`wrc9cSZiB6)==tm;C7rBbN2nMDVuD+gKi6 z&WX_z>`LzX7kmRM8-E?KLgNIMyh60I; zi8<-B@%r%M`TPC_o}-OA_7J4GkG@LG$0N-*a#FI0$PGQYX;WyjJ2&#b0SSMV7WZ0Z Qt<8 literal 0 HcmV?d00001 diff --git a/icons/supprimeAttribut.png b/icons/supprimeAttribut.png new file mode 100644 index 0000000000000000000000000000000000000000..ec1becb48ea71fc556c767a558fb74fb8dedab9b GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^B0wy_!3HG7B;uuk6lZ})WHAE+-(e7DJf6QI1t=(4 z;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6i|_$r;B5VMep0oj=T*H0?Y>@ zn`D+GGO$V + + + + + + + + + diff --git a/icons/supprimeAttributmini.png b/icons/supprimeAttributmini.png new file mode 100644 index 0000000000000000000000000000000000000000..9198ac55f09a214074f52fbcda059b3f9fbb01c2 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^B0$W;!3HFgc;@~FQk(@Ik;M!Qe1}1p@p%4<6riAF ziEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0xCo-U3d8WW#h+Q{2rAi#W} z`iMo(F(#h_OgWRZF3(h)B+@bcPF!NWs^RBtD{pZXu!pLzb9_C`W)g>Oih=D(cB>c@ jF5cq{t}giZ{f2(a9+UU4?zT<^8q476>gTe~DWM4fCz?RO literal 0 HcmV?d00001 diff --git a/src/action/actEvalFormatageDirectTousLesNodesTrue.java b/src/action/actEvalFormatageDirectTousLesNodesTrue.java index 77fb847..cf2ba2d 100644 --- a/src/action/actEvalFormatageDirectTousLesNodesTrue.java +++ b/src/action/actEvalFormatageDirectTousLesNodesTrue.java @@ -34,22 +34,21 @@ public class actEvalFormatageDirectTousLesNodesTrue extends AbstractAction{ String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); - if(!a.isEmpty()) { + if(a!=null)if(!a.isEmpty()) { try { point = Integer.valueOf(a); if(point<=0) { - nod.getAttributs().put("evalFormatageDirect", String.valueOf(0)); + nod.supprimeAttribut("evalFormatageDirect"); fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF supérieur à zéro.
Cependant,la valeur a été modifiée.
evalFormatageDirect=0.

"); + fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalFormatageDirect a été supprimé.

"); }else { - String pointString = String.valueOf(point); if(nod.getNomElt().equals("page")) { - ajouteAttribut(nod,pointString); + ajouteAttribut(nod,point); } if(nod.getNomElt().equals("structurepage")) { for(int i = 0 ; i < nod.getNodes().size(); i++) { if(nod.getNodes().get(i).getNomElt().equals("page")) { - ajouteAttribut(nod.getNodes().get(i),pointString); + ajouteAttribut(nod.getNodes().get(i),point); } } } @@ -63,10 +62,14 @@ public class actEvalFormatageDirectTousLesNodesTrue extends AbstractAction{ } - private void ajouteAttribut(node nodePage, String pointString) { + private void ajouteAttribut(node nodePage, Integer point) { for(int i = 0 ; i < nodePage.getNodes().size(); i++) { if(listeDesNodesAnalyseStyle.isAnalyseStyle(nodePage.getNodes().get(i))) { - nodePage.getNodes().get(i).getAttributs().put("evalFormatageDirect", pointString); + if(point>0) { + nodePage.getNodes().get(i).getAttributs().put("evalFormatageDirect", String.valueOf(point)); + }else { + nodePage.getNodes().get(i).supprimeAttribut("evalFormatageDirect"); + } } } } diff --git a/src/fenetres/attributs.java b/src/fenetres/attributs.java index 09301b0..719f6f0 100644 --- a/src/fenetres/attributs.java +++ b/src/fenetres/attributs.java @@ -42,7 +42,9 @@ public class attributs extends JFrame { */ private static final long serialVersionUID = 1L; private JPanel contentPane; + JScrollPane scrollPaneCentre = new JScrollPane(); private JPanel panelCentre = new JPanel(); + JButton btnValide = new JButton("Valider les modifications"); node nod; afficheText J; int indexSelect=0; @@ -52,6 +54,9 @@ public class attributs extends JFrame { ArrayList Lesevaluer = new ArrayList(); ArrayList Lespoints = new ArrayList(); ArrayList KeysAttribut = new ArrayList(); + ArrayList KeysRemove = new ArrayList(); + ArrayList LesBoutonsSuppr = new ArrayList(); + /** * Create the frame. */ @@ -99,18 +104,54 @@ public class attributs extends JFrame { btnAddAttribut.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { String nameAttribut=""; - nameAttribut = JOptionPane.showInputDialog(null,"Quelle est la clé de l'attribut ?",""); + nameAttribut = JOptionPane.showInputDialog(null,"Quel est le nom de l'attribut ?",""); if(nameAttribut!=null)if(!nameAttribut.isBlank()) { - nod.getAttributs().put(nameAttribut, ""); + nameAttribut = nameAttribut.replaceAll("\\s+", ""); + + String key = nameAttribut; + JTextField txtFielPoints = new JTextField("0"); + JTextField txtFielValue = new JTextField(""); + JLabel lbKeys = new JLabel(nameAttribut); + JCheckBox checkEval = new JCheckBox(); + txtFielValue.addMouseListener(new MyMouseListener()); + txtFielPoints.setColumns(3); + checkEval.setSelected(false); + + Leslabels.add(lbKeys); + Lesvaleurs.add(txtFielValue); + Lespoints.add(txtFielPoints); + Lesevaluer.add(checkEval); + KeysAttribut.add(nameAttribut); + + JButton Btn = new JButton(""); + Btn.setIcon(new ImageIcon(create.class.getResource("/resources/supprimeAttributmini.png"))); + LesBoutonsSuppr.add(Btn); + Btn.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + Leslabels.remove(lbKeys); + Lespoints.remove(txtFielPoints); + Lesvaleurs.remove(txtFielValue); + Lesevaluer.remove(checkEval); + LesBoutonsSuppr.remove(Btn); + KeysAttribut.remove(key); + KeysRemove.add(key); + + panelCentre.removeAll(); + refresh(); + } + }); + + panelCentre.removeAll(); refresh(); } } }); + panelBas.add(btnAddAttribut); panelBas.add(btnNewButton); - JButton btnValide = new JButton("Valider les modifications"); + btnValide = new JButton("Valider les modifications"); btnValide.setFont(new Font("Tahoma", Font.BOLD, 12)); btnValide.setForeground(Color.RED); panelBas.add(btnValide); @@ -221,29 +262,30 @@ public class attributs extends JFrame { btnTouText.setToolTipText("N'importe quel texte mais pas null, ou pas la valeur none ou pas vide.
Toutes les autres fonctions sont ignorées."); panelDroite.add(btnTouText); - JScrollPane scrollPaneCentre = new JScrollPane(); contentPane.add(scrollPaneCentre, BorderLayout.CENTER); - scrollPaneCentre.setViewportView(panelCentre); - panelCentre.setLayout(new MigLayout("gap rel 0", "[100px:n,grow][150px:n,grow 150][::80px][80px:n]", - "[::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px]")); + panelCentre.setLayout(new MigLayout("gap rel 0", "[20px:n,fill][100px:n,grow][100px:n,grow][32px:n][32px:n]", "[::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px][::20px]")); + + JLabel lblNewLabel0 = new JLabel("Supprime"); + lblNewLabel0.setFont(new Font("Tahoma", Font.BOLD, 11)); + panelCentre.add(lblNewLabel0, "cell 0 0"); JLabel lblNewLabel = new JLabel("Nom attribut"); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 11)); - panelCentre.add(lblNewLabel, "cell 0 0"); + panelCentre.add(lblNewLabel, "cell 1 0"); JLabel lblNewLabel_1 = new JLabel("Valeurs"); lblNewLabel_1.setFont(new Font("Tahoma", Font.BOLD, 11)); - panelCentre.add(lblNewLabel_1, "flowx,cell 1 0"); + panelCentre.add(lblNewLabel_1, "flowx,cell 2 0"); JLabel lblNewLabel_2 = new JLabel("Evaluer"); lblNewLabel_2.setFont(new Font("Tahoma", Font.BOLD, 11)); - panelCentre.add(lblNewLabel_2, "cell 2 0"); + panelCentre.add(lblNewLabel_2, "cell 3 0"); JLabel lblNewLabel_3 = new JLabel("Point(s)"); lblNewLabel_3.setFont(new Font("Tahoma", Font.BOLD, 11)); - panelCentre.add(lblNewLabel_3, "cell 3 0,alignx left"); + panelCentre.add(lblNewLabel_3, "cell 4 0,alignx left"); Enumeration key = nod.getAttributs().keys(); @@ -269,29 +311,51 @@ public class attributs extends JFrame { JTextField txtFielPoints = new JTextField(point); JTextField txtFielValue = new JTextField(value); + JLabel lbKeys = new JLabel(k); + txtFielValue.addMouseListener(new MyMouseListener()); txtFielPoints.setColumns(3); checkEval.setSelected(evaluer); - Leslabels.add(new JLabel(k)); + Leslabels.add(lbKeys); Lesvaleurs.add(txtFielValue); Lespoints.add(txtFielPoints); Lesevaluer.add(checkEval); KeysAttribut.add(k); + JButton Btn = new JButton(""); + Btn.setIcon(new ImageIcon(create.class.getResource("/resources/supprimeAttributmini.png"))); + LesBoutonsSuppr.add(Btn); + Btn.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + Leslabels.remove(lbKeys); + Lespoints.remove(txtFielPoints); + Lesvaleurs.remove(txtFielValue); + Lesevaluer.remove(checkEval); + LesBoutonsSuppr.remove(Btn); + KeysAttribut.remove(k); + KeysRemove.add(k); + + panelCentre.removeAll(); + refresh(); + } + }); + + + + } } - - //Placement dans le panel des informations for(int i = 0 ; i key = nod.getAttributs().keys(); - while(key.hasMoreElements()) { - - String k = key.nextElement(); - if(!listeAttributsAnalyseWriter.isAttributAnalyseWriter(k)) { - String value = nod.getAttributs().get(k); - String point = "0"; - JCheckBox checkEval = new JCheckBox(); - boolean evaluer = false; - if(value.contains("‽")||value.contains("‼")) { - evaluer=true; - if(value.contains("‽")) { - point = value.substring(value.lastIndexOf("‽")+1,value.length()); - value = value.substring(0,value.lastIndexOf("‽")); - } - if(value.contains("‼")) { - point = value.substring(value.lastIndexOf("‼")+1,value.length()); - value = value.substring(0,value.lastIndexOf("‼")); - } - } - - JTextField txtFielPoints = new JTextField(point); - JTextField txtFielValue = new JTextField(value); - txtFielValue.addMouseListener(new MyMouseListener()); - txtFielPoints.setColumns(3); - checkEval.setSelected(evaluer); - - if(!KeysAttribut.contains(k)) { - Leslabels.add(new JLabel(k)); - Lesvaleurs.add(txtFielValue); - Lespoints.add(txtFielPoints); - Lesevaluer.add(checkEval); - KeysAttribut.add(k); - } - - } - } + + JLabel lblNewLabel0 = new JLabel("Supprime"); + lblNewLabel0.setFont(new Font("Tahoma", Font.BOLD, 11)); + panelCentre.add(lblNewLabel0, "cell 0 0"); + JLabel lblNewLabel = new JLabel("Nom attribut"); + lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 11)); + panelCentre.add(lblNewLabel, "cell 1 0"); + JLabel lblNewLabel_1 = new JLabel("Valeurs"); + lblNewLabel_1.setFont(new Font("Tahoma", Font.BOLD, 11)); + panelCentre.add(lblNewLabel_1, "flowx,cell 2 0"); + + JLabel lblNewLabel_2 = new JLabel("Evaluer"); + lblNewLabel_2.setFont(new Font("Tahoma", Font.BOLD, 11)); + panelCentre.add(lblNewLabel_2, "cell 3 0"); + + JLabel lblNewLabel_3 = new JLabel("Point(s)"); + lblNewLabel_3.setFont(new Font("Tahoma", Font.BOLD, 11)); + panelCentre.add(lblNewLabel_3, "cell 4 0,alignx left"); + //Placement dans le panel des informations - for(int i = 0 ; iOih=D(cB>c@ jF5cq{t}giZ{f2(a9+UU4?zT<^8q476>gTe~DWM4fCz?RO literal 0 HcmV?d00001