diff --git a/analyseWriter.jar b/analyseWriter.jar index 5c02224..3197cdc 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index 270a366..e30262a 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -13,3 +13,24 @@ /textclean.png /textclean.svg /textcleanmini.png +/auteurediteur.png +/auteurediteur.svg +/auteurediteurmini.png +/et.png +/et.svg +/etmini.png +/ouenviron.png +/ouenviron.svg +/ouenvironmini.png +/ouenvironsimilitude.png +/ouenvironsimilitude.svg +/ouenvironsimilitudemini.png +/oustrict.png +/oustrict.svg +/oustrictmini.png +/oustrictseps.png +/oustrictseps.svg +/oustrictsepsmini.png +/toutext.png +/toutext.svg +/toutextmini.png diff --git a/bin/MEPTL/commandes.class b/bin/MEPTL/commandes.class index dc0d7a8..bb9a2ee 100644 Binary files a/bin/MEPTL/commandes.class and b/bin/MEPTL/commandes.class differ diff --git a/bin/app/create$1.class b/bin/app/create$1.class index b305173..4bf6765 100644 Binary files a/bin/app/create$1.class and b/bin/app/create$1.class differ diff --git a/bin/app/create$10.class b/bin/app/create$10.class index 66c97ff..ff20c0d 100644 Binary files a/bin/app/create$10.class and b/bin/app/create$10.class differ diff --git a/bin/app/create$11.class b/bin/app/create$11.class index 38e4856..9b4bd92 100644 Binary files a/bin/app/create$11.class and b/bin/app/create$11.class differ diff --git a/bin/app/create$12.class b/bin/app/create$12.class index b242183..a39fd60 100644 Binary files a/bin/app/create$12.class and b/bin/app/create$12.class differ diff --git a/bin/app/create$13.class b/bin/app/create$13.class index 905710c..de6ba4e 100644 Binary files a/bin/app/create$13.class and b/bin/app/create$13.class differ diff --git a/bin/app/create$14.class b/bin/app/create$14.class index 595aeb0..7d789aa 100644 Binary files a/bin/app/create$14.class and b/bin/app/create$14.class differ diff --git a/bin/app/create$15.class b/bin/app/create$15.class index f923bdf..b5aa15f 100644 Binary files a/bin/app/create$15.class and b/bin/app/create$15.class differ diff --git a/bin/app/create$16.class b/bin/app/create$16.class index 243031a..5d54d9b 100644 Binary files a/bin/app/create$16.class and b/bin/app/create$16.class differ diff --git a/bin/app/create$17.class b/bin/app/create$17.class index 3e5e49f..e674b8d 100644 Binary files a/bin/app/create$17.class and b/bin/app/create$17.class differ diff --git a/bin/app/create$18.class b/bin/app/create$18.class index b4de84b..9854eb1 100644 Binary files a/bin/app/create$18.class and b/bin/app/create$18.class differ diff --git a/bin/app/create$19.class b/bin/app/create$19.class index d6ec183..94652ae 100644 Binary files a/bin/app/create$19.class and b/bin/app/create$19.class differ diff --git a/bin/app/create$2.class b/bin/app/create$2.class index 0ef53ff..9f7cd79 100644 Binary files a/bin/app/create$2.class and b/bin/app/create$2.class differ diff --git a/bin/app/create$20.class b/bin/app/create$20.class index ffc2c5e..5c1a6f3 100644 Binary files a/bin/app/create$20.class and b/bin/app/create$20.class differ diff --git a/bin/app/create$21.class b/bin/app/create$21.class index 4979d2a..34f4e44 100644 Binary files a/bin/app/create$21.class and b/bin/app/create$21.class differ diff --git a/bin/app/create$22.class b/bin/app/create$22.class index 8902abd..fa4d656 100644 Binary files a/bin/app/create$22.class and b/bin/app/create$22.class differ diff --git a/bin/app/create$23.class b/bin/app/create$23.class index 2fd9f93..a9ae5ca 100644 Binary files a/bin/app/create$23.class and b/bin/app/create$23.class differ diff --git a/bin/app/create$3.class b/bin/app/create$3.class index bb48b38..5c3ba83 100644 Binary files a/bin/app/create$3.class and b/bin/app/create$3.class differ diff --git a/bin/app/create$4.class b/bin/app/create$4.class index c383986..3e4f089 100644 Binary files a/bin/app/create$4.class and b/bin/app/create$4.class differ diff --git a/bin/app/create$5.class b/bin/app/create$5.class index 2848cd2..0cbba2c 100644 Binary files a/bin/app/create$5.class and b/bin/app/create$5.class differ diff --git a/bin/app/create$6.class b/bin/app/create$6.class index dc9c8bd..fca5365 100644 Binary files a/bin/app/create$6.class and b/bin/app/create$6.class differ diff --git a/bin/app/create$7.class b/bin/app/create$7.class index 30540b4..3647150 100644 Binary files a/bin/app/create$7.class and b/bin/app/create$7.class differ diff --git a/bin/app/create$8.class b/bin/app/create$8.class index dc50f19..77d5d0a 100644 Binary files a/bin/app/create$8.class and b/bin/app/create$8.class differ diff --git a/bin/app/create$9.class b/bin/app/create$9.class index 7b12b65..4df4a3b 100644 Binary files a/bin/app/create$9.class and b/bin/app/create$9.class differ diff --git a/bin/app/create.class b/bin/app/create.class index 4d1854d..e5fa94d 100644 Binary files a/bin/app/create.class and b/bin/app/create.class differ diff --git a/bin/app/evaluate$1.class b/bin/app/evaluate$1.class index baf70ba..d46e8b6 100644 Binary files a/bin/app/evaluate$1.class and b/bin/app/evaluate$1.class differ diff --git a/bin/app/evaluate$10.class b/bin/app/evaluate$10.class index c2725c5..7c38e7f 100644 Binary files a/bin/app/evaluate$10.class and b/bin/app/evaluate$10.class differ diff --git a/bin/app/evaluate$11.class b/bin/app/evaluate$11.class index 84f85d6..0623e3a 100644 Binary files a/bin/app/evaluate$11.class and b/bin/app/evaluate$11.class differ diff --git a/bin/app/evaluate$12.class b/bin/app/evaluate$12.class index 804aed2..5d1f26a 100644 Binary files a/bin/app/evaluate$12.class and b/bin/app/evaluate$12.class differ diff --git a/bin/app/evaluate$13.class b/bin/app/evaluate$13.class index 6dfe196..20dc7dd 100644 Binary files a/bin/app/evaluate$13.class and b/bin/app/evaluate$13.class differ diff --git a/bin/app/evaluate$14.class b/bin/app/evaluate$14.class index 97f804f..c56b828 100644 Binary files a/bin/app/evaluate$14.class and b/bin/app/evaluate$14.class differ diff --git a/bin/app/evaluate$15.class b/bin/app/evaluate$15.class index abaf384..9eaa7c2 100644 Binary files a/bin/app/evaluate$15.class and b/bin/app/evaluate$15.class differ diff --git a/bin/app/evaluate$16.class b/bin/app/evaluate$16.class index c90fd03..f7d80f7 100644 Binary files a/bin/app/evaluate$16.class and b/bin/app/evaluate$16.class differ diff --git a/bin/app/evaluate$17.class b/bin/app/evaluate$17.class index 05a4d66..1ec8932 100644 Binary files a/bin/app/evaluate$17.class and b/bin/app/evaluate$17.class differ diff --git a/bin/app/evaluate$2.class b/bin/app/evaluate$2.class index 07d8cf4..d6e99a4 100644 Binary files a/bin/app/evaluate$2.class and b/bin/app/evaluate$2.class differ diff --git a/bin/app/evaluate$3.class b/bin/app/evaluate$3.class index a1da93e..1028079 100644 Binary files a/bin/app/evaluate$3.class and b/bin/app/evaluate$3.class differ diff --git a/bin/app/evaluate$4.class b/bin/app/evaluate$4.class index 03f009f..5bafe08 100644 Binary files a/bin/app/evaluate$4.class and b/bin/app/evaluate$4.class differ diff --git a/bin/app/evaluate$5.class b/bin/app/evaluate$5.class index 120f86e..dd63a5b 100644 Binary files a/bin/app/evaluate$5.class and b/bin/app/evaluate$5.class differ diff --git a/bin/app/evaluate$6.class b/bin/app/evaluate$6.class index d4d5904..73fc0ec 100644 Binary files a/bin/app/evaluate$6.class and b/bin/app/evaluate$6.class differ diff --git a/bin/app/evaluate$7.class b/bin/app/evaluate$7.class index c4cadd9..fdabd35 100644 Binary files a/bin/app/evaluate$7.class and b/bin/app/evaluate$7.class differ diff --git a/bin/app/evaluate$8.class b/bin/app/evaluate$8.class index b50f57d..04fa06c 100644 Binary files a/bin/app/evaluate$8.class and b/bin/app/evaluate$8.class differ diff --git a/bin/app/evaluate$9.class b/bin/app/evaluate$9.class index 34a2d44..be0ba1a 100644 Binary files a/bin/app/evaluate$9.class and b/bin/app/evaluate$9.class differ diff --git a/bin/app/evaluate.class b/bin/app/evaluate.class index f145eb3..7c8df26 100644 Binary files a/bin/app/evaluate.class and b/bin/app/evaluate.class differ diff --git a/bin/app/mainApp$1.class b/bin/app/mainApp$1.class index f816380..a7670fb 100644 Binary files a/bin/app/mainApp$1.class and b/bin/app/mainApp$1.class differ diff --git a/bin/app/mainApp$2.class b/bin/app/mainApp$2.class index 79ee35d..21da8cc 100644 Binary files a/bin/app/mainApp$2.class and b/bin/app/mainApp$2.class differ diff --git a/bin/app/mainApp.class b/bin/app/mainApp.class index 6f21b73..da9863b 100644 Binary files a/bin/app/mainApp.class and b/bin/app/mainApp.class differ diff --git a/bin/evalwriter.svg b/bin/evalwriter.svg index a43a161..4fa2d75 100644 --- a/bin/evalwriter.svg +++ b/bin/evalwriter.svg @@ -42,7 +42,7 @@ inkscape:current-layer="g3916" inkscape:document-units="mm" inkscape:cy="6.0861963" - inkscape:cx="-15.553613" + inkscape:cx="-15.638143" inkscape:zoom="5.9150245" inkscape:pageshadow="2" inkscape:pageopacity="0.0" @@ -155,40 +155,46 @@ id="g3916" transform="matrix(12.151193,0,0,12.151193,-148.91629,70.970167)" style="stroke-width:0.768356"> - - + id="g900"> + + + + + + + + + - - + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 26.491378,12.121819 -0.924862,-0.25883 c 0.276834,-0.388494 -0.747363,-1.194931 0.483177,-1.058882 z" + id="path3258" + sodipodi:nodetypes="cccc" /> - diff --git a/icons/auteurediteur.png b/icons/auteurediteur.png new file mode 100644 index 0000000..062dc15 Binary files /dev/null and b/icons/auteurediteur.png differ diff --git a/icons/auteurediteur.svg b/icons/auteurediteur.svg new file mode 100644 index 0000000..0c261ea --- /dev/null +++ b/icons/auteurediteur.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/auteurediteurmini.png b/icons/auteurediteurmini.png new file mode 100644 index 0000000..e07f2f7 Binary files /dev/null and b/icons/auteurediteurmini.png differ diff --git a/icons/evalwriter.svg b/icons/evalwriter.svg index a43a161..4fa2d75 100644 --- a/icons/evalwriter.svg +++ b/icons/evalwriter.svg @@ -42,7 +42,7 @@ inkscape:current-layer="g3916" inkscape:document-units="mm" inkscape:cy="6.0861963" - inkscape:cx="-15.553613" + inkscape:cx="-15.638143" inkscape:zoom="5.9150245" inkscape:pageshadow="2" inkscape:pageopacity="0.0" @@ -155,40 +155,46 @@ id="g3916" transform="matrix(12.151193,0,0,12.151193,-148.91629,70.970167)" style="stroke-width:0.768356"> - - + id="g900"> + + + + + + + + + - - + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.203294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 26.491378,12.121819 -0.924862,-0.25883 c 0.276834,-0.388494 -0.747363,-1.194931 0.483177,-1.058882 z" + id="path3258" + sodipodi:nodetypes="cccc" /> - diff --git a/src/MEPTL/commandes.java b/src/MEPTL/commandes.java index 5fd9d15..17d16e2 100644 --- a/src/MEPTL/commandes.java +++ b/src/MEPTL/commandes.java @@ -31,6 +31,10 @@ public class commandes { public static JTree tree = new JTree(); public static node nodeCSV = null; + //**version + public static String version ="4.0.4"; // La version actuelle + public static String Annee ="2022"; + //*************************************************** //** Les commandes par défaut à travers la console ** //*************************************************** @@ -60,7 +64,6 @@ public class commandes { public static String contenuFichierSVG =""; // Le nouveau logo public static String path =""; public static String pathDestination =""; //Pour le mode console uniquement - public static String version ="4.0.3"; // La version actuelle public static String nomDeLaBranch = "Origin"; //Branche de développement public static String Command =""; //récupère le texte de la commande dans la console @@ -116,7 +119,6 @@ public class commandes { public static String Titre = "analyseWriter"; public static String PathFilenameAnalysis=""; public static boolean fichierAnalyseValide = false; //mise à jour de la valeur dans MEPTL.verificationFichierAnalyse - public static String Annee ="2022"; public static int analyse_Nbre_Fichier_Student = 0; public static int analyse_index_Fichier_Student = 0; public static StringBuilder message = new StringBuilder(); diff --git a/src/app/ProgressBar.java b/src/app/ProgressBar.java index aaf113c..60193ae 100644 --- a/src/app/ProgressBar.java +++ b/src/app/ProgressBar.java @@ -8,7 +8,12 @@ import javax.swing.SwingUtilities; public class ProgressBar extends JFrame implements Runnable{ - @Override + /** + * + */ + private static final long serialVersionUID = 1L; + + @Override public void run() { ProgressBar myProgressBar = new ProgressBar(); int i = 0; diff --git a/src/app/afficheText.java b/src/app/afficheText.java index dbcdf5c..5dcfbb5 100644 --- a/src/app/afficheText.java +++ b/src/app/afficheText.java @@ -30,8 +30,11 @@ public class afficheText extends JEditorPane { sb.append("

Parent = " + nodeParent.getNomElt() + "


"); sb.append("

Nom du node : " + nod.getNomElt() + "


"); + if(nod.getNomElt().equals("style:style")) { + sb.append("

Nom du style : " + nod.getAttributs().get("style:name")+ "


"); + } if(nod.getAttributs().get("evaluer")!=null) if(nod.getAttributs().get("evaluer").equalsIgnoreCase("true")) { - sb.append(""); + sb.append("

Ce node est évalué.

"); } diff --git a/src/app/attributs.java b/src/app/attributs.java index 7acc75c..927a72c 100644 --- a/src/app/attributs.java +++ b/src/app/attributs.java @@ -79,8 +79,8 @@ public class attributs extends JFrame { contentPane.add(panelBas, BorderLayout.SOUTH); panelBas.setLayout(new FlowLayout(FlowLayout.RIGHT, 5, 5)); - JButton btnNewButton = new JButton("Valider"); - panelBas.add(btnNewButton); + JButton btnValide = new JButton("Valider"); + panelBas.add(btnValide); JPanel panelDroite = new JPanel(); contentPane.add(panelDroite, BorderLayout.EAST); @@ -259,7 +259,7 @@ public class attributs extends JFrame { panelCentre.add(Lespoints.get(i), "cell 3 " + i+1 +",alignx left,growy"); } - //Enabled false les valeurs ne peuvente être modifiée + //Enabled false les valeurs ne peuvent pas être modifiées for(int i = 0 ; i" + "h1 {margin-bottom: 0.25cm;font-size: 18pt;font-family:\"Arial\";text-align:center;font-weight: bold;}" - + "h2 {color:red;margin-bottom: 0.25cm;font-size: 18pt;font-family:\"Arial\";text-align:center;font-weight: bold;}" + + "h2 {margin-bottom: 0.25cm;font-size: 16pt;font-family:\"Arial\";text-align:center;font-weight: bold;}" + "h4 {text-align:left;font-family: \"Arial\"; font-size: 16pt; font-weight: bold; line-height: 110%;}" + "hr { display: block; margin-top: 0.5em; margin-bottom: 8em; margin-left: 2em; margin-right: 2em; border-style: inset; border-width: 4px;}" + "spanpablo { float: right; width: 8em; font-size: 250%; font-family: algerian, courier; line-height: 80%; margin-right: 1%; color: red; text-align: center}" diff --git a/src/app/create.java b/src/app/create.java index 65b5886..140e411 100644 --- a/src/app/create.java +++ b/src/app/create.java @@ -85,28 +85,14 @@ public class create extends JFrame { * @throws UnsupportedLookAndFeelException */ private void initialize() throws UnsupportedLookAndFeelException { -// UIManager.setLookAndFeel(new NimbusLookAndFeel()); - - /*Chargement des images*/ -// ImageIcon img1 = new ImageIcon(getClass().getResource("/attribut.png") ); -// ImageIcon img3 = new ImageIcon(getClass().getResource("/property.png") ); -// ImageIcon img4 = new ImageIcon(getClass().getResource("/content.png") ); -// ImageIcon img2 = new ImageIcon(getClass().getResource("/structurepage.png") ); - - - //frame = new JFrame(); -// System.out.println(this.getClass()); -// this.setExtendedState(MAXIMIZED_BOTH); setSize(1400,920); //setExtendedState(getExtendedState()|JFrame.MAXIMIZED_BOTH ); -// setTitle("analyseWriter - Evaluer les fichiers des étudiants"); ImageIcon img = new ImageIcon(getClass().getResource("/evalwriter.png") ); setIconImage(img.getImage()); setLocationRelativeTo( null ); -// frame.setBounds(0, 0, 860, 500); setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); // Construction et injection de la barre de menu @@ -130,28 +116,24 @@ public class create extends JFrame { // The content of the window if(commandes.fichierAnalyseValide) tree = commandes.tree; -// JTextArea J = new JTextArea(); -// contentPane.add(J,BorderLayout.EAST); - - JPanel panel = new JPanel(); - getContentPane().add(panel, BorderLayout.CENTER); - panel.setLayout(null); - JScrollPane leftScrollPane = new JScrollPane( ); leftScrollPane.setPreferredSize( new Dimension( 200, 0 ) ); JScrollPane rightScrollPane = new JScrollPane( ); JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftScrollPane, rightScrollPane ); splitPane.setBounds(10, 10, 1364, 783); - panel.add(splitPane); rightScrollPane.setViewportView(textNodeSelect); textNodeSelect.setFont(new Font("Monospaced", Font.PLAIN, 15)); leftScrollPane.setViewportView(tree); tree.setFont(new Font("Tahoma", Font.PLAIN, 14)); + getContentPane().add(splitPane, BorderLayout.CENTER); if(commandes.fichierAnalyseValide) constructionTree(); + + this.setExtendedState(MAXIMIZED_BOTH); + ListenerAction(); @@ -280,6 +262,10 @@ public class create extends JFrame { mnNiveauSup1.addSeparator(); mnNiveauSup1.add(actEvalInitialCreator); } + if(nod.getNomElt().equals("dc:creator")) { + mnNiveauSup1.addSeparator(); + mnNiveauSup1.add(actevalNameCreator); + } //**Menu setting @@ -334,6 +320,9 @@ public class create extends JFrame { mnuFile.setMnemonic( 'F' ); /*JMenuItem mnuNewFile =*/ + mnuFile.add( actOpen ); + mnuFile.add( actNewFichierAnalyse ); + mnuFile.addSeparator(); mnuFile.add( actSave ); mnuFile.add( actSaveAs ); mnuFile.addSeparator(); @@ -354,20 +343,34 @@ public class create extends JFrame { menuBar.add(mnuEdit); - // menu Modifier - JMenu mnuModif= new JMenu( "Modifier" ); - mnuModif.setMnemonic( 'M' ); + // Définition du menu Node + JMenu mnNode = new JMenu("Modifier"); + mnNode.add( actNodeFichier ); + mnNode.addSeparator(); + menuBar.add(mnNode); + + //Menu arbre + JMenu mnManageTree = new JMenu("Arbre"); + mnManageTree.add(actUpNode); + mnManageTree.add(actDownNode); + mnManageTree.addSeparator(); + mnManageTree.add(actExpandAll); + mnManageTree.add(actExpandNode); + mnManageTree.addSeparator(); + mnManageTree.add(actCollapseAll); + mnManageTree.add(actCollapseNode); + mnNode.add(mnManageTree); + mnNode.addSeparator(); + + //Définition Evaluer + JMenu mnEvaluer = new JMenu("Evaluer"); + mnEvaluer.add(actEvalueTrue); + mnEvaluer.add(actEvalueFalse); + mnNode.add(mnEvaluer); + + - mnuModif.add( actOpen ); - mnuModif.add( actNodeFichier ); - mnuModif.addSeparator(); - mnuModif.add( actNewFichierAnalyse ); - - menuBar.add(mnuModif); - - - - // Définition du menu déroulant "Edit" et de son contenu + // Définition du menu déroulant "Création évaluation" et de son contenu JMenu mnuExercice = new JMenu( "Création évaluation" ); mnuExercice.setMnemonic( 'N' ); mnuExercice.add(actEvaluer); @@ -532,7 +535,7 @@ public class create extends JFrame { /** - * + * Enregistrer */ private AbstractAction actSave = new AbstractAction() { private static final long serialVersionUID = 1L; @@ -585,7 +588,7 @@ public class create extends JFrame { }; /** - * + * Enregistrer sous ... */ private AbstractAction actSaveAs = new AbstractAction() { @@ -678,10 +681,6 @@ public class create extends JFrame { } }; - - - - /** * @@ -857,7 +856,7 @@ public class create extends JFrame { }; /** - * Evalue la présence de ce node + * Evalue la présence du node meta:initial-creator */ private AbstractAction actEvalInitialCreator = new AbstractAction() { @@ -899,6 +898,49 @@ public class create extends JFrame { } }; + /** + * Evalue la présence du node dc:creator + */ + private AbstractAction actevalNameCreator = new AbstractAction() { + + private static final long serialVersionUID = 1L; + + { + putValue( Action.NAME, "Evaluer la présence du dernier éditeur" ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer la présence du dernier éditeur" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/auteurediteurmini.png")) ); + } + + @Override public void actionPerformed( ActionEvent e ) { + DefaultMutableTreeNode selectNode = (DefaultMutableTreeNode) tree.getSelectionPath().getLastPathComponent(); + + node nod = (node) selectNode.getUserObject(); + int point = 0; + if(nod.getAttributs().get("evalNameCreator")!=null) { + point = Integer.valueOf(nod.getAttributs().get("evalNameCreator")); + } + + String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); + + if(!a.isEmpty()) { + try { + point = Integer.valueOf(a); + if(point<=0) { + nod.getAttributs().put("evalNameCreator", String.valueOf(0)); + textNodeSelect.setText(balisestyles()); + textNodeSelect.setText("

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

"); + }else { + nod.getAttributs().put("evalNameCreator", String.valueOf(point)); + } + } catch (Exception e2) { + textNodeSelect.setText(balisestyles()); + textNodeSelect.setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); + } + } + textNodeSelect.refreshAffichage(nod); + } + }; + /** * Evalue la présence de ce node diff --git a/src/app/evaluate.java b/src/app/evaluate.java index 31a008d..f2b7eb3 100644 --- a/src/app/evaluate.java +++ b/src/app/evaluate.java @@ -34,7 +34,6 @@ import cXML.node; import javax.swing.SwingConstants; import javax.swing.JScrollPane; -import javax.swing.JProgressBar; import net.miginfocom.swing.MigLayout; import java.awt.event.InputEvent; import javax.swing.JMenuBar; @@ -42,7 +41,6 @@ import javax.swing.JMenu; import javax.swing.JOptionPane; import java.awt.Color; import java.awt.Desktop; -import java.awt.EventQueue; import javax.swing.JEditorPane; @@ -890,7 +888,8 @@ public class evaluate extends JFrame { /** * */ - private AbstractAction actSavePreference = new AbstractAction() { + @SuppressWarnings("unused") + private AbstractAction actSavePreference = new AbstractAction() { private static final long serialVersionUID = 1L; diff --git a/src/app/listeAttributsAnalyseWriter.java b/src/app/listeAttributsAnalyseWriter.java index d438dbe..f10da24 100644 --- a/src/app/listeAttributsAnalyseWriter.java +++ b/src/app/listeAttributsAnalyseWriter.java @@ -25,7 +25,6 @@ public class listeAttributsAnalyseWriter { if(attribut.equals("styletitre")) return true; if(attribut.equals("evalNameCreator")) return true; if(attribut.equals("evalNameInitialCreator")) return true; - if(attribut.equals("evalNameInitialCreator")) return true; if(attribut.equals("recherche_anchor-page-number")) return true; return false; diff --git a/src/app/mainApp.java b/src/app/mainApp.java index 04b47cd..536472b 100644 --- a/src/app/mainApp.java +++ b/src/app/mainApp.java @@ -1,7 +1,6 @@ package app; import java.awt.Desktop; -import java.awt.EventQueue; import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -138,7 +137,7 @@ public class mainApp extends JFrame implements ActionListener{ if(e.getSource()==actCharge) { if(!commandes.console) System.out.println( "Début chargement du fichier d'analyse." ); - evaluate f = new evaluate(); + new evaluate(); frmEvalwriter.dispose(); } diff --git a/src/app/proprieteFichierAnalyse.java b/src/app/proprieteFichierAnalyse.java index eecc1ac..e7da86f 100644 --- a/src/app/proprieteFichierAnalyse.java +++ b/src/app/proprieteFichierAnalyse.java @@ -18,6 +18,7 @@ import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.DefaultComboBoxModel; import java.awt.event.ActionListener; +import java.text.DecimalFormat; import java.awt.event.ActionEvent; import net.miginfocom.swing.MigLayout; import java.awt.Toolkit; @@ -62,6 +63,7 @@ public class proprieteFichierAnalyse extends JFrame { private JButton btnAideInitial_Creator; private JButton btnAidecontrole_Initial_Creator; private JButton btnVoirBaremeABC; + private JButton btnVoirBaremeNumeric; /** @@ -327,13 +329,36 @@ public class proprieteFichierAnalyse extends JFrame { double intervalle2 = Math.pow(0.4, 1/progression) ; double intervalle3 = Math.pow(0.6, 1/progression) ; double intervalle4 = Math.pow(0.8, 1/progression) ; - String message = "0% → E → " + Math.round(intervalle1*100) + "% → D → " + Math.round(intervalle2*100) + "% → C → " + - Math.round(intervalle3*100) + "% → B → " + Math.round(intervalle4*100) + "% → A → 100%"; + String message = "[0% → E → " + Math.round(intervalle1*100) + "%[
" + +"["+ Math.round(intervalle1*100) + "→ D → " + Math.round(intervalle2*100) + "%[
" + +"["+ Math.round(intervalle2*100) + "→ C → " + Math.round(intervalle3*100) + "%[
" + +"["+ Math.round(intervalle3*100) + "→ B → " + Math.round(intervalle4*100) + "%[
" + +"["+ Math.round(intervalle4*100) +"→ A → 100%["; JOptionPane.showMessageDialog(null, message); } }); btnVoirBaremeABC.setIcon(new ImageIcon(proprieteFichierAnalyse.class.getResource("/resources/voirmini.png"))); contentPane.add(btnVoirBaremeABC, "cell 2 4"); + + btnVoirBaremeNumeric = new JButton(""); + btnVoirBaremeNumeric.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + double progression = Double.valueOf(textFieldProgression.getText()); + double noteFrom = Double.valueOf(textFieldNoteFrom.getText()); + double intervalle1 = Math.pow(0.25, progression)*noteFrom ; + double intervalle2 = Math.pow(0.5, progression)*noteFrom ; + double intervalle3 = Math.pow(0.75, progression)*noteFrom ; + double intervalle4 = Math.pow(1, progression)*noteFrom ; + DecimalFormat f = new DecimalFormat("#00.00"); + String message = "25% correct → "+ f.format(intervalle1) + " / "+ textFieldNoteFrom.getText()+ "
" + + "50% correct → "+ f.format(intervalle2) + " / "+ textFieldNoteFrom.getText()+ "
" + + "75% correct → "+ f.format(intervalle3) + " / "+ textFieldNoteFrom.getText()+ "
" + + "100% correct → "+ f.format(intervalle4) + " / "+ textFieldNoteFrom.getText()+ "
"; + JOptionPane.showMessageDialog(null, message); + } + }); + btnVoirBaremeNumeric.setIcon(new ImageIcon(proprieteFichierAnalyse.class.getResource("/resources/voirmini.png"))); + contentPane.add(btnVoirBaremeNumeric, "cell 2 5"); btnNewButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { commandes.sujet.getAttributs().put("titre", textFieldTitre.getText() ); diff --git a/src/app/savePreferences.java b/src/app/savePreferences.java index a16cdf7..869b00c 100644 --- a/src/app/savePreferences.java +++ b/src/app/savePreferences.java @@ -3,6 +3,7 @@ package app; import javax.swing.JEditorPane; public class savePreferences { + @SuppressWarnings("unused") private JEditorPane txt; savePreferences(JEditorPane txt){ diff --git a/src/resources/auteurediteur.png b/src/resources/auteurediteur.png new file mode 100644 index 0000000..062dc15 Binary files /dev/null and b/src/resources/auteurediteur.png differ diff --git a/src/resources/auteurediteurmini.png b/src/resources/auteurediteurmini.png new file mode 100644 index 0000000..e07f2f7 Binary files /dev/null and b/src/resources/auteurediteurmini.png differ